Moving to support only managed disks

hashicorp · May 31, 2018 · 46c0f7c · 46c0f7c
1 parent 54fd5b0
commit 46c0f7c
Show file tree

Hide file tree

Showing 5 changed files with 197 additions and 511 deletions.
diff --git a/azurerm/disks.go b/azurerm/disks.go
@@ -19,6 +19,11 @@ func storageAccountNameForUnmanagedDisk(uri string, meta interface{}) (*Unmanage
 		return nil, fmt.Errorf("Cannot parse Disk VHD URI: %s", err)
 	}
 
+	blobDomainSuffix := meta.(*ArmClient).environment.StorageEndpointSuffix
+	if !strings.HasSuffix(strings.ToLower(vhdURL.Host), strings.ToLower(blobDomainSuffix)) {
+		return nil, fmt.Errorf("Error: Disk VHD URI %q doesn't appear to be a Blob Storage URI (%q) - expected a suffix of %q)", uri, vhdURL.Host, blobDomainSuffix)
+	}
+
 	// VHD URI is in the form: https://storageAccountName.blob.core.windows.net/containerName/blobName
 	storageAccountName := strings.Split(vhdURL.Host, ".")[0]
 	path := strings.Split(strings.TrimPrefix(vhdURL.Path, "/"), "/")

diff --git a/azurerm/import_arm_virtual_machine_data_disk_attachment_test.go b/azurerm/import_arm_virtual_machine_data_disk_attachment_test.go
@@ -7,57 +7,11 @@ import (
 	"github.com/hashicorp/terraform/helper/resource"
 )
 
-func TestAccAzureRMVirtualMachineDataDiskAttachment_importSingleVHD(t *testing.T) {
+func TestAccAzureRMVirtualMachineDataDiskAttachment_importBasic(t *testing.T) {
 	resourceName := "azurerm_virtual_machine_data_disk_attachment.test"
 	ri := acctest.RandInt()
 	location := testLocation()
-	config := testAccAzureRMVirtualMachineDataDiskAttachment_singleVHD(ri, location)
-
-	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
-		Providers:    testAccProviders,
-		CheckDestroy: testCheckAzureRMVirtualMachineDataDiskAttachmentDestroy,
-		Steps: []resource.TestStep{
-			{
-				Config: config,
-			},
-			{
-				ResourceName:      resourceName,
-				ImportState:       true,
-				ImportStateVerify: true,
-			},
-		},
-	})
-}
-
-func TestAccAzureRMVirtualMachineDataDiskAttachment_importSingleManagedDisk(t *testing.T) {
-	resourceName := "azurerm_virtual_machine_data_disk_attachment.test"
-	ri := acctest.RandInt()
-	location := testLocation()
-	config := testAccAzureRMVirtualMachineDataDiskAttachment_singleManagedDisk(ri, location)
-
-	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
-		Providers:    testAccProviders,
-		CheckDestroy: testCheckAzureRMVirtualMachineDataDiskAttachmentDestroy,
-		Steps: []resource.TestStep{
-			{
-				Config: config,
-			},
-			{
-				ResourceName:      resourceName,
-				ImportState:       true,
-				ImportStateVerify: true,
-			},
-		},
-	})
-}
-
-func TestAccAzureRMVirtualMachineDataDiskAttachment_importExistingManagedDisk(t *testing.T) {
-	resourceName := "azurerm_virtual_machine_data_disk_attachment.test"
-	ri := acctest.RandInt()
-	location := testLocation()
-	config := testAccAzureRMVirtualMachineDataDiskAttachment_existingManagedDisk(ri, location)
+	config := testAccAzureRMVirtualMachineDataDiskAttachment_basic(ri, location)
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
@@ -79,7 +33,7 @@ func TestAccAzureRMVirtualMachineDataDiskAttachment_importExistingManagedDisk(t
 func TestAccAzureRMVirtualMachineDataDiskAttachment_importMultipleDisks(t *testing.T) {
 	ri := acctest.RandInt()
 	location := testLocation()
-	config := testAccAzureRMVirtualMachineDataDiskAttachment_multipleDisks(ri, location, 1, 2)
+	config := testAccAzureRMVirtualMachineDataDiskAttachment_multipleDisks(ri, location)
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },