Merge pull request #650 from tencentcloudstack/feature/read_cvm_data_disks

fix read cvm data_disks bug

Author: hellertang

tencentcloud/resource_tc_instance.go

@@ -910,54 +910,16 @@ func resourceTencentCloudInstanceRead(d *schema.ResourceData, meta interface{})
 
 	//set data_disks
 	dataDiskList := make([]map[string]interface{}, 0, len(instance.DataDisks))
-	if v, ok := d.GetOk("data_disks"); ok {
-		// record the used disk id
-		usedDiskId := make(map[string]bool, len(instance.DataDisks))
-		for _, d := range v.([]interface{}) {
-			value := d.(map[string]interface{})
-			var (
-				snapshotId, diskId     string
-				deleteWithInstanceBool bool
-				encryptBool            bool
-				throughputPerformance  int
-			)
-			diskType := value["data_disk_type"].(string)
-			diskSize := int64(value["data_disk_size"].(int))
-			if v, ok := value["data_disk_snapshot_id"]; ok && v != nil {
-				snapshotId = v.(string)
-			}
-			if deleteWithInstance, ok := value["delete_with_instance"]; ok {
-				deleteWithInstanceBool = deleteWithInstance.(bool)
-			}
-			if encrypt, ok := value["encrypt"]; ok {
-				encryptBool = encrypt.(bool)
-			}
-
-			if tp, ok := value["throughput_performance"]; ok && tp != 0 {
-				//this value is not in the resp
-				throughputPerformance = tp.(int)
-			}
-			// find the disk id value
-			for _, disk := range instance.DataDisks {
-				if diskType == *disk.DiskType && diskSize == *disk.DiskSize &&
-					deleteWithInstanceBool == *disk.DeleteWithInstance && !usedDiskId[*disk.DiskId] {
-
-					usedDiskId[*disk.DiskId] = true
-					diskId = *disk.DiskId
-					break
-				}
-			}
-
-			dataDisk := make(map[string]interface{}, 5)
-			dataDisk["data_disk_snapshot_id"] = snapshotId
-			dataDisk["data_disk_type"] = diskType
-			dataDisk["data_disk_size"] = diskSize
-			dataDisk["data_disk_id"] = diskId
-			dataDisk["delete_with_instance"] = deleteWithInstanceBool
-			dataDisk["encrypt"] = encryptBool
-			dataDisk["throughput_performance"] = throughputPerformance
-			dataDiskList = append(dataDiskList, dataDisk)
-		}
+	for _, disk := range instance.DataDisks {
+		dataDisk := make(map[string]interface{}, 5)
+		dataDisk["data_disk_snapshot_id"] = disk.SnapshotId
+		dataDisk["data_disk_type"] = disk.DiskType
+		dataDisk["data_disk_size"] = disk.DiskSize
+		dataDisk["data_disk_id"] = disk.DiskId
+		dataDisk["delete_with_instance"] = disk.DeleteWithInstance
+		dataDisk["encrypt"] = disk.Encrypt
+		dataDisk["throughput_performance"] = disk.ThroughputPerformance
+		dataDiskList = append(dataDiskList, dataDisk)
 	}
 	_ = d.Set("data_disks", dataDiskList)