Skip to content

Commit 7cac74e

Browse files
hellertanghellertang
authored
Feat/tcr vpc attach (#1291)
* update * update doc
1 parent e6278bc commit 7cac74e

File tree

9 files changed

+7190
-1128
lines changed

9 files changed

+7190
-1128
lines changed

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ require (
5858
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/sts v1.0.199
5959
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tag v1.0.199
6060
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tcaplusdb v1.0.199
61-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tcr v1.0.267
61+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tcr v1.0.486
6262
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdmq v1.0.268
6363
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tem v1.0.472
6464
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.500

‎go.sum‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -542,6 +542,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tcaplusdb v1.0.199 h1:i
542542
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tcaplusdb v1.0.199/go.mod h1:PUgbrkzA9IaKBj1urk+W4L6Jr5TuBhQ4xB/96QvLf/U=
543543
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tcr v1.0.267 h1:Aqnh1edylmWJnBK9btXtYBtzmfdqyr2pxOYW5oOyrcY=
544544
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tcr v1.0.267/go.mod h1:SEUO10oGtg+4AGCfpJDn9ynf47P+ZiyvhzOyXLt0mOY=
545+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tcr v1.0.486 h1:6HgzeOwD3yeo8a/prCx63bAN0INcP67GwkK+bseY9f0=
546+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tcr v1.0.486/go.mod h1:Fmyf/a1j8Op6vyl71KtX35Hd0GnYqm5uoYz/RB1H4Wk=
545547
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdmq v1.0.268 h1:ez5lvKQVWGQV90BV3m9SeFODaoDbrtkMzw2S0DRMncA=
546548
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdmq v1.0.268/go.mod h1:fchXZhmqaYaG2c4wTCBTdnW6TFAtxl3D/P/yuuuLMfA=
547549
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tem v1.0.472 h1:9Jzrgx78+5XnZ8myNYjCYZn5ZF+tbSIpF6KWGgWr0uY=

‎tencentcloud/resource_tc_tcr_vpc_attachment.go‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ func resourceTencentCloudTcrVpcAttachment() *schema.Resource {
6969
Type: schema.TypeInt,
7070
Optional: true,
7171
ConflictsWith: []string{"region_name"},
72+
Deprecated: "this argument was deprecated, use `region_name` instead.",
7273
Description: "ID of region. Conflict with region_name, can not be set at the same time.",
7374
},
7475
"region_name": {
@@ -154,14 +155,14 @@ func resourceTencentCloudTcrVpcAttachmentCreate(d *schema.ResourceData, meta int
154155
}
155156

156157
if enablePublicDomainDns := d.Get("enable_public_domain_dns").(bool); enablePublicDomainDns {
157-
err := EnableTcrVpcDns(ctx, tcrService, instanceId, vpcId, subnetId, true)
158+
err := EnableTcrVpcDns(ctx, tcrService, instanceId, vpcId, subnetId, true, regionName)
158159
if err != nil {
159160
return err
160161
}
161162
}
162163

163164
if enableVpcDomainDns := d.Get("enable_vpc_domain_dns").(bool); enableVpcDomainDns {
164-
err := EnableTcrVpcDns(ctx, tcrService, instanceId, vpcId, subnetId, false)
165+
err := EnableTcrVpcDns(ctx, tcrService, instanceId, vpcId, subnetId, false, regionName)
165166
if err != nil {
166167
return err
167168
}
@@ -240,17 +241,18 @@ func resourceTencentCloudTcrVpcAttachmentUpdate(d *schema.ResourceData, meta int
240241
instanceId = d.Get("instance_id").(string)
241242
vpcId = d.Get("vpc_id").(string)
242243
subnetId = d.Get("subnet_id").(string)
244+
regionName = d.Get("region_name").(string)
243245
)
244246

245247
d.Partial(true)
246248
if d.HasChange("enable_public_domain_dns") {
247249
if isEnabled := d.Get("enable_public_domain_dns").(bool); isEnabled {
248-
err := EnableTcrVpcDns(ctx, tcrService, instanceId, vpcId, subnetId, true)
250+
err := EnableTcrVpcDns(ctx, tcrService, instanceId, vpcId, subnetId, true, regionName)
249251
if err != nil {
250252
return err
251253
}
252254
} else {
253-
err := DisableTcrVpcDns(ctx, tcrService, instanceId, vpcId, subnetId, true)
255+
err := DisableTcrVpcDns(ctx, tcrService, instanceId, vpcId, subnetId, true, regionName)
254256
if err != nil {
255257
return err
256258
}
@@ -260,12 +262,12 @@ func resourceTencentCloudTcrVpcAttachmentUpdate(d *schema.ResourceData, meta int
260262

261263
if d.HasChange("enable_vpc_domain_dns") {
262264
if isEnabled := d.Get("enable_vpc_domain_dns").(bool); isEnabled {
263-
err := EnableTcrVpcDns(ctx, tcrService, instanceId, vpcId, subnetId, false)
265+
err := EnableTcrVpcDns(ctx, tcrService, instanceId, vpcId, subnetId, false, regionName)
264266
if err != nil {
265267
return err
266268
}
267269
} else {
268-
err := DisableTcrVpcDns(ctx, tcrService, instanceId, vpcId, subnetId, false)
270+
err := DisableTcrVpcDns(ctx, tcrService, instanceId, vpcId, subnetId, false, regionName)
269271
if err != nil {
270272
return err
271273
}
@@ -355,14 +357,14 @@ func WaitForAccessIpExists(ctx context.Context, tcrService TCRService, instanceI
355357
return
356358
}
357359

358-
func EnableTcrVpcDns(ctx context.Context, tcrService TCRService, instanceId string, vpcId string, subnetId string, usePublicDomain bool) error {
360+
func EnableTcrVpcDns(ctx context.Context, tcrService TCRService, instanceId string, vpcId string, subnetId string, usePublicDomain bool, regionName string) error {
359361
accessIp, err := WaitForAccessIpExists(ctx, tcrService, instanceId, vpcId, subnetId)
360362
if err != nil {
361363
return err
362364
}
363365

364366
outErr := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
365-
inErr := tcrService.CreateTcrVpcDns(ctx, instanceId, vpcId, accessIp, usePublicDomain)
367+
inErr := tcrService.CreateTcrVpcDns(ctx, instanceId, vpcId, accessIp, usePublicDomain, regionName)
366368
if inErr != nil {
367369
return retryError(inErr)
368370
}
@@ -372,14 +374,14 @@ func EnableTcrVpcDns(ctx context.Context, tcrService TCRService, instanceId stri
372374
return outErr
373375
}
374376

375-
func DisableTcrVpcDns(ctx context.Context, tcrService TCRService, instanceId string, vpcId string, subnetId string, usePublicDomain bool) error {
377+
func DisableTcrVpcDns(ctx context.Context, tcrService TCRService, instanceId string, vpcId string, subnetId string, usePublicDomain bool, regionName string) error {
376378
accessIp, err := WaitForAccessIpExists(ctx, tcrService, instanceId, vpcId, subnetId)
377379
if err != nil {
378380
return err
379381
}
380382

381383
outErr := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
382-
inErr := tcrService.DeleteTcrVpcDns(ctx, instanceId, vpcId, accessIp, usePublicDomain)
384+
inErr := tcrService.DeleteTcrVpcDns(ctx, instanceId, vpcId, accessIp, usePublicDomain, regionName)
383385
if inErr != nil {
384386
return retryError(inErr)
385387
}

‎tencentcloud/service_tencentcloud_tcr.go‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -741,7 +741,7 @@ func (me *TCRService) DescribeTCRVPCAttachmentById(ctx context.Context, instance
741741
return
742742
}
743743

744-
func (me *TCRService) CreateTcrVpcDns(ctx context.Context, instanceId string, vpcId string, accessIp string, usePublicDomain bool) (errRet error) {
744+
func (me *TCRService) CreateTcrVpcDns(ctx context.Context, instanceId string, vpcId string, accessIp string, usePublicDomain bool, regionName string) (errRet error) {
745745
logId := getLogId(ctx)
746746
request := tcr.NewCreateInternalEndpointDnsRequest()
747747
defer func() {
@@ -753,6 +753,7 @@ func (me *TCRService) CreateTcrVpcDns(ctx context.Context, instanceId string, vp
753753
request.VpcId = &vpcId
754754
request.EniLBIp = &accessIp
755755
request.UsePublicDomain = &usePublicDomain
756+
request.RegionName = &regionName
756757

757758
ratelimit.Check(request.GetAction())
758759
response, err := me.client.UseTCRClient().CreateInternalEndpointDns(request)
@@ -766,7 +767,7 @@ func (me *TCRService) CreateTcrVpcDns(ctx context.Context, instanceId string, vp
766767
return
767768
}
768769

769-
func (me *TCRService) DeleteTcrVpcDns(ctx context.Context, instanceId string, vpcId string, accessIp string, usePublicDomain bool) (errRet error) {
770+
func (me *TCRService) DeleteTcrVpcDns(ctx context.Context, instanceId string, vpcId string, accessIp string, usePublicDomain bool, regionName string) (errRet error) {
770771
logId := getLogId(ctx)
771772
request := tcr.NewDeleteInternalEndpointDnsRequest()
772773
defer func() {
@@ -778,6 +779,7 @@ func (me *TCRService) DeleteTcrVpcDns(ctx context.Context, instanceId string, vp
778779
request.VpcId = &vpcId
779780
request.EniLBIp = &accessIp
780781
request.UsePublicDomain = &usePublicDomain
782+
request.RegionName = &regionName
781783

782784
ratelimit.Check(request.GetAction())
783785
response, err := me.client.UseTCRClient().DeleteInternalEndpointDns(request)

0 commit comments

Comments
 (0)