set data_disks in all cases if feature is toggled on

hashicorp · Feb 15, 2021 · b28a4fb · b28a4fb
1 parent 4c1e7f5
commit b28a4fb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/azurerm/internal/services/compute/linux_virtual_machine_resource.go b/azurerm/internal/services/compute/linux_virtual_machine_resource.go
@@ -665,13 +665,11 @@ func resourceLinuxVirtualMachineRead(d *schema.ResourceData, meta interface{}) e
 		}
 
 		if features.VMDataDiskBeta() {
-			if profile.DataDisks != nil {
-				dataDisks, err := flattenVirtualMachineDataDisks(profile.DataDisks)
-				if err != nil {
-					return err
-				}
-				d.Set("data_disks", dataDisks)
+			dataDisks, err := flattenVirtualMachineDataDisks(profile.DataDisks)
+			if err != nil {
+				return err
 			}
+			d.Set("data_disks", dataDisks)
 		}
 	}
 

diff --git a/azurerm/internal/services/compute/windows_virtual_machine_resource.go b/azurerm/internal/services/compute/windows_virtual_machine_resource.go
@@ -724,13 +724,11 @@ func resourceWindowsVirtualMachineRead(d *schema.ResourceData, meta interface{})
 		}
 
 		if features.VMDataDiskBeta() {
-			if props.StorageProfile.DataDisks != nil {
-				dataDisks, err := flattenVirtualMachineDataDisks(props.StorageProfile.DataDisks)
-				if err != nil {
-					return err
-				}
-				d.Set("data_disks", dataDisks)
+			dataDisks, err := flattenVirtualMachineDataDisks(props.StorageProfile.DataDisks)
+			if err != nil {
+				return err
 			}
+			d.Set("data_disks", dataDisks)
 		}
 	}