Storage transfer sas (#5006) (#9671)

* Fix incorrect nested object reference * Skip sweepers * Remove assuredworkloads sweeper * Remove extra code Signed-off-by: Modular Magician <magic-modules@google.com>
hashicorp · Jul 29, 2021 · 0e315b0 · 0e315b0
1 parent fa5c669
commit 0e315b0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 62 deletions.
diff --git a/.changelog/5006.txt b/.changelog/5006.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+storage: fixed a crash when `azure_credentials` was defined in `google_storage_transfer_job`
+```
diff --git a/google/resource_assured_workloads_workload_sweeper_test.go b/google/resource_assured_workloads_workload_sweeper_test.go
diff --git a/google/resource_storage_transfer_job.go b/google/resource_storage_transfer_job.go
@@ -843,15 +843,11 @@ func expandAzureBlobStorageData(azureBlobStorageDatas []interface{}) *storagetra
 
 	azureBlobStorageData := azureBlobStorageDatas[0].(map[string]interface{})
 
-	if azureBlobStorageData["sas_token"] == nil {
-		log.Printf("[DEBUG] sas_token is not found")
-		return nil
-	}
 	return &storagetransfer.AzureBlobStorageData{
 		Container:        azureBlobStorageData["container"].(string),
 		Path:             azureBlobStorageData["path"].(string),
 		StorageAccount:   azureBlobStorageData["storage_account"].(string),
-		AzureCredentials: expandAzureCredentials(azureBlobStorageData["sas_token"].([]interface{})),
+		AzureCredentials: expandAzureCredentials(azureBlobStorageData["azure_credentials"].([]interface{})),
 	}
 }