Merge branch 'master' into master

Author: gailwang

CHANGELOG.md

@@ -4,6 +4,7 @@ BUG FIXES:
 * Resource: `tencentcloud_clb_instance` fix force new when updating tags.
 * Resource: `tencentcloud_redis_backup_config` fix doc issues.
 * Resource: `tencentcloud_instance` fix `keep_image_login` force new issue when updating terraform version.
+* Resource: `tencentcloud_clb_instance` fix tag creation bug.
 
 ## 1.45.2 (October 19, 2020)
 

tencentcloud/resource_tc_clb_instance.go

@@ -286,7 +286,7 @@ func resourceTencentCloudClbInstanceCreate(d *schema.ResourceData, meta interfac
 	if tags := helper.GetTags(d, "tags"); len(tags) > 0 {
 		tcClient := meta.(*TencentCloudClient).apiV3Conn
 		tagService := &TagService{client: tcClient}
-		resourceName := BuildTagResourceName("clb", "loadbalancerid", tcClient.Region, d.Id())
+		resourceName := BuildTagResourceName("clb", "clb", tcClient.Region, d.Id())
 		if err := tagService.ModifyTags(ctx, resourceName, tags, nil); err != nil {
 			return err
 		}
@@ -337,7 +337,7 @@ func resourceTencentCloudClbInstanceRead(d *schema.ResourceData, meta interface{
 
 	tcClient := meta.(*TencentCloudClient).apiV3Conn
 	tagService := &TagService{client: tcClient}
-	tags, err := tagService.DescribeResourceTags(ctx, "clb", "loadbalancerid", tcClient.Region, d.Id())
+	tags, err := tagService.DescribeResourceTags(ctx, "clb", "clb", tcClient.Region, d.Id())
 	if err != nil {
 		return err
 	}
@@ -469,7 +469,7 @@ func resourceTencentCloudClbInstanceUpdate(d *schema.ResourceData, meta interfac
 
 		tcClient := meta.(*TencentCloudClient).apiV3Conn
 		tagService := &TagService{client: tcClient}
-		resourceName := BuildTagResourceName("clb", "loadbalancerid", tcClient.Region, d.Id())
+		resourceName := BuildTagResourceName("clb", "clb", tcClient.Region, d.Id())
 		err := tagService.ModifyTags(ctx, resourceName, replaceTags, deleteTags)
 		if err != nil {
 			return err