merge upstream

Author: hhermanwang

CHANGELOG.md

@@ -4,6 +4,10 @@ BUG FIXES:
 
 * Resource: `tencentcloud_sqlserver_instance` Fix the error of releasing associated resources when destroying sqlserver postpaid instance.
 * Resource: `tencentcloud_sqlserver_readonly_instance` Fix the bug that the instance cannot be recycled when destroying sqlserver postpaid instance.
+* 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

@@ -134,7 +134,6 @@ func resourceTencentCloudClbInstance() *schema.Resource {
 			"tags": {
 				Type:        schema.TypeMap,
 				Optional:    true,
-				ForceNew:    true,
 				Description: "The available tags within this CLB.",
 			},
 		},
@@ -287,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
 		}
@@ -338,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
 	}
@@ -470,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

tencentcloud/resource_tc_clb_instance_test.go

@@ -53,6 +53,7 @@ func TestAccTencentCloudClbInstance_open(t *testing.T) {
 					resource.TestCheckResourceAttrSet("tencentcloud_clb_instance.clb_open", "security_groups.0"),
 					resource.TestCheckResourceAttr("tencentcloud_clb_instance.clb_open", "target_region_info_region", "ap-guangzhou"),
 					resource.TestCheckResourceAttrSet("tencentcloud_clb_instance.clb_open", "target_region_info_vpc_id"),
+					resource.TestCheckResourceAttr("tencentcloud_clb_instance.clb_open", "tags.test", "tf"),
 				),
 			},
 			{
@@ -67,6 +68,7 @@ func TestAccTencentCloudClbInstance_open(t *testing.T) {
 					resource.TestCheckResourceAttrSet("tencentcloud_clb_instance.clb_open", "security_groups.0"),
 					resource.TestCheckResourceAttr("tencentcloud_clb_instance.clb_open", "target_region_info_region", "ap-guangzhou"),
 					resource.TestCheckResourceAttrSet("tencentcloud_clb_instance.clb_open", "target_region_info_vpc_id"),
+					resource.TestCheckResourceAttr("tencentcloud_clb_instance.clb_open", "tags.test", "test"),
 				),
 			},
 		},
