Skip to content

Commit d34ccd4

Browse files
SevenEarthSevenEarth
committed
add
1 parent c3b2b2c commit d34ccd4

File tree

28 files changed

+17912
-292
lines changed

28 files changed

+17912
-292
lines changed

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ require (
2525
github.com/mozillazg/go-httpheader v0.4.0 // indirect
2626
github.com/pkg/errors v0.9.1
2727
github.com/stretchr/testify v1.8.2
28-
github.com/tencentcloud/tencentcloud-sdk-go-intl-en v3.0.1214+incompatible
28+
github.com/tencentcloud/tencentcloud-sdk-go-intl-en v3.0.1315+incompatible
2929
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/antiddos v1.0.799
3030
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/api v1.0.285
3131
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/apigateway v1.0.763
@@ -43,10 +43,10 @@ require (
4343
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/chdfs v1.0.600
4444
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ciam v1.0.695
4545
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ckafka v1.0.1073
46-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.1.55
46+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.2.2
4747
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.1033
4848
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.1148
49-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.55
49+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.2.2
5050
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.1206
5151
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762
5252
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.1.52

‎go.sum‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -819,6 +819,8 @@ github.com/tdakkota/asciicheck v0.2.0 h1:o8jvnUANo0qXtnslk2d3nMKTFNlOnJjRrNcj0j9
819819
github.com/tdakkota/asciicheck v0.2.0/go.mod h1:Qb7Y9EgjCLJGup51gDHFzbI08/gbGhL/UVhYIPWG2rg=
820820
github.com/tencentcloud/tencentcloud-sdk-go-intl-en v3.0.1214+incompatible h1:2pQ01ULc1d4WxNxwSR2qglNLA4xzB5ipffJ48fytTcg=
821821
github.com/tencentcloud/tencentcloud-sdk-go-intl-en v3.0.1214+incompatible/go.mod h1:72Wo6Gt6F8d8V+njrAmduVoT9QjPwCyXktpqCWr7PUc=
822+
github.com/tencentcloud/tencentcloud-sdk-go-intl-en v3.0.1315+incompatible h1:0+ZyR+YwPhcfCANvKvlqkZF4DTBC6DeecaEWn72E7oI=
823+
github.com/tencentcloud/tencentcloud-sdk-go-intl-en v3.0.1315+incompatible/go.mod h1:72Wo6Gt6F8d8V+njrAmduVoT9QjPwCyXktpqCWr7PUc=
822824
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/antiddos v1.0.799 h1:u49r1bGFDY0CeAF46iotNnLtc5yplPf9XXa7W7zJ4fE=
823825
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/antiddos v1.0.799/go.mod h1:JQa/Ess7Kkn/BuAugq0Tt5GJR7ZQAY47ypP9LjEn/DE=
824826
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/api v1.0.285 h1:gFmukRGLtYiXVBVvg/5DP/0fM1+dKpwDjT+khtDVLmc=
@@ -865,6 +867,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.1107 h1:sUiyGf
865867
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.1107/go.mod h1:L1r6mc7XjFlyLlOVqRvPEhjXneHywnyjyv9EoiGBRvM=
866868
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.1.55 h1:+Ev7tV+pjE/RZqHiopmYPKChF30OjRGn6KS8ubBByq8=
867869
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.1.55/go.mod h1:EL80jbu+ubwrNnTZHsp+jaWat2fKGkS/B9MYB/42exA=
870+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.2.2 h1:mDg1SYAFF3tiDRFnFDGguCR2Kq35udG07nHa52uTYX0=
871+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.2.2/go.mod h1:59a8Y11O2Hqa9cS3mMpsLbTgQsu6+PpOu+ZYWTEtVDE=
868872
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.1033 h1:dIr+MVsZeUBiKZELfJh5HRJdI+BI6lCp5pv/2oXekuk=
869873
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.1033/go.mod h1:7oFlNimGSTHFy6JV7W/IZKuJWr+NUjCnGLTvb9MWNrY=
870874
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.1148 h1:tPQHJE07DGCJWrQJklrkrF0CasB86M7AEb0PrkXNjAM=
@@ -945,7 +949,12 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.4/go.mod h1
945949
=======
946950
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.55 h1:8kT5ktFibG46S7WImjNkHx6N5b6vNFIVxPuj6rDMgb8=
947951
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.55/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
952+
<<<<<<< HEAD
948953
>>>>>>> 2e9465052 (add)
954+
=======
955+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.2.2 h1:IqDivO9t4+39+YWlFXhK7kJPm/FbLAD1FbhoaGbDSx8=
956+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.2.2/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
957+
>>>>>>> 45ea86ea7 (add)
949958
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993 h1:WlPgXldQCxt7qi5Xrc6j6zTrsXWzN5BcOGs7Irq7fwQ=
950959
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993/go.mod h1:Z9U8zNtyuyKhjS0698wqsrG/kLx1TQ5CEixXBwVe7xY=
951960
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860 h1:F3esKBIT3HW9+7Gt8cVgf8X06VdGIczpgLBUECzSEzU=

‎tencentcloud/connectivity/client.go‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414
"github.com/aws/aws-sdk-go/aws/endpoints"
1515
"github.com/aws/aws-sdk-go/aws/session"
1616
"github.com/aws/aws-sdk-go/service/s3"
17+
clbintl "github.com/tencentcloud/tencentcloud-sdk-go-intl-en/tencentcloud/clb/v20180317"
1718
intlProfile "github.com/tencentcloud/tencentcloud-sdk-go-intl-en/tencentcloud/common/profile"
1819
cvmintl "github.com/tencentcloud/tencentcloud-sdk-go-intl-en/tencentcloud/cvm/v20170312"
1920
mdl "github.com/tencentcloud/tencentcloud-sdk-go-intl-en/tencentcloud/mdl/v20200326"
@@ -138,6 +139,7 @@ type TencentCloudClient struct {
138139
cvmv20170312Conn *cvmv20170312.Client
139140
cvmIntlConn *cvmintl.Client
140141
clbConn *clb.Client
142+
clbIntlConn *clbintl.Client
141143
dayuConn *dayu.Client
142144
dcConn *dc.Client
143145
tagConn *tag.Client
@@ -583,6 +585,25 @@ func (me *TencentCloudClient) UseClbClient(iacExtInfo ...IacExtInfo) *clb.Client
583585
return me.clbConn
584586
}
585587

588+
// UseClbClient returns clb Intl client for service
589+
func (me *TencentCloudClient) UseClbIntlClient(iacExtInfo ...IacExtInfo) *clbintl.Client {
590+
var logRoundTripper LogRoundTripper
591+
if len(iacExtInfo) != 0 {
592+
logRoundTripper.InstanceId = iacExtInfo[0].InstanceId
593+
}
594+
595+
if me.clbIntlConn != nil {
596+
me.clbIntlConn.WithHttpTransport(&logRoundTripper)
597+
return me.clbIntlConn
598+
}
599+
600+
cpf := me.NewClientIntlProfile(300)
601+
me.clbIntlConn, _ = clbintl.NewClient(me.Credential, me.Region, cpf)
602+
me.clbIntlConn.WithHttpTransport(&logRoundTripper)
603+
604+
return me.clbIntlConn
605+
}
606+
586607
// UseCvmClient returns cvm client for service
587608
func (me *TencentCloudClient) UseCvmClient(iacExtInfo ...IacExtInfo) *cvmv20170312.Client {
588609
var logRoundTripper LogRoundTripper

‎tencentcloud/services/clb/resource_tc_clb_customized_config_attachment.go‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ import (
88
"github.com/pkg/errors"
99
tccommon "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/common"
1010

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

1314
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
1415
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
15-
clb "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb/v20180317"
1616
)
1717

1818
func ResourceTencentCloudClbCustomizedConfigAttachment() *schema.Resource {
@@ -69,7 +69,7 @@ func resourceTencentCloudClbCustomizedConfigAttachmentCreate(d *schema.ResourceD
6969

7070
var (
7171
logId = tccommon.GetLogId(tccommon.ContextNil)
72-
request = clb.NewAssociateCustomizedConfigRequest()
72+
request = clbintl.NewAssociateCustomizedConfigRequest()
7373
configId string
7474
)
7575

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

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

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

115115
requestId := *result.Response.RequestId
116-
retryErr := waitForTaskFinish(requestId, meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseClbClient())
116+
retryErr := waitForTaskFinishIntl(requestId, meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseClbIntlClient())
117117
if retryErr != nil {
118118
return tccommon.RetryError(errors.WithStack(retryErr))
119119
}
@@ -196,9 +196,9 @@ func resourceTencentCloudClbCustomizedConfigAttachmentUpdate(d *schema.ResourceD
196196
remove := olds.Difference(news).List()
197197
add := news.Difference(olds).List()
198198
if len(remove) > 0 {
199-
request := clb.NewDisassociateCustomizedConfigRequest()
199+
request := clbintl.NewDisassociateCustomizedConfigRequest()
200200
for _, item := range remove {
201-
bindItem := clb.BindItem{}
201+
bindItem := clbintl.BindItem{}
202202
dMap := item.(map[string]interface{})
203203
if v, ok := dMap["load_balancer_id"]; ok {
204204
bindItem.LoadBalancerId = helper.String(v.(string))
@@ -221,7 +221,7 @@ func resourceTencentCloudClbCustomizedConfigAttachmentUpdate(d *schema.ResourceD
221221

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

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

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

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

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

307307
var (
308308
logId = tccommon.GetLogId(tccommon.ContextNil)
309-
request = clb.NewDisassociateCustomizedConfigRequest()
309+
request = clbintl.NewDisassociateCustomizedConfigRequest()
310310
id = d.Id()
311311
)
312312

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

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

348348
requestId := *result.Response.RequestId
349-
retryErr := waitForTaskFinish(requestId, meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseClbClient())
349+
retryErr := waitForTaskFinishIntl(requestId, meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseClbIntlClient())
350350
if retryErr != nil {
351351
return tccommon.RetryError(errors.WithStack(retryErr))
352352
}

‎tencentcloud/services/clb/resource_tc_clb_customized_config_v2.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
1212
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1313
"github.com/pkg/errors"
14-
clb "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb/v20180317"
14+
clbintl "github.com/tencentcloud/tencentcloud-sdk-go-intl-en/tencentcloud/clb/v20180317"
1515

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

7171
var (
7272
logId = tccommon.GetLogId(tccommon.ContextNil)
73-
request = clb.NewAddCustomizedConfigRequest()
74-
response = clb.NewAddCustomizedConfigResponse()
73+
request = clbintl.NewAddCustomizedConfigRequest()
74+
response = clbintl.NewAddCustomizedConfigResponse()
7575
)
7676

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

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

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

185185
if d.HasChange("config_name") || d.HasChange("config_content") {
186-
request := clb.NewModifyCustomizedConfigRequest()
186+
request := clbintl.NewModifyCustomizedConfigRequest()
187187
request.UconfigId = &configId
188188
configName := d.Get("config_name").(string)
189189
configContent := d.Get("config_content").(string)
190190
request.ConfigName = &configName
191191
request.ConfigContent = &configContent
192192

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

225225
var (
226226
logId = tccommon.GetLogId(tccommon.ContextNil)
227-
request = clb.NewDeleteCustomizedConfigRequest()
227+
request = clbintl.NewDeleteCustomizedConfigRequest()
228228
)
229229

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

238238
err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
239-
result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseClbClient().DeleteCustomizedConfig(request)
239+
result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseClbIntlClient().DeleteCustomizedConfig(request)
240240
if e != nil {
241241
return tccommon.RetryError(e)
242242
} else {

‎tencentcloud/services/clb/service_tencentcloud_clb.go‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
1515
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1616
"github.com/pkg/errors"
17+
clbintl "github.com/tencentcloud/tencentcloud-sdk-go-intl-en/tencentcloud/clb/v20180317"
1718
clb "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb/v20180317"
1819
"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common"
1920
sdkErrors "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
@@ -1161,6 +1162,24 @@ func waitForTaskFinish(requestId string, meta *clb.Client) (err error) {
11611162
return
11621163
}
11631164

1165+
func waitForTaskFinishIntl(requestId string, meta *clbintl.Client) (err error) {
1166+
taskQueryRequest := clbintl.NewDescribeTaskStatusRequest()
1167+
taskQueryRequest.TaskId = &requestId
1168+
err = resource.Retry(4*tccommon.ReadRetryTimeout, func() *resource.RetryError {
1169+
taskResponse, e := meta.DescribeTaskStatus(taskQueryRequest)
1170+
if e != nil {
1171+
return resource.NonRetryableError(errors.WithStack(e))
1172+
}
1173+
if *taskResponse.Response.Status == int64(CLB_TASK_EXPANDING) {
1174+
return resource.RetryableError(errors.WithStack(fmt.Errorf("CLB task status is %d(expanding), requestId is %s", *taskResponse.Response.Status, *taskResponse.Response.RequestId)))
1175+
} else if *taskResponse.Response.Status == int64(CLB_TASK_FAIL) {
1176+
return resource.NonRetryableError(errors.WithStack(fmt.Errorf("CLB task status is %d(failed), requestId is %s", *taskResponse.Response.Status, *taskResponse.Response.RequestId)))
1177+
}
1178+
return nil
1179+
})
1180+
return
1181+
}
1182+
11641183
func waitForTaskFinishGetID(requestId string, meta *clb.Client) (clbID string, err error) {
11651184
request := clb.NewDescribeTaskStatusRequest()
11661185
request.TaskId = &requestId
@@ -1796,6 +1815,27 @@ func (me *ClbService) DescribeLbCustomizedConfigById(ctx context.Context, config
17961815
return
17971816
}
17981817

1818+
func (me *ClbService) DescribeLbIntlCustomizedConfigById(ctx context.Context, configId, configType string) (customizedConfig *clbintl.ConfigListItem, errRet error) {
1819+
logId := tccommon.GetLogId(ctx)
1820+
request := clbintl.NewDescribeCustomizedConfigListRequest()
1821+
request.UconfigIds = []*string{&configId}
1822+
request.ConfigType = helper.String(configType)
1823+
ratelimit.Check(request.GetAction())
1824+
response, err := me.client.UseClbIntlClient().DescribeCustomizedConfigList(request)
1825+
if err != nil {
1826+
errRet = errors.WithStack(err)
1827+
return
1828+
}
1829+
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n",
1830+
logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
1831+
1832+
if len(response.Response.ConfigList) < 1 {
1833+
return
1834+
}
1835+
customizedConfig = response.Response.ConfigList[0]
1836+
return
1837+
}
1838+
17991839
func (me *ClbService) DeleteLbCustomizedConfigById(ctx context.Context, configId string) (errRet error) {
18001840
logId := tccommon.GetLogId(ctx)
18011841
request := clb.NewSetCustomizedConfigForLoadBalancerRequest()

0 commit comments

Comments
 (0)