Skip to content

Feat/tcr vpc attach #1291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 26, 2022
Merged

Feat/tcr vpc attach #1291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ddb5235
update
hellertang Sep 23, 2022
e272a0a
update doc
hellertang Sep 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,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.267
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tcr v1.0.486
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdmq v1.0.268
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tem v1.0.472
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.500
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,6 +542,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.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/tcr v1.0.486 h1:6HgzeOwD3yeo8a/prCx63bAN0INcP67GwkK+bseY9f0=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tcr v1.0.486/go.mod h1:Fmyf/a1j8Op6vyl71KtX35Hd0GnYqm5uoYz/RB1H4Wk=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdmq v1.0.268 h1:ez5lvKQVWGQV90BV3m9SeFODaoDbrtkMzw2S0DRMncA=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdmq v1.0.268/go.mod h1:fchXZhmqaYaG2c4wTCBTdnW6TFAtxl3D/P/yuuuLMfA=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tem v1.0.472 h1:9Jzrgx78+5XnZ8myNYjCYZn5ZF+tbSIpF6KWGgWr0uY=
Expand Down
22 changes: 12 additions & 10 deletions tencentcloud/resource_tc_tcr_vpc_attachment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ func resourceTencentCloudTcrVpcAttachment() *schema.Resource {
Type: schema.TypeInt,
Optional: true,
ConflictsWith: []string{"region_name"},
Deprecated: "this argument was deprecated, use `region_name` instead.",
Description: "ID of region. Conflict with region_name, can not be set at the same time.",
},
"region_name": {
Expand Down Expand Up @@ -154,14 +155,14 @@ func resourceTencentCloudTcrVpcAttachmentCreate(d *schema.ResourceData, meta int
}

if enablePublicDomainDns := d.Get("enable_public_domain_dns").(bool); enablePublicDomainDns {
err := EnableTcrVpcDns(ctx, tcrService, instanceId, vpcId, subnetId, true)
err := EnableTcrVpcDns(ctx, tcrService, instanceId, vpcId, subnetId, true, regionName)
if err != nil {
return err
}
}

if enableVpcDomainDns := d.Get("enable_vpc_domain_dns").(bool); enableVpcDomainDns {
err := EnableTcrVpcDns(ctx, tcrService, instanceId, vpcId, subnetId, false)
err := EnableTcrVpcDns(ctx, tcrService, instanceId, vpcId, subnetId, false, regionName)
if err != nil {
return err
}
Expand Down Expand Up @@ -240,17 +241,18 @@ func resourceTencentCloudTcrVpcAttachmentUpdate(d *schema.ResourceData, meta int
instanceId = d.Get("instance_id").(string)
vpcId = d.Get("vpc_id").(string)
subnetId = d.Get("subnet_id").(string)
regionName = d.Get("region_name").(string)
)

d.Partial(true)
if d.HasChange("enable_public_domain_dns") {
if isEnabled := d.Get("enable_public_domain_dns").(bool); isEnabled {
err := EnableTcrVpcDns(ctx, tcrService, instanceId, vpcId, subnetId, true)
err := EnableTcrVpcDns(ctx, tcrService, instanceId, vpcId, subnetId, true, regionName)
if err != nil {
return err
}
} else {
err := DisableTcrVpcDns(ctx, tcrService, instanceId, vpcId, subnetId, true)
err := DisableTcrVpcDns(ctx, tcrService, instanceId, vpcId, subnetId, true, regionName)
if err != nil {
return err
}
Expand All @@ -260,12 +262,12 @@ func resourceTencentCloudTcrVpcAttachmentUpdate(d *schema.ResourceData, meta int

if d.HasChange("enable_vpc_domain_dns") {
if isEnabled := d.Get("enable_vpc_domain_dns").(bool); isEnabled {
err := EnableTcrVpcDns(ctx, tcrService, instanceId, vpcId, subnetId, false)
err := EnableTcrVpcDns(ctx, tcrService, instanceId, vpcId, subnetId, false, regionName)
if err != nil {
return err
}
} else {
err := DisableTcrVpcDns(ctx, tcrService, instanceId, vpcId, subnetId, false)
err := DisableTcrVpcDns(ctx, tcrService, instanceId, vpcId, subnetId, false, regionName)
if err != nil {
return err
}
Expand Down Expand Up @@ -355,14 +357,14 @@ func WaitForAccessIpExists(ctx context.Context, tcrService TCRService, instanceI
return
}

func EnableTcrVpcDns(ctx context.Context, tcrService TCRService, instanceId string, vpcId string, subnetId string, usePublicDomain bool) error {
func EnableTcrVpcDns(ctx context.Context, tcrService TCRService, instanceId string, vpcId string, subnetId string, usePublicDomain bool, regionName string) error {
accessIp, err := WaitForAccessIpExists(ctx, tcrService, instanceId, vpcId, subnetId)
if err != nil {
return err
}

outErr := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
inErr := tcrService.CreateTcrVpcDns(ctx, instanceId, vpcId, accessIp, usePublicDomain)
inErr := tcrService.CreateTcrVpcDns(ctx, instanceId, vpcId, accessIp, usePublicDomain, regionName)
if inErr != nil {
return retryError(inErr)
}
Expand All @@ -372,14 +374,14 @@ func EnableTcrVpcDns(ctx context.Context, tcrService TCRService, instanceId stri
return outErr
}

func DisableTcrVpcDns(ctx context.Context, tcrService TCRService, instanceId string, vpcId string, subnetId string, usePublicDomain bool) error {
func DisableTcrVpcDns(ctx context.Context, tcrService TCRService, instanceId string, vpcId string, subnetId string, usePublicDomain bool, regionName string) error {
accessIp, err := WaitForAccessIpExists(ctx, tcrService, instanceId, vpcId, subnetId)
if err != nil {
return err
}

outErr := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
inErr := tcrService.DeleteTcrVpcDns(ctx, instanceId, vpcId, accessIp, usePublicDomain)
inErr := tcrService.DeleteTcrVpcDns(ctx, instanceId, vpcId, accessIp, usePublicDomain, regionName)
if inErr != nil {
return retryError(inErr)
}
Expand Down
6 changes: 4 additions & 2 deletions tencentcloud/service_tencentcloud_tcr.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -741,7 +741,7 @@ func (me *TCRService) DescribeTCRVPCAttachmentById(ctx context.Context, instance
return
}

func (me *TCRService) CreateTcrVpcDns(ctx context.Context, instanceId string, vpcId string, accessIp string, usePublicDomain bool) (errRet error) {
func (me *TCRService) CreateTcrVpcDns(ctx context.Context, instanceId string, vpcId string, accessIp string, usePublicDomain bool, regionName string) (errRet error) {
logId := getLogId(ctx)
request := tcr.NewCreateInternalEndpointDnsRequest()
defer func() {
Expand All @@ -753,6 +753,7 @@ func (me *TCRService) CreateTcrVpcDns(ctx context.Context, instanceId string, vp
request.VpcId = &vpcId
request.EniLBIp = &accessIp
request.UsePublicDomain = &usePublicDomain
request.RegionName = &regionName

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

func (me *TCRService) DeleteTcrVpcDns(ctx context.Context, instanceId string, vpcId string, accessIp string, usePublicDomain bool) (errRet error) {
func (me *TCRService) DeleteTcrVpcDns(ctx context.Context, instanceId string, vpcId string, accessIp string, usePublicDomain bool, regionName string) (errRet error) {
logId := getLogId(ctx)
request := tcr.NewDeleteInternalEndpointDnsRequest()
defer func() {
Expand All @@ -778,6 +779,7 @@ func (me *TCRService) DeleteTcrVpcDns(ctx context.Context, instanceId string, vp
request.VpcId = &vpcId
request.EniLBIp = &accessIp
request.UsePublicDomain = &usePublicDomain
request.RegionName = &regionName

ratelimit.Check(request.GetAction())
response, err := me.client.UseTCRClient().DeleteInternalEndpointDns(request)
Expand Down
Loading