fix(vpc): [119556528] tencentcloud_private_dns_record Optimize the logic for deleting resources (#2810)

* add

* add

Author: SevenEarth

.changelog/2810.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/tencentcloud_private_dns_record: Optimize the logic for deleting resources
+```

tencentcloud/services/privatedns/resource_tc_private_dns_record.go

@@ -24,7 +24,6 @@ func ResourceTencentCloudPrivateDnsRecord() *schema.Resource {
 		Importer: &schema.ResourceImporter{
 			State: schema.ImportStatePassthrough,
 		},
-
 		Schema: map[string]*schema.Schema{
 			"zone_id": {
 				Type:        schema.TypeString,
@@ -35,12 +34,12 @@ func ResourceTencentCloudPrivateDnsRecord() *schema.Resource {
 			"record_type": {
 				Type:        schema.TypeString,
 				Required:    true,
-				Description: "Record type. Valid values: \"A\", \"AAAA\", \"CNAME\", \"MX\", \"TXT\", \"PTR\".",
+				Description: "Record type. Valid values: `A`, `AAAA`, `CNAME`, `MX`, `TXT`, `PTR`.",
 			},
 			"sub_domain": {
 				Type:        schema.TypeString,
 				Required:    true,
-				Description: "Subdomain, such as \"www\", \"m\", and \"@\".",
+				Description: "Subdomain, such as `www`, `m`, and `@`.",
 			},
 			"record_value": {
 				Type:        schema.TypeString,
@@ -252,7 +251,7 @@ func resourceTencentCloudDPrivateDnsRecordDelete(d *schema.ResourceData, meta in
 
 	var (
 		logId   = tccommon.GetLogId(tccommon.ContextNil)
-		request = privatedns.NewDescribePrivateZoneRequest()
+		request = privatedns.NewDeletePrivateZoneRecordRequest()
 	)
 
 	idSplit := strings.Split(d.Id(), tccommon.FILED_SP)
@@ -263,54 +262,10 @@ func resourceTencentCloudDPrivateDnsRecordDelete(d *schema.ResourceData, meta in
 	zoneId := idSplit[0]
 	recordId := idSplit[1]
 
-	// unbind
-	var response *privatedns.DescribePrivateZoneResponse
 	request.ZoneId = helper.String(zoneId)
-	err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError {
-		result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UsePrivateDnsClient().DescribePrivateZone(request)
-		if e != nil {
-			return tccommon.RetryError(e)
-		}
-
-		response = result
-		return nil
-	})
-
-	if err != nil {
-		log.Printf("[CRITAL]%s read private dns failed, reason:%s\n", logId, err.Error())
-		return err
-	}
-
-	info := response.Response.PrivateZone
-	oldVpcSet := info.VpcSet
-	oldAccVpcSet := info.AccountVpcSet
-
-	unBindRequest := privatedns.NewModifyPrivateZoneVpcRequest()
-	unBindRequest.ZoneId = helper.String(zoneId)
-	unBindRequest.VpcSet = []*privatedns.VpcInfo{}
-	unBindRequest.AccountVpcSet = []*privatedns.AccountVpcInfo{}
-
-	err = resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError {
-		_, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UsePrivateDnsClient().ModifyPrivateZoneVpc(unBindRequest)
-		if e != nil {
-			return tccommon.RetryError(e)
-		}
-
-		return nil
-	})
-
-	if err != nil {
-		log.Printf("[CRITAL]%s unbind privateDns zone vpc failed, reason:%s\n", logId, err.Error())
-		return err
-	}
-
-	// delete
-	recordRequest := privatedns.NewDeletePrivateZoneRecordRequest()
-	recordRequest.ZoneId = helper.String(zoneId)
-	recordRequest.RecordId = helper.String(recordId)
-
-	err = resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
-		_, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UsePrivateDnsClient().DeletePrivateZoneRecord(recordRequest)
+	request.RecordId = helper.String(recordId)
+	err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
+		_, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UsePrivateDnsClient().DeletePrivateZoneRecord(request)
 		if e != nil {
 			return tccommon.RetryError(e)
 		}
@@ -323,36 +278,5 @@ func resourceTencentCloudDPrivateDnsRecordDelete(d *schema.ResourceData, meta in
 		return err
 	}
 
-	// rebind
-	unBindRequest = privatedns.NewModifyPrivateZoneVpcRequest()
-	unBindRequest.ZoneId = helper.String(zoneId)
-	unBindRequest.VpcSet = oldVpcSet
-
-	accountVpcSet := make([]*privatedns.AccountVpcInfo, 0, len(oldAccVpcSet))
-	for _, item := range oldAccVpcSet {
-		info := privatedns.AccountVpcInfo{
-			Uin:       item.Uin,
-			UniqVpcId: item.UniqVpcId,
-			Region:    item.Region,
-		}
-		accountVpcSet = append(accountVpcSet, &info)
-	}
-
-	unBindRequest.AccountVpcSet = accountVpcSet
-
-	err = resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError {
-		_, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UsePrivateDnsClient().ModifyPrivateZoneVpc(unBindRequest)
-		if e != nil {
-			return tccommon.RetryError(e)
-		}
-
-		return nil
-	})
-
-	if err != nil {
-		log.Printf("[CRITAL]%s rebind privateDns zone vpc failed, reason:%s\n", logId, err.Error())
-		return err
-	}
-
 	return nil
 }

tencentcloud/services/privatedns/resource_tc_private_dns_record.md

@@ -3,11 +3,13 @@ Provide a resource to create a Private Dns Record.
 Example Usage
 
 ```hcl
+# create vpc
 resource "tencentcloud_vpc" "vpc" {
   name       = "vpc-example"
   cidr_block = "10.0.0.0/16"
 }
 
+# create private dns zone
 resource "tencentcloud_private_dns_zone" "example" {
   domain = "domain.com"
   remark = "remark."
@@ -25,6 +27,7 @@ resource "tencentcloud_private_dns_zone" "example" {
   }
 }
 
+# create private dns record
 resource "tencentcloud_private_dns_record" "example" {
   zone_id      = tencentcloud_private_dns_zone.example.id
   record_type  = "A"

website/docs/r/private_dns_record.html.markdown

@@ -14,11 +14,13 @@ Provide a resource to create a Private Dns Record.
 ## Example Usage
 
 ```hcl
+# create vpc
 resource "tencentcloud_vpc" "vpc" {
   name       = "vpc-example"
   cidr_block = "10.0.0.0/16"
 }
 
+# create private dns zone
 resource "tencentcloud_private_dns_zone" "example" {
   domain = "domain.com"
   remark = "remark."
@@ -36,6 +38,7 @@ resource "tencentcloud_private_dns_zone" "example" {
   }
 }
 
+# create private dns record
 resource "tencentcloud_private_dns_record" "example" {
   zone_id      = tencentcloud_private_dns_zone.example.id
   record_type  = "A"
@@ -51,9 +54,9 @@ resource "tencentcloud_private_dns_record" "example" {
 
 The following arguments are supported:
 
-* `record_type` - (Required, String) Record type. Valid values: "A", "AAAA", "CNAME", "MX", "TXT", "PTR".
+* `record_type` - (Required, String) Record type. Valid values: `A`, `AAAA`, `CNAME`, `MX`, `TXT`, `PTR`.
 * `record_value` - (Required, String) Record value, such as IP: 192.168.10.2, CNAME: cname.qcloud.com, and MX: mail.qcloud.com.
-* `sub_domain` - (Required, String) Subdomain, such as "www", "m", and "@".
+* `sub_domain` - (Required, String) Subdomain, such as `www`, `m`, and `@`.
 * `zone_id` - (Required, String, ForceNew) Private domain ID.
 * `mx` - (Optional, Int) MX priority, which is required when the record type is MX. Valid values: 5, 10, 15, 20, 30, 40, 50.
 * `ttl` - (Optional, Int) Record cache time. The smaller the value, the faster the record will take effect. Value range: 1~86400s.