fix cvm data disks (#1985)

* fix cvm data disks

* add changelog

---------

Co-authored-by: mikatong <mikatong@tencent.com>

Author: tongyiming

.changelog/1985.txt

@@ -0,0 +1,4 @@
+```release-note:bug
+resource/tencentcloud_instance: fix order `data_disks`
+```
+

tencentcloud/resource_tc_instance.go

@@ -958,10 +958,14 @@ func resourceTencentCloudInstanceRead(d *schema.ResourceData, meta interface{})
 	_ = d.Set("tags", tags)
 
 	//set data_disks
+	var hasDataDisks, isCombineDataDisks bool
 	dataDiskList := make([]map[string]interface{}, 0, len(instance.DataDisks))
 	diskSizeMap := map[string]*uint64{}
 	diskOrderMap := make(map[string]int)
 
+	if _, ok := d.GetOk("data_disks"); ok {
+		hasDataDisks = true
+	}
 	if len(instance.DataDisks) > 0 {
 		var diskIds []*string
 		for i := range instance.DataDisks {
@@ -987,13 +991,16 @@ func resourceTencentCloudInstanceRead(d *schema.ResourceData, meta interface{})
 					return resource.RetryableError(fmt.Errorf("data_disk[%d] is expending", i))
 				}
 				diskSizeMap[*disk.DiskId] = disk.DiskSize
-				items := strings.Split(*disk.DiskName, "_")
-				diskOrder := items[len(items)-1]
-				diskOrderInt, err := strconv.Atoi(diskOrder)
-				if err != nil {
-					return resource.NonRetryableError(err)
+				if hasDataDisks {
+					items := strings.Split(*disk.DiskName, "_")
+					diskOrder := items[len(items)-1]
+					diskOrderInt, err := strconv.Atoi(diskOrder)
+					if err != nil {
+						isCombineDataDisks = true
+						continue
+					}
+					diskOrderMap[*disk.DiskId] = diskOrderInt
 				}
-				diskOrderMap[*disk.DiskId] = diskOrderInt
 			}
 			return nil
 		})
@@ -1016,11 +1023,13 @@ func resourceTencentCloudInstanceRead(d *schema.ResourceData, meta interface{})
 		dataDisk["throughput_performance"] = disk.ThroughputPerformance
 		dataDiskList = append(dataDiskList, dataDisk)
 	}
-	sort.SliceStable(dataDiskList, func(idx1, idx2 int) bool {
-		dataDiskIdIdx1 := *dataDiskList[idx1]["data_disk_id"].(*string)
-		dataDiskIdIdx2 := *dataDiskList[idx2]["data_disk_id"].(*string)
-		return diskOrderMap[dataDiskIdIdx1] < diskOrderMap[dataDiskIdIdx2]
-	})
+	if hasDataDisks && !isCombineDataDisks {
+		sort.SliceStable(dataDiskList, func(idx1, idx2 int) bool {
+			dataDiskIdIdx1 := *dataDiskList[idx1]["data_disk_id"].(*string)
+			dataDiskIdIdx2 := *dataDiskList[idx2]["data_disk_id"].(*string)
+			return diskOrderMap[dataDiskIdIdx1] < diskOrderMap[dataDiskIdIdx2]
+		})
+	}
 	_ = d.Set("data_disks", dataDiskList)
 
 	if len(instance.PrivateIpAddresses) > 0 {

tencentcloud/resource_tc_instance_test.go

@@ -589,6 +589,28 @@ func TestAccTencentCloudInstanceResource_DataDiskOrder(t *testing.T) {
 	})
 }
 
+func TestAccTencentCloudInstanceResource_DataDiskByCbs(t *testing.T) {
+	t.Parallel()
+
+	id := "tencentcloud_instance.cvm_add_data_disk_by_cbs"
+	resource.Test(t, resource.TestCase{
+		PreCheck:      func() { testAccPreCheck(t) },
+		IDRefreshName: id,
+		Providers:     testAccProviders,
+		CheckDestroy:  testAccCheckInstanceDestroy,
+		Steps: []resource.TestStep{
+			{
+				PreConfig: func() { testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_COMMON) },
+				Config:    testAccTencentCloudInstanceAddDataDiskByCbs,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckTencentCloudDataSourceID(id),
+					testAccCheckTencentCloudInstanceExists(id),
+				),
+			},
+		},
+	})
+}
+
 func TestAccTencentCloudNeedFixInstancePostpaidToPrepaid(t *testing.T) {
 
 	id := "tencentcloud_instance.foo"
@@ -764,6 +786,44 @@ resource "tencentcloud_instance" "foo" {
 }
 `
 
+const testAccTencentCloudInstanceAddDataDiskByCbs = defaultInstanceVariable + `
+resource "tencentcloud_instance" "cvm_add_data_disk_by_cbs" {
+  instance_name     = "cvm-add-data-disk-by-cbs"
+  availability_zone = var.availability_cvm_zone
+  image_id          = data.tencentcloud_images.default.images.0.image_id
+  instance_type     = data.tencentcloud_instance_types.default.instance_types.0.instance_type
+  vpc_id            = var.cvm_vpc_id
+  subnet_id         = var.cvm_subnet_id
+  system_disk_type  = "CLOUD_PREMIUM"
+  project_id        = 0
+}
+
+resource "tencentcloud_cbs_storage" "cbs_disk1" {
+	storage_name = "cbs_disk1"
+	storage_type = "CLOUD_SSD"
+	storage_size = 200
+	availability_zone = var.availability_cvm_zone
+	project_id = 0
+	encrypt = false
+}
+resource "tencentcloud_cbs_storage" "cbs_disk2" {
+	storage_name = "cbs_disk2"
+	storage_type = "CLOUD_SSD"
+	storage_size = 100
+	availability_zone = var.availability_cvm_zone
+	project_id = 0
+	encrypt = false
+}
+resource "tencentcloud_cbs_storage_attachment" "attachment_cbs_disk1" {
+	storage_id = tencentcloud_cbs_storage.cbs_disk1.id
+	instance_id = tencentcloud_instance.cvm_add_data_disk_by_cbs.id
+}
+resource "tencentcloud_cbs_storage_attachment" "attachment_cbs_disk2" {
+	storage_id = tencentcloud_cbs_storage.cbs_disk2.id
+	instance_id = tencentcloud_instance.cvm_add_data_disk_by_cbs.id
+}
+`
+
 const testAccTencentCloudInstancePostPaid = `
 data "tencentcloud_instance_types" "default" {
   filter {