Skip to content

Commit 9ce9a81

Browse files
SevenEarthSevenEarth
committed
add
1 parent 435e655 commit 9ce9a81

File tree

14 files changed

+194
-152
lines changed

14 files changed

+194
-152
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.1315+incompatible
28+
github.com/tencentcloud/tencentcloud-sdk-go-intl-en v3.0.1320+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.2.2
46+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.3.8
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.3.7
49+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.8
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.3.7

‎go.sum‎

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -817,10 +817,8 @@ github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c h1:+aPplB
817817
github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c/go.mod h1:SbErYREK7xXdsRiigaQiQkI9McGRzYMvlKYaP3Nimdk=
818818
github.com/tdakkota/asciicheck v0.2.0 h1:o8jvnUANo0qXtnslk2d3nMKTFNlOnJjRrNcj0j9qkHM=
819819
github.com/tdakkota/asciicheck v0.2.0/go.mod h1:Qb7Y9EgjCLJGup51gDHFzbI08/gbGhL/UVhYIPWG2rg=
820-
github.com/tencentcloud/tencentcloud-sdk-go-intl-en v3.0.1214+incompatible h1:2pQ01ULc1d4WxNxwSR2qglNLA4xzB5ipffJ48fytTcg=
821-
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=
820+
github.com/tencentcloud/tencentcloud-sdk-go-intl-en v3.0.1320+incompatible h1:i5nhRIbi+RNJlgyE0HSbZfbKYDoZAD35XhKDdcrFcyg=
821+
github.com/tencentcloud/tencentcloud-sdk-go-intl-en v3.0.1320+incompatible/go.mod h1:72Wo6Gt6F8d8V+njrAmduVoT9QjPwCyXktpqCWr7PUc=
824822
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/antiddos v1.0.799 h1:u49r1bGFDY0CeAF46iotNnLtc5yplPf9XXa7W7zJ4fE=
825823
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/antiddos v1.0.799/go.mod h1:JQa/Ess7Kkn/BuAugq0Tt5GJR7ZQAY47ypP9LjEn/DE=
826824
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/api v1.0.285 h1:gFmukRGLtYiXVBVvg/5DP/0fM1+dKpwDjT+khtDVLmc=
@@ -863,12 +861,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ciam v1.0.695 h1:FGwsF1
863861
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ciam v1.0.695/go.mod h1:HAasVoWz8ed6kAg7Q/DTg+8uZXiOgW7lmJeAGGrquEQ=
864862
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ckafka v1.0.1073 h1:+nTp32YOtwreGWNjbTHglsnxu5pruPyHOosQ1yN/tkE=
865863
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ckafka v1.0.1073/go.mod h1:D9xdyB3utAtgGwTExSGxHSVQMfVHEUo/bfaBTxjHkao=
866-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.1107 h1:sUiyGfYHzNpHKJx6DlRu1K8xBEGaWlOQT+8W5Ws0v4U=
867-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.1107/go.mod h1:L1r6mc7XjFlyLlOVqRvPEhjXneHywnyjyv9EoiGBRvM=
868-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.1.55 h1:+Ev7tV+pjE/RZqHiopmYPKChF30OjRGn6KS8ubBByq8=
869-
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=
864+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.3.8 h1:JIvn+IybKRchDVrQjKLwfdMQWbwp9PrVPOjZu1ySgJs=
865+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.3.8/go.mod h1:imjZp7E7FUvqzH2b+qnWffVixP+77NsWJZFY18VYgvM=
872866
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.1033 h1:dIr+MVsZeUBiKZELfJh5HRJdI+BI6lCp5pv/2oXekuk=
873867
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.1033/go.mod h1:7oFlNimGSTHFy6JV7W/IZKuJWr+NUjCnGLTvb9MWNrY=
874868
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.1148 h1:tPQHJE07DGCJWrQJklrkrF0CasB86M7AEb0PrkXNjAM=
@@ -913,7 +907,6 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1033/go.mod
913907
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1034/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
914908
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1056/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
915909
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1073/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
916-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1107/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
917910
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1115/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
918911
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1126/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
919912
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1127/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
@@ -941,19 +934,13 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.49/go.mod h
941934
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.50/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
942935
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.51/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
943936
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.2.2/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
944-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.52/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
945937
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.3/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
946938
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.4/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
947-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.7 h1:MCrz0g4LDxoCdCgz6Dtas8b7HHLMfgTpIIF/tlor0Hw=
948939
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.7/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
940+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.8 h1:DdeB0VtEs8UmJSPdNCTeqMW5ifX3Phlvu0o0WJXZ6yE=
941+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.8/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
949942
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.1.51 h1:pGwrfCBBCt1u+EDHwfNj9NLQpvk5MVKVMcsE7SvwqM4=
950943
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.1.51/go.mod h1:aTEdZDUTIOTS0CMDMMpKIkoc0HqtQ5+dRlaZO1KF/gg=
951-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.55 h1:8kT5ktFibG46S7WImjNkHx6N5b6vNFIVxPuj6rDMgb8=
952-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.55/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
953-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.2.2 h1:IqDivO9t4+39+YWlFXhK7kJPm/FbLAD1FbhoaGbDSx8=
954-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.2.2/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
955-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993 h1:WlPgXldQCxt7qi5Xrc6j6zTrsXWzN5BcOGs7Irq7fwQ=
956-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993/go.mod h1:Z9U8zNtyuyKhjS0698wqsrG/kLx1TQ5CEixXBwVe7xY=
957944
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860 h1:F3esKBIT3HW9+7Gt8cVgf8X06VdGIczpgLBUECzSEzU=
958945
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860/go.mod h1:NZo1WplQcC314kMlCRUoy8NQju2BnolIJj7NAWgsuhY=
959946
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.1206 h1:tx8L5srClwK2T5dte7yw3N8PfxqtuHbT8fWfUZMOUwk=

