@@ -1578,22 +1578,6 @@ func resourceTencentCloudInstanceDelete(d *schema.ResourceData, meta interface{}
1578
1578
return err
1579
1579
}
1580
1580
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
-
1597
1581
//check recycling
1598
1582
notExist := false
1599
1583
@@ -1636,11 +1620,11 @@ func resourceTencentCloudInstanceDelete(d *schema.ResourceData, meta interface{}
1636
1620
dataDisks := v .([]interface {})
1637
1621
for _ , d := range dataDisks {
1638
1622
value := d .(map [string ]interface {})
1639
- diskId := value ["data_disk_id" ].(string )
1640
1623
deleteWithInstancePrepaid := value ["delete_with_instance_prepaid" ].(bool )
1641
1624
if deleteWithInstancePrepaid {
1625
+ diskId := value ["data_disk_id" ].(string )
1642
1626
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 {
1644
1628
diskInfo , e := cbsService .DescribeDiskById (ctx , diskId )
1645
1629
if e != nil {
1646
1630
return tccommon .RetryError (e , tccommon .InternalError )
@@ -1779,9 +1763,9 @@ func resourceTencentCloudInstanceDelete(d *schema.ResourceData, meta interface{}
1779
1763
value := d .(map [string ]interface {})
1780
1764
diskId := value ["data_disk_id" ].(string )
1781
1765
deleteWithInstance := value ["delete_with_instance" ].(bool )
1782
- if deleteWithInstance {
1766
+ if deleteWithInstance && instanceChargeType == CVM_CHARGE_TYPE_POSTPAID {
1783
1767
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 {
1785
1769
diskInfo , e := cbsService .DescribeDiskById (ctx , diskId )
1786
1770
if e != nil {
1787
1771
return tccommon .RetryError (e , tccommon .InternalError )
@@ -1864,9 +1848,9 @@ func resourceTencentCloudInstanceDelete(d *schema.ResourceData, meta interface{}
1864
1848
}
1865
1849
1866
1850
deleteWithInstancePrepaid := value ["delete_with_instance_prepaid" ].(bool )
1867
- if deleteWithInstancePrepaid {
1851
+ if deleteWithInstancePrepaid && instanceChargeType == CVM_CHARGE_TYPE_PREPAID {
1868
1852
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 {
1870
1854
diskInfo , e := cbsService .DescribeDiskById (ctx , diskId )
1871
1855
if e != nil {
1872
1856
return tccommon .RetryError (e , tccommon .InternalError )
0 commit comments