fix(cvm): [116173103] tencentcloud_instance support delete prepaid disk

.changelog/2794.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/tencentcloud_instance: support delete prepaid disk.
+```

tencentcloud/services/cvm/resource_tc_instance.go

@@ -288,6 +288,13 @@ func ResourceTencentCloudInstance() *schema.Resource {
 							ForceNew:    true,
 							Description: "Decides whether the disk is deleted with instance(only applied to `CLOUD_BASIC`, `CLOUD_SSD` and `CLOUD_PREMIUM` disk with `POSTPAID_BY_HOUR` instance), default is true.",
 						},
+						"delete_with_instance_prepaid": {
+							Type:        schema.TypeBool,
+							Optional:    true,
+							Default:     false,
+							ForceNew:    true,
+							Description: "Decides whether the disk is deleted with instance(only applied to `CLOUD_BASIC`, `CLOUD_SSD` and `CLOUD_PREMIUM` disk with `PREPAID` instance), default is false.",
+						},
 						"encrypt": {
 							Type:        schema.TypeBool,
 							Optional:    true,
@@ -997,7 +1004,12 @@ func resourceTencentCloudInstanceRead(d *schema.ResourceData, meta interface{})
 		}
 	}
 
-	for _, disk := range instance.DataDisks {
+	tmpDataDisks := make([]interface{}, 0, len(instance.DataDisks))
+	if v, ok := d.GetOk("data_disks"); ok {
+		tmpDataDisks = v.([]interface{})
+	}
+
+	for index, disk := range instance.DataDisks {
 		dataDisk := make(map[string]interface{}, 5)
 		dataDisk["data_disk_id"] = disk.DiskId
 		if disk.DiskId == nil {
@@ -1006,6 +1018,15 @@ func resourceTencentCloudInstanceRead(d *schema.ResourceData, meta interface{})
 			dataDisk["data_disk_size"] = size
 		}
 
+		dataDisk["delete_with_instance_prepaid"] = false
+		if len(tmpDataDisks) == len(instance.DataDisks) {
+			tmpDataDisk := tmpDataDisks[index].(map[string]interface{})
+			if deleteWithInstancePrepaid, ok := tmpDataDisk["delete_with_instance_prepaid"]; ok {
+				deleteWithInstancePrepaidBool := deleteWithInstancePrepaid.(bool)
+				dataDisk["delete_with_instance_prepaid"] = deleteWithInstancePrepaidBool
+			}
+		}
+
 		dataDisk["data_disk_type"] = disk.DiskType
 		dataDisk["data_disk_snapshot_id"] = disk.SnapshotId
 		dataDisk["delete_with_instance"] = disk.DeleteWithInstance
@@ -1558,20 +1579,20 @@ func resourceTencentCloudInstanceDelete(d *schema.ResourceData, meta interface{}
 	}
 
 	// prepaid need delete again
-	if instanceChargeType == CVM_CHARGE_TYPE_PREPAID {
-		err = resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
-			errRet := cvmService.DeleteInstance(ctx, instanceId)
-			if errRet != nil {
-				return tccommon.RetryError(errRet)
-			}
-
-			return nil
-		})
-
-		if err != nil {
-			return err
-		}
-	}
+	//if instanceChargeType == CVM_CHARGE_TYPE_PREPAID {
+	//	err = resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
+	//		errRet := cvmService.DeleteInstance(ctx, instanceId)
+	//		if errRet != nil {
+	//			return tccommon.RetryError(errRet)
+	//		}
+	//
+	//		return nil
+	//	})
+	//
+	//	if err != nil {
+	//		return err
+	//	}
+	//}
 
 	//check recycling
 	notExist := false
@@ -1610,6 +1631,101 @@ func resourceTencentCloudInstanceDelete(d *schema.ResourceData, meta interface{}
 		return nil
 	}
 
+	if instanceChargeType == CVM_CHARGE_TYPE_PREPAID {
+		if v, ok := d.GetOk("data_disks"); ok {
+			dataDisks := v.([]interface{})
+			for _, d := range dataDisks {
+				value := d.(map[string]interface{})
+				diskId := value["data_disk_id"].(string)
+				deleteWithInstancePrepaid := value["delete_with_instance_prepaid"].(bool)
+				if deleteWithInstancePrepaid {
+					cbsService := svccbs.NewCbsService(meta.(tccommon.ProviderMeta).GetAPIV3Conn())
+					err := resource.Retry(tccommon.ReadRetryTimeout*2, func() *resource.RetryError {
+						diskInfo, e := cbsService.DescribeDiskById(ctx, diskId)
+						if e != nil {
+							return tccommon.RetryError(e, tccommon.InternalError)
+						}
+
+						if *diskInfo.DiskState != svccbs.CBS_STORAGE_STATUS_ATTACHED {
+							return resource.RetryableError(fmt.Errorf("cbs storage status is %s", *diskInfo.DiskState))
+						}
+
+						return nil
+					})
+
+					if err != nil {
+						log.Printf("[CRITAL]%s delete cbs failed, reason:%s\n ", logId, err.Error())
+						return err
+					}
+
+					err = resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
+						e := cbsService.DetachDisk(ctx, diskId, instanceId)
+						if e != nil {
+							return tccommon.RetryError(e, tccommon.InternalError)
+						}
+
+						return nil
+					})
+
+					if err != nil {
+						log.Printf("[CRITAL]%s detach cbs failed, reason:%s\n ", logId, err.Error())
+						return err
+					}
+
+					err = resource.Retry(tccommon.ReadRetryTimeout*2, func() *resource.RetryError {
+						diskInfo, e := cbsService.DescribeDiskById(ctx, diskId)
+						if e != nil {
+							return tccommon.RetryError(e, tccommon.InternalError)
+						}
+
+						if *diskInfo.DiskState != svccbs.CBS_STORAGE_STATUS_UNATTACHED {
+							return resource.RetryableError(fmt.Errorf("cbs storage status is %s", *diskInfo.DiskState))
+						}
+
+						return nil
+					})
+
+					if err != nil {
+						log.Printf("[CRITAL]%s read cbs status failed, reason:%s\n ", logId, err.Error())
+						return err
+					}
+
+					err = resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
+						e := cbsService.DeleteDiskById(ctx, diskId)
+						if e != nil {
+							return tccommon.RetryError(e, tccommon.InternalError)
+						}
+
+						return nil
+					})
+
+					if err != nil {
+						log.Printf("[CRITAL]%s delete cbs failed, reason:%s\n ", logId, err.Error())
+						return err
+					}
+
+					err = resource.Retry(tccommon.ReadRetryTimeout*2, func() *resource.RetryError {
+						diskInfo, e := cbsService.DescribeDiskById(ctx, diskId)
+						if e != nil {
+							return tccommon.RetryError(e, tccommon.InternalError)
+						}
+
+						if *diskInfo.DiskState != svccbs.CBS_STORAGE_STATUS_TORECYCLE {
+							return resource.RetryableError(fmt.Errorf("cbs storage status is %s", *diskInfo.DiskState))
+						}
+
+						return nil
+					})
+
+					if err != nil {
+						log.Printf("[CRITAL]%s read cbs status failed, reason:%s\n ", logId, err.Error())
+						return err
+					}
+				}
+			}
+		}
+	}
+
 	if !forceDelete {
 		return nil
 	}
@@ -1746,6 +1862,60 @@ func resourceTencentCloudInstanceDelete(d *schema.ResourceData, meta interface{}
 					return err
 				}
 			}
+
+			deleteWithInstancePrepaid := value["delete_with_instance_prepaid"].(bool)
+			if deleteWithInstancePrepaid {
+				cbsService := svccbs.NewCbsService(meta.(tccommon.ProviderMeta).GetAPIV3Conn())
+				err := resource.Retry(tccommon.ReadRetryTimeout*2, func() *resource.RetryError {
+					diskInfo, e := cbsService.DescribeDiskById(ctx, diskId)
+					if e != nil {
+						return tccommon.RetryError(e, tccommon.InternalError)
+					}
+
+					if *diskInfo.DiskState != svccbs.CBS_STORAGE_STATUS_TORECYCLE {
+						return resource.RetryableError(fmt.Errorf("cbs storage status is %s", *diskInfo.DiskState))
+					}
+
+					return nil
+				})
+
+				if err != nil {
+					log.Printf("[CRITAL]%s delete cbs failed, reason:%s\n ", logId, err.Error())
+					return err
+				}
+
+				err = resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
+					e := cbsService.DeleteDiskById(ctx, diskId)
+					if e != nil {
+						return tccommon.RetryError(e, tccommon.InternalError)
+					}
+
+					return nil
+				})
+
+				if err != nil {
+					log.Printf("[CRITAL]%s delete cbs failed, reason:%s\n ", logId, err.Error())
+					return err
+				}
+
+				err = resource.Retry(tccommon.ReadRetryTimeout*2, func() *resource.RetryError {
+					diskInfo, e := cbsService.DescribeDiskById(ctx, diskId)
+					if e != nil {
+						return tccommon.RetryError(e, tccommon.InternalError)
+					}
+
+					if diskInfo != nil {
+						return resource.RetryableError(fmt.Errorf("cbs storage status is %s", *diskInfo.DiskState))
+					}
+
+					return nil
+				})
+
+				if err != nil {
+					log.Printf("[CRITAL]%s read cbs status failed, reason:%s\n ", logId, err.Error())
+					return err
+				}
+			}
 		}
 	}
 

website/docs/r/instance.html.markdown

@@ -266,6 +266,7 @@ The `data_disks` object supports the following:
 * `data_disk_type` - (Required, String, ForceNew) Data disk type. For more information about limits on different data disk types, see [Storage Overview](https://intl.cloud.tencent.com/document/product/213/4952). Valid values: LOCAL_BASIC: local disk, LOCAL_SSD: local SSD disk, LOCAL_NVME: local NVME disk, specified in the InstanceType, LOCAL_PRO: local HDD disk, specified in the InstanceType, CLOUD_BASIC: HDD cloud disk, CLOUD_PREMIUM: Premium Cloud Storage, CLOUD_SSD: SSD, CLOUD_HSSD: Enhanced SSD, CLOUD_TSSD: Tremendous SSD, CLOUD_BSSD: Balanced SSD.
 * `data_disk_id` - (Optional, String) Data disk ID used to initialize the data disk. When data disk type is `LOCAL_BASIC` and `LOCAL_SSD`, disk id is not supported.
 * `data_disk_snapshot_id` - (Optional, String, ForceNew) Snapshot ID of the data disk. The selected data disk snapshot size must be smaller than the data disk size.
+* `delete_with_instance_prepaid` - (Optional, Bool, ForceNew) Decides whether the disk is deleted with instance(only applied to `CLOUD_BASIC`, `CLOUD_SSD` and `CLOUD_PREMIUM` disk with `PREPAID` instance), default is false.
 * `delete_with_instance` - (Optional, Bool, ForceNew) Decides whether the disk is deleted with instance(only applied to `CLOUD_BASIC`, `CLOUD_SSD` and `CLOUD_PREMIUM` disk with `POSTPAID_BY_HOUR` instance), default is true.
 * `encrypt` - (Optional, Bool, ForceNew) Decides whether the disk is encrypted. Default is `false`.
 * `throughput_performance` - (Optional, Int, ForceNew) Add extra performance to the data disk. Only works when disk type is `CLOUD_TSSD` or `CLOUD_HSSD`.