Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ require (
github.com/mozillazg/go-httpheader v0.4.0 // indirect
github.com/pkg/errors v0.9.1
github.com/stretchr/testify v1.8.2
github.com/tencentcloud/tencentcloud-sdk-go-intl-en v3.0.1214+incompatible
github.com/tencentcloud/tencentcloud-sdk-go-intl-en v3.0.1315+incompatible
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/antiddos v1.0.799
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/api v1.0.285
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/apigateway v1.0.763
Expand All @@ -43,10 +43,10 @@ require (
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/chdfs v1.0.600
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ciam v1.0.695
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ckafka v1.0.1073
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.1107
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.2.2
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.1033
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.1148
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.4
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.2.2
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.1206
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.1.52
Expand Down
10 changes: 10 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -819,6 +819,8 @@ github.com/tdakkota/asciicheck v0.2.0 h1:o8jvnUANo0qXtnslk2d3nMKTFNlOnJjRrNcj0j9
github.com/tdakkota/asciicheck v0.2.0/go.mod h1:Qb7Y9EgjCLJGup51gDHFzbI08/gbGhL/UVhYIPWG2rg=
github.com/tencentcloud/tencentcloud-sdk-go-intl-en v3.0.1214+incompatible h1:2pQ01ULc1d4WxNxwSR2qglNLA4xzB5ipffJ48fytTcg=
github.com/tencentcloud/tencentcloud-sdk-go-intl-en v3.0.1214+incompatible/go.mod h1:72Wo6Gt6F8d8V+njrAmduVoT9QjPwCyXktpqCWr7PUc=
github.com/tencentcloud/tencentcloud-sdk-go-intl-en v3.0.1315+incompatible h1:0+ZyR+YwPhcfCANvKvlqkZF4DTBC6DeecaEWn72E7oI=
github.com/tencentcloud/tencentcloud-sdk-go-intl-en v3.0.1315+incompatible/go.mod h1:72Wo6Gt6F8d8V+njrAmduVoT9QjPwCyXktpqCWr7PUc=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/antiddos v1.0.799 h1:u49r1bGFDY0CeAF46iotNnLtc5yplPf9XXa7W7zJ4fE=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/antiddos v1.0.799/go.mod h1:JQa/Ess7Kkn/BuAugq0Tt5GJR7ZQAY47ypP9LjEn/DE=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/api v1.0.285 h1:gFmukRGLtYiXVBVvg/5DP/0fM1+dKpwDjT+khtDVLmc=
Expand Down Expand Up @@ -863,6 +865,10 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ckafka v1.0.1073 h1:+nT
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ckafka v1.0.1073/go.mod h1:D9xdyB3utAtgGwTExSGxHSVQMfVHEUo/bfaBTxjHkao=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.1107 h1:sUiyGfYHzNpHKJx6DlRu1K8xBEGaWlOQT+8W5Ws0v4U=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.1107/go.mod h1:L1r6mc7XjFlyLlOVqRvPEhjXneHywnyjyv9EoiGBRvM=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.1.55 h1:+Ev7tV+pjE/RZqHiopmYPKChF30OjRGn6KS8ubBByq8=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.1.55/go.mod h1:EL80jbu+ubwrNnTZHsp+jaWat2fKGkS/B9MYB/42exA=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.2.2 h1:mDg1SYAFF3tiDRFnFDGguCR2Kq35udG07nHa52uTYX0=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.2.2/go.mod h1:59a8Y11O2Hqa9cS3mMpsLbTgQsu6+PpOu+ZYWTEtVDE=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.1033 h1:dIr+MVsZeUBiKZELfJh5HRJdI+BI6lCp5pv/2oXekuk=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.1033/go.mod h1:7oFlNimGSTHFy6JV7W/IZKuJWr+NUjCnGLTvb9MWNrY=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.1148 h1:tPQHJE07DGCJWrQJklrkrF0CasB86M7AEb0PrkXNjAM=
Expand Down Expand Up @@ -939,6 +945,10 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.52/go.mod h
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.3/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.4 h1:k8QEWznn11evs+N5ZGQMCCPnzAHxnul2mRIZJB8Lwbo=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.4/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.55 h1:8kT5ktFibG46S7WImjNkHx6N5b6vNFIVxPuj6rDMgb8=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.55/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.2.2 h1:IqDivO9t4+39+YWlFXhK7kJPm/FbLAD1FbhoaGbDSx8=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.2.2/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993 h1:WlPgXldQCxt7qi5Xrc6j6zTrsXWzN5BcOGs7Irq7fwQ=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993/go.mod h1:Z9U8zNtyuyKhjS0698wqsrG/kLx1TQ5CEixXBwVe7xY=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860 h1:F3esKBIT3HW9+7Gt8cVgf8X06VdGIczpgLBUECzSEzU=
Expand Down
21 changes: 21 additions & 0 deletions tencentcloud/connectivity/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"github.com/aws/aws-sdk-go/aws/endpoints"
"github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/s3"
clbintl "github.com/tencentcloud/tencentcloud-sdk-go-intl-en/tencentcloud/clb/v20180317"
intlProfile "github.com/tencentcloud/tencentcloud-sdk-go-intl-en/tencentcloud/common/profile"
cvmintl "github.com/tencentcloud/tencentcloud-sdk-go-intl-en/tencentcloud/cvm/v20170312"
mdl "github.com/tencentcloud/tencentcloud-sdk-go-intl-en/tencentcloud/mdl/v20200326"
Expand Down Expand Up @@ -138,6 +139,7 @@ type TencentCloudClient struct {
cvmv20170312Conn *cvmv20170312.Client
cvmIntlConn *cvmintl.Client
clbConn *clb.Client
clbIntlConn *clbintl.Client
dayuConn *dayu.Client
dcConn *dc.Client
tagConn *tag.Client
Expand Down Expand Up @@ -583,6 +585,25 @@ func (me *TencentCloudClient) UseClbClient(iacExtInfo ...IacExtInfo) *clb.Client
return me.clbConn
}

// UseClbClient returns clb Intl client for service
func (me *TencentCloudClient) UseClbIntlClient(iacExtInfo ...IacExtInfo) *clbintl.Client {
var logRoundTripper LogRoundTripper
if len(iacExtInfo) != 0 {
logRoundTripper.InstanceId = iacExtInfo[0].InstanceId
}

if me.clbIntlConn != nil {
me.clbIntlConn.WithHttpTransport(&logRoundTripper)
return me.clbIntlConn
}

cpf := me.NewClientIntlProfile(300)
me.clbIntlConn, _ = clbintl.NewClient(me.Credential, me.Region, cpf)
me.clbIntlConn.WithHttpTransport(&logRoundTripper)

return me.clbIntlConn
}

// UseCvmClient returns cvm client for service
func (me *TencentCloudClient) UseCvmClient(iacExtInfo ...IacExtInfo) *cvmv20170312.Client {
var logRoundTripper LogRoundTripper
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import (
"github.com/pkg/errors"
tccommon "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/common"

clbintl "github.com/tencentcloud/tencentcloud-sdk-go-intl-en/tencentcloud/clb/v20180317"
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"

"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
clb "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb/v20180317"
)

func ResourceTencentCloudClbCustomizedConfigAttachment() *schema.Resource {
Expand Down Expand Up @@ -69,7 +69,7 @@ func resourceTencentCloudClbCustomizedConfigAttachmentCreate(d *schema.ResourceD

var (
logId = tccommon.GetLogId(tccommon.ContextNil)
request = clb.NewAssociateCustomizedConfigRequest()
request = clbintl.NewAssociateCustomizedConfigRequest()
configId string
)

Expand All @@ -80,7 +80,7 @@ func resourceTencentCloudClbCustomizedConfigAttachmentCreate(d *schema.ResourceD

if v, ok := d.GetOk("bind_list"); ok {
for _, item := range v.(*schema.Set).List() {
bindItem := clb.BindItem{}
bindItem := clbintl.BindItem{}
dMap := item.(map[string]interface{})
if v, ok := dMap["load_balancer_id"]; ok {
bindItem.LoadBalancerId = helper.String(v.(string))
Expand All @@ -103,7 +103,7 @@ func resourceTencentCloudClbCustomizedConfigAttachmentCreate(d *schema.ResourceD
}

err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseClbClient().AssociateCustomizedConfig(request)
result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseClbIntlClient().AssociateCustomizedConfig(request)
if e != nil {
return tccommon.RetryError(e)
} else {
Expand All @@ -113,7 +113,7 @@ func resourceTencentCloudClbCustomizedConfigAttachmentCreate(d *schema.ResourceD
}

requestId := *result.Response.RequestId
retryErr := waitForTaskFinish(requestId, meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseClbClient())
retryErr := waitForTaskFinishIntl(requestId, meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseClbIntlClient())
if retryErr != nil {
return tccommon.RetryError(errors.WithStack(retryErr))
}
Expand Down Expand Up @@ -196,9 +196,9 @@ func resourceTencentCloudClbCustomizedConfigAttachmentUpdate(d *schema.ResourceD
remove := olds.Difference(news).List()
add := news.Difference(olds).List()
if len(remove) > 0 {
request := clb.NewDisassociateCustomizedConfigRequest()
request := clbintl.NewDisassociateCustomizedConfigRequest()
for _, item := range remove {
bindItem := clb.BindItem{}
bindItem := clbintl.BindItem{}
dMap := item.(map[string]interface{})
if v, ok := dMap["load_balancer_id"]; ok {
bindItem.LoadBalancerId = helper.String(v.(string))
Expand All @@ -221,7 +221,7 @@ func resourceTencentCloudClbCustomizedConfigAttachmentUpdate(d *schema.ResourceD

request.UconfigId = helper.String(id)
err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseClbClient().DisassociateCustomizedConfig(request)
result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseClbIntlClient().DisassociateCustomizedConfig(request)
if e != nil {
return tccommon.RetryError(e)
} else {
Expand All @@ -231,7 +231,7 @@ func resourceTencentCloudClbCustomizedConfigAttachmentUpdate(d *schema.ResourceD
}

requestId := *result.Response.RequestId
retryErr := waitForTaskFinish(requestId, meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseClbClient())
retryErr := waitForTaskFinishIntl(requestId, meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseClbIntlClient())
if retryErr != nil {
return tccommon.RetryError(errors.WithStack(retryErr))
}
Expand All @@ -247,10 +247,10 @@ func resourceTencentCloudClbCustomizedConfigAttachmentUpdate(d *schema.ResourceD
}

if len(add) > 0 {
request := clb.NewAssociateCustomizedConfigRequest()
request := clbintl.NewAssociateCustomizedConfigRequest()
request.UconfigId = helper.String(id)
for _, item := range add {
bindItem := clb.BindItem{}
bindItem := clbintl.BindItem{}
dMap := item.(map[string]interface{})
if v, ok := dMap["load_balancer_id"]; ok {
bindItem.LoadBalancerId = helper.String(v.(string))
Expand All @@ -272,7 +272,7 @@ func resourceTencentCloudClbCustomizedConfigAttachmentUpdate(d *schema.ResourceD
}

err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseClbClient().AssociateCustomizedConfig(request)
result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseClbIntlClient().AssociateCustomizedConfig(request)
if e != nil {
return tccommon.RetryError(e)
} else {
Expand All @@ -282,7 +282,7 @@ func resourceTencentCloudClbCustomizedConfigAttachmentUpdate(d *schema.ResourceD
}

requestId := *result.Response.RequestId
retryErr := waitForTaskFinish(requestId, meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseClbClient())
retryErr := waitForTaskFinishIntl(requestId, meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseClbIntlClient())
if retryErr != nil {
return tccommon.RetryError(errors.WithStack(retryErr))
}
Expand All @@ -306,14 +306,14 @@ func resourceTencentCloudClbCustomizedConfigAttachmentDelete(d *schema.ResourceD

var (
logId = tccommon.GetLogId(tccommon.ContextNil)
request = clb.NewDisassociateCustomizedConfigRequest()
request = clbintl.NewDisassociateCustomizedConfigRequest()
id = d.Id()
)

request.UconfigId = helper.String(id)
if v, ok := d.GetOk("bind_list"); ok {
for _, item := range v.(*schema.Set).List() {
bindItem := clb.BindItem{}
bindItem := clbintl.BindItem{}
dMap := item.(map[string]interface{})
if v, ok := dMap["load_balancer_id"]; ok {
bindItem.LoadBalancerId = helper.String(v.(string))
Expand All @@ -336,7 +336,7 @@ func resourceTencentCloudClbCustomizedConfigAttachmentDelete(d *schema.ResourceD
}

err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseClbClient().DisassociateCustomizedConfig(request)
result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseClbIntlClient().DisassociateCustomizedConfig(request)
if e != nil {
return tccommon.RetryError(e)
} else {
Expand All @@ -346,7 +346,7 @@ func resourceTencentCloudClbCustomizedConfigAttachmentDelete(d *schema.ResourceD
}

requestId := *result.Response.RequestId
retryErr := waitForTaskFinish(requestId, meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseClbClient())
retryErr := waitForTaskFinishIntl(requestId, meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseClbIntlClient())
if retryErr != nil {
return tccommon.RetryError(errors.WithStack(retryErr))
}
Expand Down
20 changes: 10 additions & 10 deletions tencentcloud/services/clb/resource_tc_clb_customized_config_v2.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/pkg/errors"
clb "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb/v20180317"
clbintl "github.com/tencentcloud/tencentcloud-sdk-go-intl-en/tencentcloud/clb/v20180317"

"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
)
Expand Down Expand Up @@ -70,8 +70,8 @@ func resourceTencentCloudClbCustomizedConfigV2Create(d *schema.ResourceData, met

var (
logId = tccommon.GetLogId(tccommon.ContextNil)
request = clb.NewAddCustomizedConfigRequest()
response = clb.NewAddCustomizedConfigResponse()
request = clbintl.NewAddCustomizedConfigRequest()
response = clbintl.NewAddCustomizedConfigResponse()
)

configType := d.Get("config_type").(string)
Expand All @@ -81,7 +81,7 @@ func resourceTencentCloudClbCustomizedConfigV2Create(d *schema.ResourceData, met
request.ConfigContent = helper.String(d.Get("config_content").(string))

err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseClbClient().AddCustomizedConfig(request)
result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseClbIntlClient().AddCustomizedConfig(request)
if e != nil {
return tccommon.RetryError(e)
} else {
Expand Down Expand Up @@ -135,9 +135,9 @@ func resourceTencentCloudClbCustomizedConfigV2Read(d *schema.ResourceData, meta
configId := idSplit[0]
configType := idSplit[1]

var config *clb.ConfigListItem
var config *clbintl.ConfigListItem
err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError {
result, e := clbService.DescribeLbCustomizedConfigById(ctx, configId, configType)
result, e := clbService.DescribeLbIntlCustomizedConfigById(ctx, configId, configType)
if e != nil {
return tccommon.RetryError(e)
}
Expand Down Expand Up @@ -183,15 +183,15 @@ func resourceTencentCloudClbCustomizedConfigV2Update(d *schema.ResourceData, met
d.Partial(true)

if d.HasChange("config_name") || d.HasChange("config_content") {
request := clb.NewModifyCustomizedConfigRequest()
request := clbintl.NewModifyCustomizedConfigRequest()
request.UconfigId = &configId
configName := d.Get("config_name").(string)
configContent := d.Get("config_content").(string)
request.ConfigName = &configName
request.ConfigContent = &configContent

err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseClbClient().ModifyCustomizedConfig(request)
result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseClbIntlClient().ModifyCustomizedConfig(request)
if e != nil {
return tccommon.RetryError(e)
} else {
Expand Down Expand Up @@ -224,7 +224,7 @@ func resourceTencentCloudClbCustomizedConfigV2Delete(d *schema.ResourceData, met

var (
logId = tccommon.GetLogId(tccommon.ContextNil)
request = clb.NewDeleteCustomizedConfigRequest()
request = clbintl.NewDeleteCustomizedConfigRequest()
)

idSplit := strings.Split(d.Id(), tccommon.FILED_SP)
Expand All @@ -236,7 +236,7 @@ func resourceTencentCloudClbCustomizedConfigV2Delete(d *schema.ResourceData, met
request.UconfigIdList = []*string{&configId}

err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseClbClient().DeleteCustomizedConfig(request)
result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseClbIntlClient().DeleteCustomizedConfig(request)
if e != nil {
return tccommon.RetryError(e)
} else {
Expand Down
Loading
Loading