add tcp/udp listener target group attachment #550
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gailwang
reviewed
Nov 17, 2020
| @@ -1219,7 +1220,7 @@ func (me *ClbService) DescribeAssociateTargetGroups(ctx context.Context, ids []s | |||
| originLocationId = *rule.LocationId | |||
| } | |||
|
|
|||
| if originListenerId == ids[1] && originClbId == ids[2] && originLocationId == ids[3] { | |||
| if originListenerId == ids[1] && originClbId == ids[2] || originLocationId == ids[3] { | |||
gailwang
reviewed
Nov 17, 2020
| @@ -265,7 +260,7 @@ func resourceTencentCloudClbTargetGroupAttachmentDelete(d *schema.ResourceData, | |||
| originLocationId = *rule.LocationId | |||
| } | |||
|
|
|||
| if originListenerId == ids[1] && originClbId == ids[2] && originLocationId == ids[3] { | |||
| if originListenerId == ids[1] && originClbId == ids[2] || originLocationId == ids[3] { | |||
gailwang
reviewed
Nov 17, 2020
| @@ -219,10 +211,12 @@ func resourceTencentCloudClbTargetGroupAttachmentRead(d *schema.ResourceData, me | |||
| return nil | |||
| } | |||
|
|
|||
| _ = d.Set("targrt_group_id", ids[0]) | |||
There was a problem hiding this comment.
直接去掉这个的赋值会不会引起forceNew？用旧版本下的tf到新版本apply试一下
gailwang
reviewed
Nov 19, 2020
| targetGroupId = vTarget.(string) | ||
| } | ||
| } else { | ||
| return fmt.Errorf("'target_group_id' or 'targrt_group_id' at least one") |
There was a problem hiding this comment.
at least set one, 不过这里如果报错 推荐客户直接使用这个target_group_id. 报错考虑一下用户体验
gailwang
reviewed
Nov 19, 2020
| defer logElapsed("resource.tencentcloud_clb_redirection.update")() | ||
| defer inconsistentCheck(d, meta)() | ||
| // this nil update method works for the only filed `delete_all_auto_rewrite` | ||
| return resourceTencentCloudClbRedirectionRead(d, meta) |
gailwang
reviewed
Nov 19, 2020
| } | ||
|
|
||
| if err := clbService.DisassociateTargetGroups(ctx, ids[0], ids[1], ids[2], ids[3]); err != nil { | ||
| return err | ||
| } | ||
| time.Sleep(10 * time.Second) |
There was a problem hiding this comment.
下面已经有这个describe来等待状态，这里还要加sleep的原因是？
gailwang
reviewed
Nov 19, 2020
| @@ -11,6 +11,8 @@ description: |- | |||
|
|
|||
| Provides a resource to create a CLB target group attachment is bound to the load balancing listener or forwarding rule. | |||
|
|
|||
| ~> **NOTE:** Required argument `targrt_group_id` is no longer supported, replace by `target_group_id`. | |||
gailwang
reviewed
Nov 20, 2020
|
|
||
| targetInfos []*clb.TargetGroupInfo | ||
| instance *clb.LoadBalancer | ||
| //listener *clb.Listener |
gailwang
reviewed
Nov 20, 2020
| @@ -207,7 +210,7 @@ func resourceTencentCloudClbTargetGroupAttachmentRead(d *schema.ResourceData, me | |||
|
|
|||
| ids := strings.Split(id, FILED_SP) | |||
| if len(ids) != 4 { | |||
| return fmt.Errorf("CLB target group attachment id must contains clb_id, listernrt_id, targrt_group_id, rule_id") | |||
| return fmt.Errorf("CLB target group attachment id must contains clb_id, listernrt_id, target_group_id, rule_id") | |||
| } | |||
There was a problem hiding this comment.
报错还是有点问题 现在增加了四层的选项 不该强制rule_id。 clb_id#listener_id#target_group_id#rule_id(optional for 7 layer) 再检查一下拼写错误
gailwang
approved these changes
Nov 20, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
make testacc TESTARGS="-run TestAccTencentClbTargetGroupAttachmentHttpResource"
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./... -v -run TestAccTencentClbTargetGroupAttachmentHttpResource -timeout 120m
? github.com/tencentcloudstack/terraform-provider-tencentcloud [no test files]
testing: warning: no tests to run
PASS
ok github.com/tencentcloudstack/terraform-provider-tencentcloud/gendoc (cached) [no tests to run]
=== RUN TestAccTencentClbTargetGroupAttachmentHttpResource
--- PASS: TestAccTencentClbTargetGroupAttachmentHttpResource (45.21s)
PASS
ok github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud 46.752s
? github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/connectivity [no test files]
? github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper [no test files]
? github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/ratelimit [no test files]
make testacc TESTARGS="-run TestAccTencentClbTargetGroupAttachmentResource"
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./... -v -run TestAccTencentClbTargetGroupAttachmentResource -timeout 120m
? github.com/tencentcloudstack/terraform-provider-tencentcloud [no test files]
testing: warning: no tests to run
PASS
ok github.com/tencentcloudstack/terraform-provider-tencentcloud/gendoc (cached) [no tests to run]
=== RUN TestAccTencentClbTargetGroupAttachmentResource
--- PASS: TestAccTencentClbTargetGroupAttachmentResource (33.69s)
PASS
ok github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud 35.500s
? github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/connectivity [no test files]
? github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper [no test files]
? github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/ratelimit [no test files]