Merge pull request #679 from tencentcloudstack/fix/vpc-attach-delete-params

fix: tcr_vpc_attach - pass region_id for delete if provided

Author: Kagashino

tencentcloud/resource_tc_tcr_vpc_attachment.go

@@ -63,7 +63,7 @@ func resourceTencentCloudTcrVpcAttachment() *schema.Resource {
 			"region_id": {
 				Type:        schema.TypeInt,
 				Optional:    true,
-				Description: "Whether to enable public domain dns. Default value is `false`.",
+				Description: "ID of region.",
 			},
 			"enable_public_domain_dns": {
 				Type:        schema.TypeBool,
@@ -271,6 +271,7 @@ func resourceTencentCLoudTcrVpcAttachmentDelete(d *schema.ResourceData, meta int
 	ctx := context.WithValue(context.TODO(), logIdKey, logId)
 
 	resourceId := d.Id()
+	regionId := d.Get("region_id").(int)
 	items := strings.Split(resourceId, FILED_SP)
 	if len(items) != 3 {
 		return fmt.Errorf("invalid ID %s", resourceId)
@@ -285,10 +286,10 @@ func resourceTencentCLoudTcrVpcAttachmentDelete(d *schema.ResourceData, meta int
 	var inErr, outErr error
 	var has bool
 
-	outErr = tcrService.DeleteTCRVPCAttachment(ctx, instanceId, vpcId, subnetId)
+	outErr = tcrService.DeleteTCRVPCAttachment(ctx, instanceId, vpcId, subnetId, regionId)
 	if outErr != nil {
 		outErr = resource.Retry(writeRetryTimeout, func() *resource.RetryError {
-			inErr = tcrService.DeleteTCRVPCAttachment(ctx, instanceId, vpcId, subnetId)
+			inErr = tcrService.DeleteTCRVPCAttachment(ctx, instanceId, vpcId, subnetId, regionId)
 			if inErr != nil {
 				return retryError(inErr)
 			}

tencentcloud/resource_tc_tcr_vpc_attachment_test.go

@@ -129,4 +129,5 @@ resource "tencentcloud_tcr_vpc_attachment" "mytcr_vpc_attachment" {
   instance_id = tencentcloud_tcr_instance.mytcr_instance.id
   vpc_id = tencentcloud_vpc.foo.id
   subnet_id = tencentcloud_subnet.subnet.id
+  region_id = 1
 }`

tencentcloud/service_tencentcloud_tcr.go

@@ -606,7 +606,7 @@ func (me *TCRService) CreateTCRVPCAttachment(ctx context.Context, instanceId str
 	return
 }
 
-func (me *TCRService) DeleteTCRVPCAttachment(ctx context.Context, instanceId string, vpcId string, subnetId string) (errRet error) {
+func (me *TCRService) DeleteTCRVPCAttachment(ctx context.Context, instanceId string, vpcId string, subnetId string, regionId int) (errRet error) {
 	logId := getLogId(ctx)
 	request := tcr.NewManageInternalEndpointRequest()
 	defer func() {
@@ -618,6 +618,7 @@ func (me *TCRService) DeleteTCRVPCAttachment(ctx context.Context, instanceId str
 	request.VpcId = &vpcId
 	request.SubnetId = &subnetId
 	request.Operation = helper.String("Delete")
+	request.RegionId = helper.IntUint64(regionId)
 
 	ratelimit.Check(request.GetAction())
 	response, err := me.client.UseTCRClient().ManageInternalEndpoint(request)

website/docs/r/tcr_vpc_attachment.html.markdown

@@ -30,6 +30,7 @@ The following arguments are supported:
 * `vpc_id` - (Required, ForceNew) ID of VPC.
 * `enable_public_domain_dns` - (Optional) Whether to enable public domain dns. Default value is `false`.
 * `enable_vpc_domain_dns` - (Optional) Whether to enable vpc domain dns. Default value is `false`.
+* `region_id` - (Optional) ID of region.
 
 ## Attributes Reference