Merge pull request #1968 from AviatrixSystems/AVX-51277

AVX-51277: Do not set bucket_name for config backup in Azure.
AviatrixSystems · Mar 6, 2024 · 5e92924 · 5e92924
1 parent 09ee978
commit 5e92924
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -19,7 +19,7 @@ jobs:
     - name: Set up Go 1.x
       uses: actions/setup-go@v3
       with:
-        go-version: ^1.14
+        go-version: ^1.21
       id: go
 
     - name: Check out code into the Go module directory
@@ -40,7 +40,7 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v3
         with:
-          go-version: ^1.14
+          go-version: ^1.21
         id: go
 
       - name: Check out code into the Go module directory
@@ -64,5 +64,5 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.52
+          version: v1.55
           only-new-issues: true
diff --git a/goaviatrix/controller.go b/goaviatrix/controller.go
@@ -155,15 +155,20 @@ func (c *Client) GetSecurityGroupManagementStatus() (*SecurityGroupInfo, error)
 
 func (c *Client) EnableCloudnBackupConfig(cloudnBackupConfiguration *CloudnBackupConfiguration) error {
 	form := map[string]string{
-		"CID":            c.CID,
-		"action":         "enable_cloudn_backup_config",
-		"cloud_type":     strconv.Itoa(cloudnBackupConfiguration.BackupCloudType),
-		"acct_name":      cloudnBackupConfiguration.BackupAccountName,
-		"bucket_name":    cloudnBackupConfiguration.BackupBucketName,
-		"storage_name":   cloudnBackupConfiguration.BackupStorageName,
-		"container_name": cloudnBackupConfiguration.BackupContainerName,
-		"region":         cloudnBackupConfiguration.BackupRegion,
+		"CID":        c.CID,
+		"action":     "enable_cloudn_backup_config",
+		"cloud_type": strconv.Itoa(cloudnBackupConfiguration.BackupCloudType),
+		"acct_name":  cloudnBackupConfiguration.BackupAccountName,
+		"region":     cloudnBackupConfiguration.BackupRegion,
+	}
+	// Azure has a set of different parameters that must be set.
+	if IsCloudType(cloudnBackupConfiguration.BackupCloudType, AzureArmRelatedCloudTypes) {
+		form["storage_name"] = cloudnBackupConfiguration.BackupStorageName
+		form["container_name"] = cloudnBackupConfiguration.BackupContainerName
+	} else {
+		form["bucket_name"] = cloudnBackupConfiguration.BackupBucketName
 	}
+
 	if cloudnBackupConfiguration.MultipleBackups == "true" {
 		form["multiple_bkup"] = "true"
 	}