Skip to content

Commit db40154

Browse files
authored
Merge branch 'master' into master
2 parents 9cf9b56 + 2b93c93 commit db40154

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ BUG FIXES:
44
* Resource: `tencentcloud_clb_instance` fix force new when updating tags.
55
* Resource: `tencentcloud_redis_backup_config` fix doc issues.
66
* Resource: `tencentcloud_instance` fix `keep_image_login` force new issue when updating terraform version.
7+
* Resource: `tencentcloud_clb_instance` fix tag creation bug.
78

89
## 1.45.2 (October 19, 2020)
910

tencentcloud/resource_tc_clb_instance.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ func resourceTencentCloudClbInstanceCreate(d *schema.ResourceData, meta interfac
286286
if tags := helper.GetTags(d, "tags"); len(tags) > 0 {
287287
tcClient := meta.(*TencentCloudClient).apiV3Conn
288288
tagService := &TagService{client: tcClient}
289-
resourceName := BuildTagResourceName("clb", "loadbalancerid", tcClient.Region, d.Id())
289+
resourceName := BuildTagResourceName("clb", "clb", tcClient.Region, d.Id())
290290
if err := tagService.ModifyTags(ctx, resourceName, tags, nil); err != nil {
291291
return err
292292
}
@@ -337,7 +337,7 @@ func resourceTencentCloudClbInstanceRead(d *schema.ResourceData, meta interface{
337337

338338
tcClient := meta.(*TencentCloudClient).apiV3Conn
339339
tagService := &TagService{client: tcClient}
340-
tags, err := tagService.DescribeResourceTags(ctx, "clb", "loadbalancerid", tcClient.Region, d.Id())
340+
tags, err := tagService.DescribeResourceTags(ctx, "clb", "clb", tcClient.Region, d.Id())
341341
if err != nil {
342342
return err
343343
}
@@ -469,7 +469,7 @@ func resourceTencentCloudClbInstanceUpdate(d *schema.ResourceData, meta interfac
469469

470470
tcClient := meta.(*TencentCloudClient).apiV3Conn
471471
tagService := &TagService{client: tcClient}
472-
resourceName := BuildTagResourceName("clb", "loadbalancerid", tcClient.Region, d.Id())
472+
resourceName := BuildTagResourceName("clb", "clb", tcClient.Region, d.Id())
473473
err := tagService.ModifyTags(ctx, resourceName, replaceTags, deleteTags)
474474
if err != nil {
475475
return err

0 commit comments

Comments
 (0)