@@ -1578,22 +1578,6 @@ func resourceTencentCloudInstanceDelete(d *schema.ResourceData, meta interface{}
15781578 return err
15791579 }
15801580
1581- // prepaid need delete again
1582- //if instanceChargeType == CVM_CHARGE_TYPE_PREPAID {
1583- // err = resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
1584- // errRet := cvmService.DeleteInstance(ctx, instanceId)
1585- // if errRet != nil {
1586- // return tccommon.RetryError(errRet)
1587- // }
1588- //
1589- // return nil
1590- // })
1591- //
1592- // if err != nil {
1593- // return err
1594- // }
1595- //}
1596-
15971581 //check recycling
15981582 notExist := false
15991583
@@ -1636,11 +1620,11 @@ func resourceTencentCloudInstanceDelete(d *schema.ResourceData, meta interface{}
16361620 dataDisks := v .([]interface {})
16371621 for _ , d := range dataDisks {
16381622 value := d .(map [string ]interface {})
1639- diskId := value ["data_disk_id" ].(string )
16401623 deleteWithInstancePrepaid := value ["delete_with_instance_prepaid" ].(bool )
16411624 if deleteWithInstancePrepaid {
1625+ diskId := value ["data_disk_id" ].(string )
16421626 cbsService := svccbs .NewCbsService (meta .(tccommon.ProviderMeta ).GetAPIV3Conn ())
1643- err : = resource .Retry (tccommon .ReadRetryTimeout * 2 , func () * resource.RetryError {
1627+ err = resource .Retry (tccommon .ReadRetryTimeout * 2 , func () * resource.RetryError {
16441628 diskInfo , e := cbsService .DescribeDiskById (ctx , diskId )
16451629 if e != nil {
16461630 return tccommon .RetryError (e , tccommon .InternalError )
@@ -1779,9 +1763,9 @@ func resourceTencentCloudInstanceDelete(d *schema.ResourceData, meta interface{}
17791763 value := d .(map [string ]interface {})
17801764 diskId := value ["data_disk_id" ].(string )
17811765 deleteWithInstance := value ["delete_with_instance" ].(bool )
1782- if deleteWithInstance {
1766+ if deleteWithInstance && instanceChargeType == CVM_CHARGE_TYPE_POSTPAID {
17831767 cbsService := svccbs .NewCbsService (meta .(tccommon.ProviderMeta ).GetAPIV3Conn ())
1784- err : = resource .Retry (tccommon .ReadRetryTimeout * 2 , func () * resource.RetryError {
1768+ err = resource .Retry (tccommon .ReadRetryTimeout * 2 , func () * resource.RetryError {
17851769 diskInfo , e := cbsService .DescribeDiskById (ctx , diskId )
17861770 if e != nil {
17871771 return tccommon .RetryError (e , tccommon .InternalError )
@@ -1864,9 +1848,9 @@ func resourceTencentCloudInstanceDelete(d *schema.ResourceData, meta interface{}
18641848 }
18651849
18661850 deleteWithInstancePrepaid := value ["delete_with_instance_prepaid" ].(bool )
1867- if deleteWithInstancePrepaid {
1851+ if deleteWithInstancePrepaid && instanceChargeType == CVM_CHARGE_TYPE_PREPAID {
18681852 cbsService := svccbs .NewCbsService (meta .(tccommon.ProviderMeta ).GetAPIV3Conn ())
1869- err : = resource .Retry (tccommon .ReadRetryTimeout * 2 , func () * resource.RetryError {
1853+ err = resource .Retry (tccommon .ReadRetryTimeout * 2 , func () * resource.RetryError {
18701854 diskInfo , e := cbsService .DescribeDiskById (ctx , diskId )
18711855 if e != nil {
18721856 return tccommon .RetryError (e , tccommon .InternalError )
0 commit comments