r/managed_disk: ensuring that disk_encryption_set_id is always set

hashicorp · Jan 14, 2020 · 189508e · 189508e
1 parent 74baefb
commit 189508e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/azurerm/internal/services/compute/resource_arm_managed_disk.go b/azurerm/internal/services/compute/resource_arm_managed_disk.go
@@ -342,9 +342,11 @@ func resourceArmManagedDiskRead(d *schema.ResourceData, meta interface{}) error
 		d.Set("disk_mbps_read_write", props.DiskMBpsReadWrite)
 		d.Set("os_type", props.OsType)
 
-		if encryption := props.Encryption; encryption != nil {
-			d.Set("disk_encryption_set_id", encryption.DiskEncryptionSetID)
+		diskEncryptionSetId := ""
+		if props.Encryption != nil && props.Encryption.DiskEncryptionSetID != nil {
+			diskEncryptionSetId = *props.Encryption.DiskEncryptionSetID
 		}
+		d.Set("disk_encryption_set_id", diskEncryptionSetId)
 
 		if err := d.Set("encryption_settings", flattenManagedDiskEncryptionSettings(props.EncryptionSettingsCollection)); err != nil {
 			return fmt.Errorf("Error setting `encryption_settings`: %+v", err)

diff --git a/azurerm/internal/services/compute/tests/resource_arm_managed_disk_test.go b/azurerm/internal/services/compute/tests/resource_arm_managed_disk_test.go
@@ -219,13 +219,13 @@ func TestAccAzureRMManagedDisk_NonStandardCasing(t *testing.T) {
 		CheckDestroy: testCheckAzureRMManagedDiskDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccAzureRMManagedDiskNonStandardCasing(data),
+				Config: testAccAzureRMManagedDisk_nonStandardCasing(data),
 				Check: resource.ComposeTestCheckFunc(
 					testCheckAzureRMManagedDiskExists(data.ResourceName, &d, true),
 				),
 			},
 			{
-				Config:             testAccAzureRMManagedDiskNonStandardCasing(data),
+				Config:             testAccAzureRMManagedDisk_nonStandardCasing(data),
 				PlanOnly:           true,
 				ExpectNonEmptyPlan: false,
 			},
@@ -616,7 +616,7 @@ resource "azurerm_managed_disk" "test" {
 `, data.RandomInteger, data.Locations.Primary, data.RandomInteger)
 }
 
-func testAccAzureRMManagedDiskNonStandardCasing(data acceptance.TestData) string {
+func testAccAzureRMManagedDisk_nonStandardCasing(data acceptance.TestData) string {
 	return fmt.Sprintf(`
 resource "azurerm_resource_group" "test" {
   name     = "acctestRG-%d"