r/storage_blob: removing unsupported tests

hashicorp · Aug 23, 2019 · 9971cce · 9971cce
1 parent 2828557
commit 9971cce
Showing 1 changed file with 49 additions and 71 deletions.
diff --git a/azurerm/resource_arm_storage_blob_test.go b/azurerm/resource_arm_storage_blob_test.go
@@ -20,6 +20,15 @@ import (
 var supportsNewStorageFeatures = false
 
 func TestAccAzureRMStorageBlob_disappears(t *testing.T) {
+	sourceBlob, err := ioutil.TempFile("", "")
+	if err != nil {
+		t.Fatalf("Failed to create local source blob file")
+	}
+
+	if err := testAccAzureRMStorageBlob_populateTempFile(sourceBlob); err != nil {
+		t.Fatalf("Error populating temp file: %s", err)
+	}
+
 	resourceName := "azurerm_storage_blob.test"
 	ri := tf.AccRandTimeInt()
 	rs := strings.ToLower(acctest.RandString(11))
@@ -31,7 +40,7 @@ func TestAccAzureRMStorageBlob_disappears(t *testing.T) {
 		CheckDestroy: testCheckAzureRMStorageBlobDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccAzureRMStorageBlob_blockEmpty(ri, rs, location),
+				Config: testAccAzureRMStorageBlob_blockFromLocalBlob(ri, rs, location, sourceBlob.Name()),
 				Check: resource.ComposeTestCheckFunc(
 					testCheckAzureRMStorageBlobExists(resourceName),
 					testCheckAzureRMStorageBlobDisappears(resourceName),
@@ -104,7 +113,7 @@ func TestAccAzureRMStorageBlob_appendEmptyMetaData(t *testing.T) {
 	})
 }
 
-func TestAccAzureRMStorageBlob_blockEmpty(t *testing.T) {
+func TestAccAzureRMStorageBlob_blockFromPublicBlob(t *testing.T) {
 	resourceName := "azurerm_storage_blob.test"
 	ri := tf.AccRandTimeInt()
 	rs := strings.ToLower(acctest.RandString(11))
@@ -116,7 +125,7 @@ func TestAccAzureRMStorageBlob_blockEmpty(t *testing.T) {
 		CheckDestroy: testCheckAzureRMStorageBlobDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccAzureRMStorageBlob_blockEmpty(ri, rs, location),
+				Config: testAccAzureRMStorageBlob_blockFromPublicBlob(ri, rs, location),
 				Check: resource.ComposeTestCheckFunc(
 					testCheckAzureRMStorageBlobExists(resourceName),
 				),
@@ -131,7 +140,7 @@ func TestAccAzureRMStorageBlob_blockEmpty(t *testing.T) {
 	})
 }
 
-func TestAccAzureRMStorageBlob_blockEmptyMetaData(t *testing.T) {
+func TestAccAzureRMStorageBlob_blockFromPublicFile(t *testing.T) {
 	resourceName := "azurerm_storage_blob.test"
 	ri := tf.AccRandTimeInt()
 	rs := strings.ToLower(acctest.RandString(11))
@@ -143,7 +152,7 @@ func TestAccAzureRMStorageBlob_blockEmptyMetaData(t *testing.T) {
 		CheckDestroy: testCheckAzureRMStorageBlobDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccAzureRMStorageBlob_blockEmptyMetaData(ri, rs, location),
+				Config: testAccAzureRMStorageBlob_blockFromPublicFile(ri, rs, location),
 				Check: resource.ComposeTestCheckFunc(
 					testCheckAzureRMStorageBlobExists(resourceName),
 				),
@@ -158,7 +167,7 @@ func TestAccAzureRMStorageBlob_blockEmptyMetaData(t *testing.T) {
 	})
 }
 
-func TestAccAzureRMStorageBlob_blockFromPublicBlob(t *testing.T) {
+func TestAccAzureRMStorageBlob_blockFromExistingBlob(t *testing.T) {
 	resourceName := "azurerm_storage_blob.test"
 	ri := tf.AccRandTimeInt()
 	rs := strings.ToLower(acctest.RandString(11))
@@ -170,7 +179,7 @@ func TestAccAzureRMStorageBlob_blockFromPublicBlob(t *testing.T) {
 		CheckDestroy: testCheckAzureRMStorageBlobDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccAzureRMStorageBlob_blockFromPublicBlob(ri, rs, location),
+				Config: testAccAzureRMStorageBlob_blockFromExistingBlob(ri, rs, location),
 				Check: resource.ComposeTestCheckFunc(
 					testCheckAzureRMStorageBlobExists(resourceName),
 				),
@@ -185,34 +194,16 @@ func TestAccAzureRMStorageBlob_blockFromPublicBlob(t *testing.T) {
 	})
 }
 
-func TestAccAzureRMStorageBlob_blockFromPublicFile(t *testing.T) {
-	resourceName := "azurerm_storage_blob.test"
-	ri := tf.AccRandTimeInt()
-	rs := strings.ToLower(acctest.RandString(11))
-	location := testLocation()
+func TestAccAzureRMStorageBlob_blockFromLocalFile(t *testing.T) {
+	sourceBlob, err := ioutil.TempFile("", "")
+	if err != nil {
+		t.Fatalf("Failed to create local source blob file")
+	}
 
-	resource.ParallelTest(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
-		Providers:    testAccProviders,
-		CheckDestroy: testCheckAzureRMStorageBlobDestroy,
-		Steps: []resource.TestStep{
-			{
-				Config: testAccAzureRMStorageBlob_blockFromPublicFile(ri, rs, location),
-				Check: resource.ComposeTestCheckFunc(
-					testCheckAzureRMStorageBlobExists(resourceName),
-				),
-			},
-			{
-				ResourceName:            resourceName,
-				ImportState:             true,
-				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"attempts", "parallelism", "size", "type"},
-			},
-		},
-	})
-}
+	if err := testAccAzureRMStorageBlob_populateTempFile(sourceBlob); err != nil {
+		t.Fatalf("Error populating temp file: %s", err)
+	}
 
-func TestAccAzureRMStorageBlob_blockFromExistingBlob(t *testing.T) {
 	resourceName := "azurerm_storage_blob.test"
 	ri := tf.AccRandTimeInt()
 	rs := strings.ToLower(acctest.RandString(11))
@@ -224,22 +215,23 @@ func TestAccAzureRMStorageBlob_blockFromExistingBlob(t *testing.T) {
 		CheckDestroy: testCheckAzureRMStorageBlobDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccAzureRMStorageBlob_blockFromExistingBlob(ri, rs, location),
+				Config: testAccAzureRMStorageBlob_blockFromLocalBlob(ri, rs, location, sourceBlob.Name()),
 				Check: resource.ComposeTestCheckFunc(
 					testCheckAzureRMStorageBlobExists(resourceName),
+					testCheckAzureRMStorageBlobMatchesFile(resourceName, storage.BlobTypeBlock, sourceBlob.Name()),
 				),
 			},
 			{
 				ResourceName:            resourceName,
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"attempts", "parallelism", "size", "type"},
+				ImportStateVerifyIgnore: []string{"attempts", "parallelism", "size", "source", "type"},
 			},
 		},
 	})
 }
 