‎tencentcloud/services/clb/resource_tc_clb_customized_config_attachment.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -82,19 +82,19 @@ func resourceTencentCloudClbCustomizedConfigAttachmentCreate(d *schema.ResourceD
8282
for _, item := range v.(*schema.Set).List() {
8383
bindItem := clbintl.BindItem{}
8484
dMap := item.(map[string]interface{})
85-
if v, ok := dMap["load_balancer_id"]; ok {
85+
if v, ok := dMap["load_balancer_id"]; ok && v.(string) != "" {
8686
bindItem.LoadBalancerId = helper.String(v.(string))
8787
}
8888

89-
if v, ok := dMap["listener_id"]; ok {
89+
if v, ok := dMap["listener_id"]; ok && v.(string) != "" {
9090
bindItem.ListenerId = helper.String(v.(string))
9191
}
9292

93-
if v, ok := dMap["domain"]; ok {
93+
if v, ok := dMap["domain"]; ok && v.(string) != "" {
9494
bindItem.Domain = helper.String(v.(string))
9595
}
9696

97-
if v, ok := dMap["location_id"]; ok {
97+
if v, ok := dMap["location_id"]; ok && v.(string) != "" {
9898
bindItem.LocationId = helper.String(v.(string))
9999
}
100100

@@ -200,19 +200,19 @@ func resourceTencentCloudClbCustomizedConfigAttachmentUpdate(d *schema.ResourceD
200200
for _, item := range remove {
201201
bindItem := clbintl.BindItem{}
202202
dMap := item.(map[string]interface{})
203-
if v, ok := dMap["load_balancer_id"]; ok {
203+
if v, ok := dMap["load_balancer_id"]; ok && v.(string) != "" {
204204
bindItem.LoadBalancerId = helper.String(v.(string))
205205
}
206206

207-
if v, ok := dMap["listener_id"]; ok {
207+
if v, ok := dMap["listener_id"]; ok && v.(string) != "" {
208208
bindItem.ListenerId = helper.String(v.(string))
209209
}
210210

211-
if v, ok := dMap["domain"]; ok {
211+
if v, ok := dMap["domain"]; ok && v.(string) != "" {
212212
bindItem.Domain = helper.String(v.(string))
213213
}
214214

215-
if v, ok := dMap["location_id"]; ok {
215+
if v, ok := dMap["location_id"]; ok && v.(string) != "" {
216216
bindItem.LocationId = helper.String(v.(string))
217217
}
218218

@@ -252,19 +252,19 @@ func resourceTencentCloudClbCustomizedConfigAttachmentUpdate(d *schema.ResourceD
252252
for _, item := range add {
253253
bindItem := clbintl.BindItem{}
254254
dMap := item.(map[string]interface{})
255-
if v, ok := dMap["load_balancer_id"]; ok {
255+
if v, ok := dMap["load_balancer_id"]; ok && v.(string) != "" {
256256
bindItem.LoadBalancerId = helper.String(v.(string))
257257
}
258258

259-
if v, ok := dMap["listener_id"]; ok {
259+
if v, ok := dMap["listener_id"]; ok && v.(string) != "" {
260260
bindItem.ListenerId = helper.String(v.(string))
261261
}
262262

263-
if v, ok := dMap["domain"]; ok {
263+
if v, ok := dMap["domain"]; ok && v.(string) != "" {
264264
bindItem.Domain = helper.String(v.(string))
265265
}
266266

267-
if v, ok := dMap["location_id"]; ok {
267+
if v, ok := dMap["location_id"]; ok && v.(string) != "" {
268268
bindItem.LocationId = helper.String(v.(string))
269269
}
270270

‎tencentcloud/services/clb/resource_tc_clb_listener.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -702,14 +702,6 @@ func resourceTencentCloudClbListenerRead(d *schema.ResourceData, meta interface{
702702
_ = d.Set("idle_connect_timeout", instance.IdleConnectTimeout)
703703
}
704704

705-
if instance.RescheduleInterval != nil {
706-
_ = d.Set("reschedule_interval", instance.RescheduleInterval)
707-
}
708-
709-
if instance.RescheduleStartTime != nil {
710-
_ = d.Set("reschedule_start_time", instance.RescheduleStartTime)
711-
}
712-
713705
_ = d.Set("reschedule_target_zero_weight", false)
714706
_ = d.Set("reschedule_unhealthy", false)
715707
_ = d.Set("reschedule_expand_target", false)
@@ -729,6 +721,14 @@ func resourceTencentCloudClbListenerRead(d *schema.ResourceData, meta interface{
729721
}
730722
}
731723

724+
if instance.RescheduleStartTime != nil {
725+
_ = d.Set("reschedule_start_time", instance.RescheduleStartTime)
726+
}
727+
728+
if instance.RescheduleInterval != nil {
729+
_ = d.Set("reschedule_interval", instance.RescheduleInterval)
730+
}
731+
732732
return nil
733733
}
734734

‎tencentcloud/services/clb/resource_tc_clb_listener.md‎

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ Example Usage
55
HTTP Listener
66

77
```hcl
8-
resource "tencentcloud_clb_listener" "HTTP_listener" {
9-
clb_id = "lb-0lh5au7v"
10-
listener_name = "test_listener"
8+
resource "tencentcloud_clb_listener" "example" {
9+
clb_id = "lb-qck8thny"
10+
listener_name = "tf-example"
1111
port = 80
1212
protocol = "HTTP"
1313
}
@@ -16,9 +16,9 @@ resource "tencentcloud_clb_listener" "HTTP_listener" {
1616
TCP/UDP Listener
1717

1818
```hcl
19-
resource "tencentcloud_clb_listener" "TCP_listener" {
20-
clb_id = "lb-0lh5au7v"
21-
listener_name = "test_listener"
19+
resource "tencentcloud_clb_listener" "example" {
20+
clb_id = "lb-qck8thny"
21+
listener_name = "tf-example"
2222
port = 80
2323
protocol = "TCP"
2424
health_check_switch = true
@@ -30,6 +30,7 @@ resource "tencentcloud_clb_listener" "TCP_listener" {
3030
scheduler = "WRR"
3131
health_check_port = 200
3232
health_check_type = "HTTP"
33+
health_check_http_path = "/"
3334
health_check_http_code = 2
3435
health_check_http_version = "HTTP/1.0"
3536
health_check_http_method = "GET"
@@ -41,9 +42,9 @@ resource "tencentcloud_clb_listener" "TCP_listener" {
4142
TCP/UDP Listener with tcp health check
4243

4344
```hcl
44-
resource "tencentcloud_clb_listener" "listener_tcp" {
45-
clb_id = tencentcloud_clb_instance.clb_basic.id
46-
listener_name = "listener_tcp"
45+
resource "tencentcloud_clb_listener" "example" {
46+
clb_id = "lb-qck8thny"
47+
listener_name = "tf-example"
4748
port = 44
4849
protocol = "TCP"
4950
health_check_switch = true
@@ -63,9 +64,9 @@ resource "tencentcloud_clb_listener" "listener_tcp" {
6364
TCP/UDP Listener with http health check
6465

6566
```hcl
66-
resource "tencentcloud_clb_listener" "listener_tcp" {
67-
clb_id = tencentcloud_clb_instance.clb_basic.id
68-
listener_name = "listener_tcp"
67+
resource "tencentcloud_clb_listener" "example" {
68+
clb_id = "lb-qck8thny"
69+
listener_name = "tf-example"
6970
port = 44
7071
protocol = "TCP"
7172
health_check_switch = true
@@ -89,9 +90,9 @@ resource "tencentcloud_clb_listener" "listener_tcp" {
8990
TCP/UDP Listener with customer health check
9091

9192
```hcl
92-
resource "tencentcloud_clb_listener" "listener_tcp"{
93-
clb_id = tencentcloud_clb_instance.clb_basic.id
94-
listener_name = "listener_tcp"
93+
resource "tencentcloud_clb_listener" "example"{
94+
clb_id = "lb-qck8thny"
95+
listener_name = "tf-example"
9596
port = 44
9697
protocol = "TCP"
9798
health_check_switch = true
@@ -112,9 +113,9 @@ resource "tencentcloud_clb_listener" "listener_tcp"{
112113
HTTPS Listener with sigle certificate
113114

114115
```hcl
115-
resource "tencentcloud_clb_listener" "HTTPS_listener" {
116+
resource "tencentcloud_clb_listener" "example" {
116117
clb_id = "lb-0lh5au7v"
117-
listener_name = "test_listener"
118+
listener_name = "tf-example"
118119
port = "80"
119120
protocol = "HTTPS"
120121
certificate_ssl_mode = "MUTUAL"
@@ -127,9 +128,9 @@ resource "tencentcloud_clb_listener" "HTTPS_listener" {
127128
HTTPS Listener with multi certificates
128129

129130
```hcl
130-
resource "tencentcloud_clb_listener" "HTTPS_listener" {
131+
resource "tencentcloud_clb_listener" "example" {
131132
clb_id = "lb-l6cp6jt4"
132-
listener_name = "test_listener"
133+
listener_name = "tf-example"
133134
port = "80"
134135
protocol = "HTTPS"
135136
sni_switch = true
@@ -147,9 +148,9 @@ resource "tencentcloud_clb_listener" "HTTPS_listener" {
147148
TCP SSL Listener
148149

149150
```hcl
150-
resource "tencentcloud_clb_listener" "TCPSSL_listener" {
151+
resource "tencentcloud_clb_listener" "example" {
151152
clb_id = "lb-0lh5au7v"
152-
listener_name = "test_listener"
153+
listener_name = "tf-example"
153154
port = "80"
154155
protocol = "TCP_SSL"
155156
certificate_ssl_mode = "MUTUAL"
@@ -168,17 +169,17 @@ resource "tencentcloud_clb_listener" "TCPSSL_listener" {
168169
Port Range Listener
169170

170171
```hcl
171-
resource "tencentcloud_clb_instance" "clb_basic" {
172-
network_type = "OPEN"
172+
resource "tencentcloud_clb_instance" "example" {
173173
clb_name = "tf-listener-test"
174+
network_type = "OPEN"
174175
}
175176
176-
resource "tencentcloud_clb_listener" "listener_basic" {
177-
clb_id = tencentcloud_clb_instance.clb_basic.id
177+
resource "tencentcloud_clb_listener" "example" {
178+
clb_id = tencentcloud_clb_instance.example.id
179+
listener_name = "tf-example"
178180
port = 1
179181
end_port = 6
180182
protocol = "TCP"
181-
listener_name = "listener_basic"
182183
session_expire_time = 30
183184
scheduler = "WRR"
184185
target_type = "NODE"
@@ -187,8 +188,8 @@ resource "tencentcloud_clb_listener" "listener_basic" {
187188

188189
Import
189190

190-
CLB listener can be imported using the id (version >= 1.47.0), e.g.
191+
CLB listener can be imported using the clbId#listenerId (version >= 1.47.0), e.g.
191192

192193
```
193-
$ terraform import tencentcloud_clb_listener.foo lb-7a0t6zqb#lbl-hh141sn9
194-
```
194+
$ terraform import tencentcloud_clb_listener.example lb-7a0t6zqb#lbl-hh141sn9
195+
```

‎tencentcloud/services/clb/service_tencentcloud_clb.go‎

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2602,9 +2602,10 @@ func waitTaskReady(ctx context.Context, client *clb.Client, reqeustId string) er
26022602
return nil
26032603
}
26042604

2605-
func (me *ClbService) DescribeDescribeCustomizedConfigAssociateListById(ctx context.Context, configId string) (bindList []*clb.BindDetailItem, errRet error) {
2605+
func (me *ClbService) DescribeDescribeCustomizedConfigAssociateListById(ctx context.Context, configId string) (bindList []*clbintl.BindDetailItem, errRet error) {
26062606
logId := tccommon.GetLogId(ctx)
2607-
request := clb.NewDescribeCustomizedConfigAssociateListRequest()
2607+
request := clbintl.NewDescribeCustomizedConfigAssociateListRequest()
2608+
response := clbintl.NewDescribeCustomizedConfigAssociateListResponse()
26082609
request.UconfigId = helper.String(configId)
26092610

26102611
var (
@@ -2615,16 +2616,29 @@ func (me *ClbService) DescribeDescribeCustomizedConfigAssociateListById(ctx cont
26152616
for {
26162617
request.Offset = &offset
26172618
request.Limit = &limit
2618-
ratelimit.Check(request.GetAction())
2619-
response, err := me.client.UseClbClient().DescribeCustomizedConfigAssociateList(request)
2619+
err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError {
2620+
ratelimit.Check(request.GetAction())
2621+
result, err := me.client.UseClbIntlClient().DescribeCustomizedConfigAssociateList(request)
2622+
if err != nil {
2623+
return tccommon.RetryError(err)
2624+
} else {
2625+
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
2626+
}
2627+
2628+
if result == nil || result.Response == nil || result.Response.BindList == nil {
2629+
return resource.NonRetryableError(fmt.Errorf("Describe customized config associate list failed, Response is nil."))
2630+
}
2631+
2632+
response = result
2633+
return nil
2634+
})
2635+
26202636
if err != nil {
26212637
errRet = err
26222638
return
26232639
}
26242640

2625-
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
2626-
2627-
if response == nil || len(response.Response.BindList) < 1 {
2641+
if len(response.Response.BindList) < 1 {
26282642
break
26292643
}
26302644

‎vendor/github.com/tencentcloud/tencentcloud-sdk-go-intl-en/tencentcloud/common/http/request.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)