@@ -102,6 +104,7 @@ func TestAccTencentCloudClbInstance_internal(t *testing.T) {
 					resource.TestCheckResourceAttr("tencentcloud_clb_instance.clb_internal", "project_id", "0"),
 					resource.TestCheckResourceAttrSet("tencentcloud_clb_instance.clb_internal", "vpc_id"),
 					resource.TestCheckResourceAttrSet("tencentcloud_clb_instance.clb_internal", "subnet_id"),
+					resource.TestCheckResourceAttr("tencentcloud_clb_instance.clb_internal", "tags.test", "test"),
 				),
 			},
 			{
@@ -248,7 +251,7 @@ resource "tencentcloud_clb_instance" "clb_internal" {
   project_id   = 0
 
   tags = {
-    test = "tf1"
+    test = "test"
   }
 }
 `
@@ -273,7 +276,7 @@ resource "tencentcloud_clb_instance" "clb_open" {
   security_groups           = [tencentcloud_security_group.foo.id]
 
   tags = {
-    test = "tf"
+    test = "test"
   }
 }
 `

tencentcloud/resource_tc_instance.go

@@ -339,9 +339,16 @@ func resourceTencentCloudInstance() *schema.Resource {
 				Description: "Password for the instance. In order for the new password to take effect, the instance will be restarted after the password change.",
 			},
 			"keep_image_login": {
-				Type:          schema.TypeBool,
-				Optional:      true,
-				Default:       false,
+				Type:     schema.TypeBool,
+				Optional: true,
+				Default:  false,
+				DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
+					if new == "false" && old == "" || old == "false" && new == "" {
+						return true
+					} else {
+						return old == new
+					}
+				},
 				ForceNew:      true,
 				ConflictsWith: []string{"key_name", "password"},
 				Description:   "Whether to keep image login or not, default is `false`. When the image type is private or shared or imported, this parameter can be set `true`.",
@@ -795,6 +802,7 @@ func resourceTencentCloudInstanceRead(d *schema.ResourceData, meta interface{})
 	if instance.LoginSettings.KeepImageLogin != nil {
 		_ = d.Set("keep_image_login", *instance.LoginSettings.KeepImageLogin == CVM_IMAGE_LOGIN)
 	}
+
 	if *instance.InstanceState == CVM_STATUS_STOPPED {
 		_ = d.Set("running_flag", false)
 	} else {

tencentcloud/resource_tc_redis_backup_config.go

@@ -1,5 +1,5 @@
 /*
-Use this data source to query which instance types of Redis are available in a specific region.
+Use this resource to create a backup config of redis.
 
 Example Usage
 

tencentcloud/resource_tc_redis_instance.go

@@ -79,7 +79,7 @@ func resourceTencentCloudRedisInstance() *schema.Resource {
 				Optional:     true,
 				ForceNew:     true,
 				ValidateFunc: validateIntegerMin(2),
-				Description:  "Instance type. Refer to `data.tencentcloud_redis_zone_config.list.type_id` get available values.",
+				Description:  "Instance type. Available values reference data source `tencentcloud_redis_zone_config` or [document](https://intl.cloud.tencent.com/document/product/239/32069).",
 			},
 			"redis_shard_num": {
 				Type:        schema.TypeInt,

website/docs/r/clb_instance.html.markdown

@@ -56,7 +56,7 @@ The following arguments are supported:
 * `project_id` - (Optional, ForceNew) Id of the project within the CLB instance, '0' - Default Project.
 * `security_groups` - (Optional) Security groups of the CLB instance. Only supports 'OPEN' CLBs.
 * `subnet_id` - (Optional, ForceNew) Subnet id of the CLB. Effective only for CLB within the VPC. Only supports 'INTERNAL' CLBs.
-* `tags` - (Optional, ForceNew) The available tags within this CLB.
+* `tags` - (Optional) The available tags within this CLB.
 * `target_region_info_region` - (Optional) Region information of backend services are attached the CLB instance. Only supports 'OPEN' CLBs.
 * `target_region_info_vpc_id` - (Optional) Vpc information of backend services are attached the CLB instance. Only supports 'OPEN' CLBs.
 * `vpc_id` - (Optional, ForceNew) VPC id of the CLB.

website/docs/r/redis_backup_config.html.markdown

@@ -4,12 +4,12 @@ layout: "tencentcloud"
 page_title: "TencentCloud: tencentcloud_redis_backup_config"
 sidebar_current: "docs-tencentcloud-resource-redis_backup_config"
 description: |-
-  Use this data source to query which instance types of Redis are available in a specific region.
+  Use this resource to create a backup config of redis.
 ---
 
 # tencentcloud_redis_backup_config
 
-Use this data source to query which instance types of Redis are available in a specific region.
+Use this resource to create a backup config of redis.
 
 ## Example Usage
 

website/docs/r/redis_instance.html.markdown

@@ -47,7 +47,7 @@ The following arguments are supported:
 * `security_groups` - (Optional, ForceNew) ID of security group. If both vpc_id and subnet_id are not set, this argument should not be set either.
 * `subnet_id` - (Optional, ForceNew) Specifies which subnet the instance should belong to.
 * `tags` - (Optional) Instance tags.
-* `type_id` - (Optional, ForceNew) Instance type. Refer to `data.tencentcloud_redis_zone_config.list.type_id` get available values.
+* `type_id` - (Optional, ForceNew) Instance type. Available values reference data source `tencentcloud_redis_zone_config` or [document](https://intl.cloud.tencent.com/document/product/239/32069).
 * `type` - (Optional, ForceNew, **Deprecated**) It has been deprecated from version 1.33.1. Please use 'type_id' instead. Instance type. Available values: `cluster_ckv`,`cluster_redis5.0`,`cluster_redis`,`master_slave_ckv`,`master_slave_redis5.0`,`master_slave_redis`,`standalone_redis`, specific region support specific types, need to refer data `tencentcloud_redis_zone_config`.
 * `vpc_id` - (Optional, ForceNew) ID of the vpc with which the instance is to be associated.