Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backport to 5.14 #1177

Merged
merged 1 commit into from
Jul 20, 2023
Merged

Backport to 5.14 #1177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/backingstore/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -819,7 +819,7 @@ func (r *Reconciler) MakeExternalConnectionParams() (*nb.AddExternalConnectionPa
logsAnalyticsWorkspaceID := r.Secret.StringData["LogsAnalyticsWorkspaceID"]

if tenantID != "" && appID != "" && appSecret != "" && logsAnalyticsWorkspaceID != "" {
conn.AzureLogAccessKeys = nb.AzureLogAccessKeysParams{
conn.AzureLogAccessKeys = &nb.AzureLogAccessKeysParams{
AzureTenantID: tenantID,
AzureClientID: appID,
AzureClientSecret: appSecret,
Expand Down
2 changes: 1 addition & 1 deletion pkg/namespacestore/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,7 +646,7 @@ func (r *Reconciler) MakeExternalConnectionParams() (*nb.AddExternalConnectionPa
logsAnalyticsWorkspaceID := r.Secret.StringData["LogsAnalyticsWorkspaceID"]

if tenantID != "" && appID != "" && appSecret != "" && logsAnalyticsWorkspaceID != "" {
conn.AzureLogAccessKeys = nb.AzureLogAccessKeysParams{
conn.AzureLogAccessKeys = &nb.AzureLogAccessKeysParams{
AzureTenantID: tenantID,
AzureClientID: appID,
AzureClientSecret: appSecret,
Expand Down
44 changes: 22 additions & 22 deletions pkg/nb/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,28 +681,28 @@ type AzureLogAccessKeysParams struct {

// AddExternalConnectionParams is the params of account_api.add_external_connection()
type AddExternalConnectionParams struct {
Name string `json:"name"`
EndpointType EndpointType `json:"endpoint_type"`
Endpoint string `json:"endpoint"`
Identity string `json:"identity"`
Secret string `json:"secret"`
AuthMethod CloudAuthMethod `json:"auth_method,omitempty"`
AWSSTSARN string `json:"aws_sts_arn,omitempty"`
Region string `json:"region,omitempty"`
AzureLogAccessKeys AzureLogAccessKeysParams `json:"azure_log_access_keys,omitempty"`
Name string `json:"name"`
EndpointType EndpointType `json:"endpoint_type"`
Endpoint string `json:"endpoint"`
Identity string `json:"identity"`
Secret string `json:"secret"`
AuthMethod CloudAuthMethod `json:"auth_method,omitempty"`
AWSSTSARN string `json:"aws_sts_arn,omitempty"`
Region string `json:"region,omitempty"`
AzureLogAccessKeys *AzureLogAccessKeysParams `json:"azure_log_access_keys,omitempty"`
}

// CheckExternalConnectionParams is the params of account_api.check_external_connection()
type CheckExternalConnectionParams struct {
Name string `json:"name"`
EndpointType EndpointType `json:"endpoint_type"`
Endpoint string `json:"endpoint"`
Identity string `json:"identity"`
Secret string `json:"secret"`
AuthMethod CloudAuthMethod `json:"auth_method,omitempty"`
AWSSTSARN string `json:"aws_sts_arn,omitempty"`
IgnoreNameAlreadyExist bool `json:"ignore_name_already_exist,omitempty"`
AzureLogAccessKeys AzureLogAccessKeysParams `json:"azure_log_access_keys,omitempty"`
Name string `json:"name"`
EndpointType EndpointType `json:"endpoint_type"`
Endpoint string `json:"endpoint"`
Identity string `json:"identity"`
Secret string `json:"secret"`
AuthMethod CloudAuthMethod `json:"auth_method,omitempty"`
AWSSTSARN string `json:"aws_sts_arn,omitempty"`
IgnoreNameAlreadyExist bool `json:"ignore_name_already_exist,omitempty"`
AzureLogAccessKeys *AzureLogAccessKeysParams `json:"azure_log_access_keys,omitempty"`
}

// CheckExternalConnectionReply is the reply of account_api.check_external_connection()
Expand All @@ -716,10 +716,10 @@ type CheckExternalConnectionReply struct {

// UpdateExternalConnectionParams is the params of account_api.update_external_connection()
type UpdateExternalConnectionParams struct {
Name string `json:"name"`
Identity string `json:"identity"`
Secret string `json:"secret"`
AzureLogAccessKeys AzureLogAccessKeysParams `json:"azure_log_access_keys,omitempty"`
Name string `json:"name"`
Identity string `json:"identity"`
Secret string `json:"secret"`
AzureLogAccessKeys *AzureLogAccessKeysParams `json:"azure_log_access_keys,omitempty"`
}

// DeleteExternalConnectionParams is the params of account_api.delete_external_connection()
Expand Down
Loading