Merge pull request #1176 from Neon-White/change-azure-creds-to-pointer

noobaa · Jul 19, 2023 · 18f09ee · 18f09ee
2 parents 51c88f3 + 8b70af6
commit 18f09ee
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 24 deletions.
diff --git a/pkg/backingstore/reconciler.go b/pkg/backingstore/reconciler.go
@@ -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,

diff --git a/pkg/namespacestore/reconciler.go b/pkg/namespacestore/reconciler.go
@@ -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,

diff --git a/pkg/nb/types.go b/pkg/nb/types.go
@@ -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()
@@ -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()