tcr vpc attachments support region name (#686)

Author: hellertang

go.mod

@@ -46,7 +46,7 @@ require (
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/sts v1.0.199
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tag v1.0.199
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tcaplusdb v1.0.199
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tcr v1.0.199
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tcr v1.0.267
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.264
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod v1.0.199
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.199

go.sum

@@ -510,6 +510,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tcaplusdb v1.0.199 h1:i
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tcaplusdb v1.0.199/go.mod h1:PUgbrkzA9IaKBj1urk+W4L6Jr5TuBhQ4xB/96QvLf/U=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tcr v1.0.199 h1:ku4oDXWK1rzfwFXd9q8eB3DktWNTHnkTiX9z5Ay8hqs=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tcr v1.0.199/go.mod h1:SEUO10oGtg+4AGCfpJDn9ynf47P+ZiyvhzOyXLt0mOY=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tcr v1.0.267 h1:Aqnh1edylmWJnBK9btXtYBtzmfdqyr2pxOYW5oOyrcY=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tcr v1.0.267/go.mod h1:SEUO10oGtg+4AGCfpJDn9ynf47P+ZiyvhzOyXLt0mOY=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.234 h1:bJU0a3yEir4BHTiIHgLvsVqDAFeuHe/r3PML3V92R/o=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.234/go.mod h1:ij3CHdPvqI2aSMcl7+jdI0yCO7oOiywKTAa55qmO2iI=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.264 h1:nKf15bAypO5ZY8cF4qNvU3ttgaiquuniK5WEhFt36X8=

tencentcloud/resource_tc_tcr_vpc_attachment.go

@@ -63,7 +63,14 @@ func resourceTencentCloudTcrVpcAttachment() *schema.Resource {
 			"region_id": {
 				Type:        schema.TypeInt,
 				Optional:    true,
-				Description: "ID of region.",
+				ConflictsWith: []string{"region_name"},
+				Description: "ID of region. Conflict with region_name, can not be set at the same time.",
+			},
+			"region_name": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				ConflictsWith: []string{"region_id"},
+				Description: "Name of region. Conflict with region_id, can not be set at the same time.",
 			},
 			"enable_public_domain_dns": {
 				Type:        schema.TypeBool,
@@ -105,12 +112,13 @@ func resourceTencentCloudTcrVpcAttachmentCreate(d *schema.ResourceData, meta int
 		vpcId         = d.Get("vpc_id").(string)
 		subnetId      = d.Get("subnet_id").(string)
 		regionId      = int64(d.Get("region_id").(int))
+		regionName    = d.Get("region_name").(string)
 		outErr, inErr error
 		has           bool
 	)
 
 	outErr = resource.Retry(writeRetryTimeout, func() *resource.RetryError {
-		inErr = tcrService.CreateTCRVPCAttachment(ctx, instanceId, vpcId, subnetId, regionId)
+		inErr = tcrService.CreateTCRVPCAttachment(ctx, instanceId, vpcId, subnetId, regionId, regionName)
 		if inErr != nil {
 			return retryError(inErr)
 		}
@@ -272,6 +280,7 @@ func resourceTencentCLoudTcrVpcAttachmentDelete(d *schema.ResourceData, meta int
 
 	resourceId := d.Id()
 	regionId := d.Get("region_id").(int)
+	regionName := d.Get("region_name").(string)
 	items := strings.Split(resourceId, FILED_SP)
 	if len(items) != 3 {
 		return fmt.Errorf("invalid ID %s", resourceId)
@@ -286,10 +295,10 @@ func resourceTencentCLoudTcrVpcAttachmentDelete(d *schema.ResourceData, meta int
 	var inErr, outErr error
 	var has bool
 
-	outErr = tcrService.DeleteTCRVPCAttachment(ctx, instanceId, vpcId, subnetId, regionId)
+	outErr = tcrService.DeleteTCRVPCAttachment(ctx, instanceId, vpcId, subnetId, regionId, regionName)
 	if outErr != nil {
 		outErr = resource.Retry(writeRetryTimeout, func() *resource.RetryError {
-			inErr = tcrService.DeleteTCRVPCAttachment(ctx, instanceId, vpcId, subnetId, regionId)
+			inErr = tcrService.DeleteTCRVPCAttachment(ctx, instanceId, vpcId, subnetId, regionId, regionName)
 			if inErr != nil {
 				return retryError(inErr)
 			}

tencentcloud/service_tencentcloud_tcr.go

@@ -580,7 +580,8 @@ func (me *TCRService) DescribeTCRLongTermTokenById(ctx context.Context, instance
 }
 
 //VPC attachment
-func (me *TCRService) CreateTCRVPCAttachment(ctx context.Context, instanceId string, vpcId string, subnetId string, regionId int64) (errRet error) {
+func (me *TCRService) CreateTCRVPCAttachment(ctx context.Context, instanceId string, vpcId string,
+	subnetId string, regionId int64, regionName string) (errRet error) {
 	logId := getLogId(ctx)
 	request := tcr.NewManageInternalEndpointRequest()
 	defer func() {
@@ -593,6 +594,7 @@ func (me *TCRService) CreateTCRVPCAttachment(ctx context.Context, instanceId str
 	request.SubnetId = &subnetId
 	request.Operation = helper.String("Create")
 	request.RegionId = helper.Int64Uint64(regionId)
+	request.RegionName = &regionName
 
 	ratelimit.Check(request.GetAction())
 	response, err := me.client.UseTCRClient().ManageInternalEndpoint(request)
@@ -606,7 +608,8 @@ func (me *TCRService) CreateTCRVPCAttachment(ctx context.Context, instanceId str
 	return
 }
 
-func (me *TCRService) DeleteTCRVPCAttachment(ctx context.Context, instanceId string, vpcId string, subnetId string, regionId int) (errRet error) {
+func (me *TCRService) DeleteTCRVPCAttachment(ctx context.Context, instanceId string, vpcId string,
+	subnetId string, regionId int, regionName string) (errRet error) {
 	logId := getLogId(ctx)
 	request := tcr.NewManageInternalEndpointRequest()
 	defer func() {
@@ -619,6 +622,7 @@ func (me *TCRService) DeleteTCRVPCAttachment(ctx context.Context, instanceId str
 	request.SubnetId = &subnetId
 	request.Operation = helper.String("Delete")
 	request.RegionId = helper.IntUint64(regionId)
+	request.RegionName = &regionName
 
 	ratelimit.Check(request.GetAction())
 	response, err := me.client.UseTCRClient().ManageInternalEndpoint(request)