Skip to content

Commit e70aed2

Browse files
tongyimingmikatong
andauthored
fix: support clb listener target_type update (#1172)
* fix: support clb listener target_type update * fix: update vendor * merge Co-authored-by: mikatong <mikatong@tencent.com>
1 parent 2b0533d commit e70aed2

File tree

8 files changed

+4978
-724
lines changed

8 files changed

+4978
-724
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ require (
3030
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn v1.0.425
3131
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cfs v1.0.199
3232
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ckafka v1.0.403
33-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.283
33+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.445
3434
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.199
3535
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.412
3636
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.445

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -470,6 +470,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ckafka v1.0.403 h1:rD9H
470470
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ckafka v1.0.403/go.mod h1:yWwwGj2gV0hRPfM9GXG4EgDee0cEWYcAwl/M8CTTvzM=
471471
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.283 h1:8pML0UtXgui5WZFLLrCv6QdR8e0fUva0V4W5wSgTCSc=
472472
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.283/go.mod h1:zgARzAnsLzpLhdpAHrHTUilOXytH9aEJy5ssCdizVV0=
473+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.445 h1:ZUtZLAXy7xQbDipfEIPEBahjHBoJ+hTAbQYaqjiwFAg=
474+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.445/go.mod h1:qiBToiXBl7c0k05B3ZzLlAdPuDl5sFHzYsnB8/IBRiA=
473475
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.199 h1:o41qFAFJGPDTLNWXs7nLw4fsDxFUCe5gkO2YXI9Ye6Q=
474476
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.199/go.mod h1:b7dNjabPys0/iLwRFd8MVE5EkJTNAh4qtaHQOOLchx4=
475477
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.412 h1:mQbC16tarrfz+ILlHTMiiA3MTUP79fSqs+KEpuL2FKE=

tencentcloud/resource_tc_clb_listener.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -676,6 +676,12 @@ func resourceTencentCloudClbListenerUpdate(d *schema.ResourceData, meta interfac
676676
request.Certificate = certificateInput
677677
}
678678

679+
if d.HasChange("target_type") {
680+
changed = true
681+
targetType := d.Get("target_type").(string)
682+
request.TargetType = helper.String(targetType)
683+
}
684+
679685
if changed {
680686
err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
681687
response, e := meta.(*TencentCloudClient).apiV3Conn.UseClbClient().ModifyListener(request)

tencentcloud/resource_tc_clb_listener_test.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func TestAccTencentCloudClbListener_basic(t *testing.T) {
4040
})
4141
}
4242

43-
func TestAccTencentCloudClbListener_tcp(t *testing.T) {
43+
func TestAccTencentCloudClbListener_tcp_basic(t *testing.T) {
4444
t.Parallel()
4545

4646
resource.Test(t, resource.TestCase{
@@ -63,6 +63,7 @@ func TestAccTencentCloudClbListener_tcp(t *testing.T) {
6363
resource.TestCheckResourceAttr("tencentcloud_clb_listener.listener_tcp", "health_check_interval_time", "100"),
6464
resource.TestCheckResourceAttr("tencentcloud_clb_listener.listener_tcp", "health_check_health_num", "2"),
6565
resource.TestCheckResourceAttr("tencentcloud_clb_listener.listener_tcp", "health_check_unhealth_num", "2"),
66+
resource.TestCheckResourceAttr("tencentcloud_clb_listener.listener_tcp", "target_type", "NODE"),
6667
),
6768
},
6869
{
@@ -80,6 +81,7 @@ func TestAccTencentCloudClbListener_tcp(t *testing.T) {
8081
resource.TestCheckResourceAttr("tencentcloud_clb_listener.listener_tcp", "health_check_interval_time", "200"),
8182
resource.TestCheckResourceAttr("tencentcloud_clb_listener.listener_tcp", "health_check_health_num", "3"),
8283
resource.TestCheckResourceAttr("tencentcloud_clb_listener.listener_tcp", "health_check_unhealth_num", "3"),
84+
resource.TestCheckResourceAttr("tencentcloud_clb_listener.listener_tcp", "target_type", "TARGETGROUP"),
8385
),
8486
},
8587
{
@@ -459,7 +461,7 @@ resource "tencentcloud_clb_listener" "listener_tcp" {
459461
health_check_unhealth_num = 2
460462
session_expire_time = 30
461463
scheduler = "WRR"
462-
target_type = "TARGETGROUP"
464+
target_type = "NODE"
463465
}
464466
`
465467

0 commit comments

Comments
 (0)