used getOk for cloud_init_cdrom_uuid

nutanix · Jan 27, 2021 · 768ffd4 · 768ffd4
1 parent 2c306e4
commit 768ffd4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/nutanix/resource_nutanix_virtual_machine.go b/nutanix/resource_nutanix_virtual_machine.go
@@ -924,8 +924,6 @@ func resourceNutanixVirtualMachineCreate(d *schema.ResourceData, meta interface{
 }
 
 func resourceNutanixVirtualMachineRead(d *schema.ResourceData, meta interface{}) error {
-	initialDiskList := d.Get("disk_list")
-	cloudInitCDromUUID := d.Get("cloud_init_cdrom_uuid")
 	// Get client connection
 	conn := meta.(*Client).API
 	setVMTimeout(meta)

diff --git a/nutanix/structure.go b/nutanix/structure.go
@@ -136,8 +136,10 @@ func getDeviceIndexForDisk(disk *v3.VMDisk) (*int64, error) {
 func flattenDiskListFilterCloudInit(d *schema.ResourceData, disks []*v3.VMDisk) ([]map[string]interface{}, error) {
 	//todo check if guestcust is passed -> if it is not passed, just continue without searching for cloud-init uuid
 	// reason: no device_index or disk id will result in crash
-	cloudInitCdromUUIDInput := d.Get("cloud_init_cdrom_uuid")
-	cloudInitCdromUUID := cloudInitCdromUUIDInput.(string)
+	cloudInitCdromUUID := ""
+	if cloudInitCdromUUIDInput, cliOk := d.GetOk("cloud_init_cdrom_uuid"); cliOk {
+		cloudInitCdromUUID = cloudInitCdromUUIDInput.(string)
+	}
 	filteredDiskList := disks
 	potentialCloudInitIDs := make([]string, 0)
 	if cloudInitCdromUUID == "" && usesGuestCustomization(d) {