Merge pull request #3865 from terraform-providers/f/storage-blob-tests

r/storage_blob: adding additional acceptance tests
hashicorp · Jul 18, 2019 · dae808c · dae808c
2 parents 7f77508 + decfe57
commit dae808c
Show file tree

Hide file tree

Showing 3 changed files with 636 additions and 264 deletions.
diff --git a/azurerm/internal/services/storage/client.go b/azurerm/internal/services/storage/client.go
@@ -27,6 +27,8 @@ type Client struct {
 // NOTE: this temporarily diverges from the other clients until we move this client in here
 // once we have this, can take an Options like everything else
 func BuildClient(accountsClient storage.AccountsClient) *Client {
+	// TODO: switch Storage Containers to using the storage.BlobContainersClient
+	// (which should fix #2977) when the storage clients have been moved in here
 	return &Client{
 		accountsClient: accountsClient,
 	}

diff --git a/azurerm/resource_arm_storage_blob.go b/azurerm/resource_arm_storage_blob.go
@@ -75,10 +75,9 @@ func resourceArmStorageBlob() *schema.Resource {
 			},
 
 			"content_type": {
-				Type:          schema.TypeString,
-				Optional:      true,
-				Default:       "application/octet-stream",
-				ConflictsWith: []string{"source_uri"},
+				Type:     schema.TypeString,
+				Optional: true,
+				Default:  "application/octet-stream",
 			},
 
 			"source": {