-func TestAccAzureRMStorageBlob_blockFromLocalFile(t *testing.T) {
+func TestAccAzureRMStorageBlob_blockFromLocalFileMetaData(t *testing.T) {
 	sourceBlob, err := ioutil.TempFile("", "")
 	if err != nil {
 		t.Fatalf("Failed to create local source blob file")
@@ -260,7 +252,7 @@ func TestAccAzureRMStorageBlob_blockFromLocalFile(t *testing.T) {
 		CheckDestroy: testCheckAzureRMStorageBlobDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccAzureRMStorageBlob_blockFromLocalBlob(ri, rs, location, sourceBlob.Name()),
+				Config: testAccAzureRMStorageBlob_blockFromLocalBlobMetaData(ri, rs, location, sourceBlob.Name()),
 				Check: resource.ComposeTestCheckFunc(
 					testCheckAzureRMStorageBlobExists(resourceName),
 					testCheckAzureRMStorageBlobMatchesFile(resourceName, storage.BlobTypeBlock, sourceBlob.Name()),
@@ -710,40 +702,6 @@ resource "azurerm_storage_blob" "test" {
 `, template)
 }
 
-func testAccAzureRMStorageBlob_blockEmpty(rInt int, rString string, location string) string {
-	template := testAccAzureRMStorageBlob_template(rInt, rString, location, "private")
-	return fmt.Sprintf(`
-%s
-
-resource "azurerm_storage_blob" "test" {
-  name                   = "example.vhd"
-  resource_group_name    = "${azurerm_resource_group.test.name}"
-  storage_account_name   = "${azurerm_storage_account.test.name}"
-  storage_container_name = "${azurerm_storage_container.test.name}"
-  type                   = "block"
-}
-`, template)
-}
-
-func testAccAzureRMStorageBlob_blockEmptyMetaData(rInt int, rString string, location string) string {
-	template := testAccAzureRMStorageBlob_template(rInt, rString, location, "private")
-	return fmt.Sprintf(`
-%s
-
-resource "azurerm_storage_blob" "test" {
-  name                   = "example.vhd"
-  resource_group_name    = "${azurerm_resource_group.test.name}"
-  storage_account_name   = "${azurerm_storage_account.test.name}"
-  storage_container_name = "${azurerm_storage_container.test.name}"
-  type                   = "block"
-
-  metadata = {
-    hello = "world"
-  }
-}
-`, template)
-}
-
 func testAccAzureRMStorageBlob_blockFromPublicBlob(rInt int, rString, location string) string {
 	template := testAccAzureRMStorageBlob_template(rInt, rString, location, "blob")
 	return fmt.Sprintf(`
@@ -838,6 +796,26 @@ resource "azurerm_storage_blob" "test" {
 `, template, fileName)
 }
 
+func testAccAzureRMStorageBlob_blockFromLocalBlobMetaData(rInt int, rString, location, fileName string) string {
+	template := testAccAzureRMStorageBlob_template(rInt, rString, location, "private")
+	return fmt.Sprintf(`
+%s
+
+resource "azurerm_storage_blob" "test" {
+  name                   = "example.vhd"
+  resource_group_name    = "${azurerm_resource_group.test.name}"
+  storage_account_name   = "${azurerm_storage_account.test.name}"
+  storage_container_name = "${azurerm_storage_container.test.name}"
+  type                   = "block"
+  source                 = "%s"
+
+  metadata = {
+    hello = "world"
+  }
+}
+`, template, fileName)
+}
+
 func testAccAzureRMStorageBlob_contentType(rInt int, rString, location string) string {
 	template := testAccAzureRMStorageBlob_template(rInt, rString, location, "private")
 	return fmt.Sprintf(`