fix the bug of replacement, and add enhancements features (#642)

ivandksun · ivan · web-flow · commit 47855e68a80e · 2021-07-06T19:57:56.000+08:00
* create cvm, node pool and cluster add bandwidth_package_id; create cvm add instance_count, allow to modify internet_max_bandwidth_out; create es add web_node_info_type, clb listener fix the bug of plan replacement

* add timestamp with version

Co-authored-by: ivan &lt;ivan@tencent.com&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,18 @@
-## 1.56.14 (Unreleased)
+## 1.56.15 (Unreleased)
+
+## 1.56.14 (July 06,2021)
+
+BUG FIXES
+
+* Resource `tencentcloud_tc_clb_listener` exec the plan will lead the resource rebuild.
+
+ENHANCEMENTS:
+
+* Resource `tencentcloud_elasticsearch_instance` create **ES** cluster add new parametes of *web_node_type_info*.
+* Resource `tencentcloud_tc_instance` add *instance_count* to support create multiple consecutive name of instance
+* Resource `tencentcloud_tc_kubernetes_cluster` supports change *internet_max_bandwidth_out*
+* Resource `tencentcloud_tc_instance` create cvm instance add *bandwidth_package_id*
+
 
 ## 1.56.13 (July 02, 2021)
 
diff --git a/tencentcloud/resource_tc_clb_listener.go b/tencentcloud/resource_tc_clb_listener.go
@@ -351,7 +351,6 @@ func resourceTencentCloudClbListener() *schema.Resource {
 			"target_type": {
 				Type:         schema.TypeString,
 				Optional:     true,
-				ForceNew:     true,
 				ValidateFunc: validateAllowedStringValue([]string{CLB_TARGET_TYPE_NODE, CLB_TARGET_TYPE_TARGETGROUP}),
 				Description:  "Backend target type. Valid values: `NODE`, `TARGETGROUP`. `NODE` means to bind ordinary nodes, `TARGETGROUP` means to bind target group. NOTES: TCP/UDP/TCP_SSL listener must configuration, HTTP/HTTPS listener needs to be configured in tencentcloud_clb_listener_rule.",
 			},
diff --git a/tencentcloud/resource_tc_elasticsearch_instance.go b/tencentcloud/resource_tc_elasticsearch_instance.go
@@ -13,6 +13,11 @@ resource "tencentcloud_elasticsearch_instance" "foo" {
   password          = "Test12345"
   license_type      = "oss"
 
+  web_node_type_info {
+    node_num = 1
+    node_type = "ES.S1.MEDIUM4"
+  }
+
   node_info_list {
     node_num  = 2
     node_type = "ES.S1.SMALL2"
@@ -145,6 +150,25 @@ func resourceTencentCloudElasticsearchInstance() *schema.Resource {
 					},
 				},
 			},
+			"web_node_type_info": {
+				Type:        schema.TypeList,
+				Optional:    true,
+				Description: "Visual node configuration.",
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"node_num": {
+							Type:        schema.TypeInt,
+							Required:    true,
+							Description: "Visual node number.",
+						},
+						"node_type": {
+							Type:        schema.TypeString,
+							Required:    true,
+							Description: "Visual node specifications.",
+						},
+					},
+				},
+			},
 			"license_type": {
 				Type:         schema.TypeString,
 				Optional:     true,
@@ -298,6 +322,19 @@ func resourceTencentCloudElasticsearchInstanceCreate(d *schema.ResourceData, met
 	if v, ok := d.GetOk("basic_security_type"); ok {
 		request.BasicSecurityType = helper.IntUint64(v.(int))
 	}
+	if v, ok := d.GetOk("web_node_type_info"); ok {
+		infos := v.([]interface{})
+		for _, item := range infos {
+			value := item.(map[string]interface{})
+			info := &es.WebNodeTypeInfo{
+				NodeNum:  helper.IntUint64(value["node_num"].(int)),
+				NodeType: helper.String(value["node_type"].(string)),
+			}
+			request.WebNodeTypeInfo = info
+			break
+		}
+	}
+
 	if v, ok := d.GetOk("node_info_list"); ok {
 		infos := v.([]interface{})
 		request.NodeInfoList = make([]*es.NodeInfo, 0, len(infos))
diff --git a/tencentcloud/resource_tc_elasticsearch_instance_test.go b/tencentcloud/resource_tc_elasticsearch_instance_test.go
@@ -27,7 +27,9 @@ func TestAccTencentCloudElasticsearchInstance_basic(t *testing.T) {
 					resource.TestCheckResourceAttr("tencentcloud_elasticsearch_instance.foo", "vpc_id", defaultVpcId),
 					resource.TestCheckResourceAttr("tencentcloud_elasticsearch_instance.foo", "subnet_id", defaultSubnetId),
 					resource.TestCheckResourceAttr("tencentcloud_elasticsearch_instance.foo", "license_type", "oss"),
-					resource.TestCheckResourceAttr("tencentcloud_elasticsearch_instance.foo", "node_info_list.#", "1"),
+					resource.TestCheckResourceAttr("tencentcloud_elasticsearch_instance.foo", "web_node_type_info.#", "1"),
+					resource.TestCheckResourceAttr("tencentcloud_elasticsearch_instance.foo", "web_node_type_info.0.node_num", "1"),
+					resource.TestCheckResourceAttr("tencentcloud_elasticsearch_instance.foo", "web_node_type_info.0.node_type", "ES.S1.MEDIUM4"),
 					resource.TestCheckResourceAttr("tencentcloud_elasticsearch_instance.foo", "node_info_list.0.node_num", "2"),
 					resource.TestCheckResourceAttr("tencentcloud_elasticsearch_instance.foo", "node_info_list.0.node_type", "ES.S1.SMALL2"),
 					resource.TestCheckResourceAttr("tencentcloud_elasticsearch_instance.foo", "node_info_list.0.type", "hotData"),
@@ -43,6 +45,8 @@ func TestAccTencentCloudElasticsearchInstance_basic(t *testing.T) {
 					resource.TestCheckResourceAttr("tencentcloud_elasticsearch_instance.foo", "license_type", "basic"),
 					resource.TestCheckResourceAttr("tencentcloud_elasticsearch_instance.foo", "basic_security_type", "2"),
 					resource.TestCheckResourceAttr("tencentcloud_elasticsearch_instance.foo", "tags.test", "test"),
+					resource.TestCheckResourceAttr("tencentcloud_elasticsearch_instance.foo", "web_node_type_info.0.node_num", "1"),
+					resource.TestCheckResourceAttr("tencentcloud_elasticsearch_instance.foo", "web_node_type_info.0.node_type", "ES.S1.MEDIUM8"),
 					resource.TestCheckResourceAttr("tencentcloud_elasticsearch_instance.foo", "node_info_list.0.node_type", "ES.S1.MEDIUM8"),
 					resource.TestCheckResourceAttr("tencentcloud_elasticsearch_instance.foo", "node_info_list.0.disk_size", "200"),
 				),
@@ -133,6 +137,11 @@ resource "tencentcloud_elasticsearch_instance" "foo" {
 	password            = "Test1234"
 	license_type        = "oss"
   
+    web_node_type_info {
+      node_num = 1
+      node_type = "ES.S1.MEDIUM4"
+    }
+
 	node_info_list {
 	  node_num          = 2
 	  node_type         = "ES.S1.SMALL2"
@@ -154,7 +163,12 @@ resource "tencentcloud_elasticsearch_instance" "foo" {
 	password            = "Test12345"
 	license_type        = "basic"
 	basic_security_type = 2
-  
+
+	web_node_type_info {
+      node_num = 1
+      node_type = "ES.S1.MEDIUM8"
+  	}
+
 	node_info_list {
 	  node_num          = 2
 	  node_type         = "ES.S1.MEDIUM8"
diff --git a/tencentcloud/resource_tc_instance.go b/tencentcloud/resource_tc_instance.go
@@ -176,6 +176,13 @@ func resourceTencentCloudInstance() *schema.Resource {
 				ForceNew:    true,
 				Description: "The available zone for the CVM instance.",
 			},
+			"instance_count": {
+				Type:         schema.TypeInt,
+				Optional:     true,
+				Default:      1,
+				ValidateFunc: validateIntegerInRange(1, 100),
+				Description:  "The number of instances to be purchased. Value range:[1,100]; default value: 1.",
+			},
 			"instance_name": {
 				Type:         schema.TypeString,
 				Optional:     true,
@@ -270,6 +277,11 @@ func resourceTencentCloudInstance() *schema.Resource {
 				ValidateFunc: validateAllowedStringValue(CVM_INTERNET_CHARGE_TYPE),
 				Description:  "Internet charge type of the instance, Valid values are `BANDWIDTH_PREPAID`, `TRAFFIC_POSTPAID_BY_HOUR`, `BANDWIDTH_POSTPAID_BY_HOUR` and `BANDWIDTH_PACKAGE`. This value does not need to be set when `allocate_public_ip` is false.",
 			},
+			"bandwidth_package_id": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "bandwidth package id. if user is standard user, then the bandwidth_package_id is needed, or default has bandwidth_package_id.",
+			},
 			"internet_max_bandwidth_out": {
 				Type:        schema.TypeInt,
 				Optional:    true,
@@ -508,6 +520,9 @@ func resourceTencentCloudInstanceCreate(d *schema.ResourceData, meta interface{}
 	if v, ok := d.GetOk("instance_name"); ok {
 		request.InstanceName = helper.String(v.(string))
 	}
+	if v, ok := d.GetOk("instance_count"); ok {
+		request.InstanceCount = helper.Int64(int64(v.(int)))
+	}
 	if v, ok := d.GetOk("instance_type"); ok {
 		request.InstanceType = helper.String(v.(string))
 	}
@@ -575,6 +590,9 @@ func resourceTencentCloudInstanceCreate(d *schema.ResourceData, meta interface{}
 		maxBandwidthOut := int64(v.(int))
 		request.InternetAccessible.InternetMaxBandwidthOut = &maxBandwidthOut
 	}
+	if v, ok := d.GetOk("bandwidth_package_id"); ok {
+		request.InternetAccessible.BandwidthPackageId = helper.String(v.(string))
+	}
 	if v, ok := d.GetOkExists("allocate_public_ip"); ok {
 		allocatePublicIp := v.(bool)
 		request.InternetAccessible.PublicIpAssigned = &allocatePublicIp
diff --git a/tencentcloud/resource_tc_kubernetes_as_scaling_group.go b/tencentcloud/resource_tc_kubernetes_as_scaling_group.go
@@ -278,7 +278,6 @@ func kubernetesAsScalingConfigPara() map[string]*schema.Schema {
 		"internet_max_bandwidth_out": {
 			Type:        schema.TypeInt,
 			Optional:    true,
-			ForceNew:    true,
 			Default:     0,
 			Description: "Max bandwidth of Internet access in Mbps. Default is `0`.",
 		},
diff --git a/tencentcloud/resource_tc_kubernetes_cluster.go b/tencentcloud/resource_tc_kubernetes_cluster.go
@@ -473,11 +473,15 @@ func TkeCvmCreateInfo() map[string]*schema.Schema {
 		},
 		"internet_max_bandwidth_out": {
 			Type:        schema.TypeInt,
-			ForceNew:    true,
 			Optional:    true,
 			Default:     0,
 			Description: "Max bandwidth of Internet access in Mbps. Default is 0.",
 		},
+		"bandwidth_package_id": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "bandwidth package id. if user is standard user, then the bandwidth_package_id is needed, or default has bandwidth_package_id.",
+		},
 		"public_ip_assigned": {
 			Type:        schema.TypeBool,
 			ForceNew:    true,
@@ -1226,6 +1230,10 @@ func tkeGetCvmRunInstancesPara(dMap map[string]interface{}, meta interface{},
 		request.InternetAccessible.InternetMaxBandwidthOut = helper.Int64(int64(v.(int)))
 	}
 
+	if v, ok := dMap["bandwidth_package_id"]; ok {
+		request.InternetAccessible.BandwidthPackageId = helper.String(v.(string))
+	}
+
 	if v, ok := dMap["public_ip_assigned"]; ok {
 		publicIpAssigned := v.(bool)
 		request.InternetAccessible.PublicIpAssigned = &publicIpAssigned
diff --git a/tencentcloud/resource_tc_kubernetes_node_pool.go b/tencentcloud/resource_tc_kubernetes_node_pool.go
@@ -175,10 +175,14 @@ func composedKubernetesAsScalingConfigPara() map[string]*schema.Schema {
 		"internet_max_bandwidth_out": {
 			Type:        schema.TypeInt,
 			Optional:    true,
-			ForceNew:    true,
 			Default:     0,
 			Description: "Max bandwidth of Internet access in Mbps. Default is `0`.",
 		},
+		"bandwidth_package_id": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "bandwidth package id. if user is standard user, then the bandwidth_package_id is needed, or default has bandwidth_package_id.",
+		},
 		"public_ip_assigned": {
 			Type:        schema.TypeBool,
 			Optional:    true,
@@ -496,6 +500,9 @@ func comosedKubernetesAsScalingConfigParaSerial(dMap map[string]interface{}, met
 	if v, ok := dMap["internet_charge_type"]; ok {
 		request.InternetAccessible.InternetChargeType = helper.String(v.(string))
 	}
+	if v, ok := dMap["bandwidth_package_id"]; ok {
+		request.InternetAccessible.BandwidthPackageId = helper.String(v.(string))
+	}
 	if v, ok := dMap["internet_max_bandwidth_out"]; ok {
 		request.InternetAccessible.InternetMaxBandwidthOut = helper.IntUint64(v.(int))
 	}
diff --git a/website/docs/r/clb_listener.html.markdown b/website/docs/r/clb_listener.html.markdown
@@ -179,7 +179,7 @@ The following arguments are supported:
 * `scheduler` - (Optional) Scheduling method of the CLB listener, and available values are 'WRR' and 'LEAST_CONN'. The default is 'WRR'. NOTES: The listener of `HTTP` and `HTTPS` protocol additionally supports the `IP Hash` method. NOTES: TCP/UDP/TCP_SSL listener allows direct configuration, HTTP/HTTPS listener needs to be configured in `tencentcloud_clb_listener_rule`.
 * `session_expire_time` - (Optional) Time of session persistence within the CLB listener. NOTES: Available when scheduler is specified as `WRR`, and not available when listener protocol is `TCP_SSL`. NOTES: TCP/UDP/TCP_SSL listener allows direct configuration, HTTP/HTTPS listener needs to be configured in `tencentcloud_clb_listener_rule`.
 * `sni_switch` - (Optional, ForceNew) Indicates whether SNI is enabled, and only supported with protocol `HTTPS`. If enabled, you can set a certificate for each rule in `tencentcloud_clb_listener_rule`, otherwise all rules have a certificate.
-* `target_type` - (Optional, ForceNew) Backend target type. Valid values: `NODE`, `TARGETGROUP`. `NODE` means to bind ordinary nodes, `TARGETGROUP` means to bind target group. NOTES: TCP/UDP/TCP_SSL listener must configuration, HTTP/HTTPS listener needs to be configured in tencentcloud_clb_listener_rule.
+* `target_type` - (Optional) Backend target type. Valid values: `NODE`, `TARGETGROUP`. `NODE` means to bind ordinary nodes, `TARGETGROUP` means to bind target group. NOTES: TCP/UDP/TCP_SSL listener must configuration, HTTP/HTTPS listener needs to be configured in tencentcloud_clb_listener_rule.
 
 ## Attributes Reference
 
diff --git a/website/docs/r/elasticsearch_instance.html.markdown b/website/docs/r/elasticsearch_instance.html.markdown
@@ -23,6 +23,11 @@ resource "tencentcloud_elasticsearch_instance" "foo" {
   password          = "Test12345"
   license_type      = "oss"
 
+  web_node_type_info {
+    node_num  = 1
+    node_type = "ES.S1.MEDIUM4"
+  }
+
   node_info_list {
     node_num  = 2
     node_type = "ES.S1.SMALL2"
@@ -54,6 +59,7 @@ The following arguments are supported:
 * `multi_zone_infos` - (Optional, ForceNew) Details of AZs in multi-AZ deployment mode (which is required when deploy_mode is `1`).
 * `renew_flag` - (Optional, ForceNew) When enabled, the instance will be renew automatically when it reach the end of the prepaid tenancy. Valid values are `RENEW_FLAG_AUTO` and `RENEW_FLAG_MANUAL`. NOTE: it only works when charge_type is set to `PREPAID`.
 * `tags` - (Optional) A mapping of tags to assign to the instance. For tag limits, please refer to [Use Limits](https://intl.cloud.tencent.com/document/product/651/13354).
+* `web_node_type_info` - (Optional) Visual node configuration.
 
 The `multi_zone_infos` object supports the following:
 
@@ -69,6 +75,11 @@ The `node_info_list` object supports the following:
 * `encrypt` - (Optional) Decides to encrypt this disk or not.
 * `type` - (Optional) Node type. Valid values are `hotData`, `warmData` and `dedicatedMaster`. The default value is 'hotData`.
 
+The `web_node_type_info` object supports the following:
+
+* `node_num` - (Required) Visual node number.
+* `node_type` - (Required) Visual node specifications.
+
 ## Attributes Reference
 
 In addition to all arguments above, the following attributes are exported:
diff --git a/website/docs/r/instance.html.markdown b/website/docs/r/instance.html.markdown
@@ -144,6 +144,7 @@ The following arguments are supported:
 * `availability_zone` - (Required, ForceNew) The available zone for the CVM instance.
 * `image_id` - (Required, ForceNew) The image to use for the instance. Changing `image_id` will cause the instance to be destroyed and re-created.
 * `allocate_public_ip` - (Optional, ForceNew) Associate a public IP address with an instance in a VPC or Classic. Boolean value, Default is false.
+* `bandwidth_package_id` - (Optional) bandwidth package id. if user is standard user, then the bandwidth_package_id is needed, or default has bandwidth_package_id.
 * `cam_role_name` - (Optional, ForceNew) CAM role name authorized to access.
 * `cdh_host_id` - (Optional, ForceNew) Id of cdh instance. Note: it only works when instance_charge_type is set to `CDHPAID`.
 * `cdh_instance_type` - (Optional) Type of instance created on cdh, the value of this parameter is in the format of CDH_XCXG based on the number of CPU cores and memory capacity. Note: it only works when instance_charge_type is set to `CDHPAID`.
@@ -155,6 +156,7 @@ The following arguments are supported:
 * `instance_charge_type_prepaid_period` - (Optional) The tenancy (time unit is month) of the prepaid instance, NOTE: it only works when instance_charge_type is set to `PREPAID`. Valid values are `1`, `2`, `3`, `4`, `5`, `6`, `7`, `8`, `9`, `10`, `11`, `12`, `24`, `36`.
 * `instance_charge_type_prepaid_renew_flag` - (Optional) Auto renewal flag. Valid values: `NOTIFY_AND_AUTO_RENEW`: notify upon expiration and renew automatically, `NOTIFY_AND_MANUAL_RENEW`: notify upon expiration but do not renew automatically, `DISABLE_NOTIFY_AND_MANUAL_RENEW`: neither notify upon expiration nor renew automatically. Default value: `NOTIFY_AND_MANUAL_RENEW`. If this parameter is specified as `NOTIFY_AND_AUTO_RENEW`, the instance will be automatically renewed on a monthly basis if the account balance is sufficient. NOTE: it only works when instance_charge_type is set to `PREPAID`.
 * `instance_charge_type` - (Optional, ForceNew) The charge type of instance. Valid values are `PREPAID`, `POSTPAID_BY_HOUR`, `SPOTPAID` and `CDHPAID`. The default is `POSTPAID_BY_HOUR`. Note: TencentCloud International only supports `POSTPAID_BY_HOUR` and `CDHPAID`. `PREPAID` instance may not allow to delete before expired. `SPOTPAID` instance must set `spot_instance_type` and `spot_max_price` at the same time. `CDHPAID` instance must set `cdh_instance_type` and `cdh_host_id`.
+* `instance_count` - (Optional) The number of instances to be purchased. Value range:[1,100]; default value: 1.
 * `instance_name` - (Optional) The name of the instance. The max length of instance_name is 60, and default value is `Terraform-CVM-Instance`.
 * `instance_type` - (Optional) The type of the instance.
 * `internet_charge_type` - (Optional, ForceNew) Internet charge type of the instance, Valid values are `BANDWIDTH_PREPAID`, `TRAFFIC_POSTPAID_BY_HOUR`, `BANDWIDTH_POSTPAID_BY_HOUR` and `BANDWIDTH_PACKAGE`. This value does not need to be set when `allocate_public_ip` is false.
diff --git a/website/docs/r/kubernetes_as_scaling_group.html.markdown b/website/docs/r/kubernetes_as_scaling_group.html.markdown
@@ -152,7 +152,7 @@ The `auto_scaling_config` object supports the following:
 * `enhanced_security_service` - (Optional, ForceNew) To specify whether to enable cloud security service. Default is TRUE.
 * `instance_tags` - (Optional, ForceNew) A list of tags used to associate different resources.
 * `internet_charge_type` - (Optional, ForceNew) Charge types for network traffic. Valid value: `BANDWIDTH_PREPAID`, `TRAFFIC_POSTPAID_BY_HOUR`, `TRAFFIC_POSTPAID_BY_HOUR` and `BANDWIDTH_PACKAGE`.
-* `internet_max_bandwidth_out` - (Optional, ForceNew) Max bandwidth of Internet access in Mbps. Default is `0`.
+* `internet_max_bandwidth_out` - (Optional) Max bandwidth of Internet access in Mbps. Default is `0`.
 * `key_ids` - (Optional, ForceNew) ID list of keys.
 * `password` - (Optional, ForceNew) Password to access.
 * `project_id` - (Optional, ForceNew) Specifys to which project the configuration belongs.
diff --git a/website/docs/r/kubernetes_cluster.html.markdown b/website/docs/r/kubernetes_cluster.html.markdown
diff --git a/website/docs/r/kubernetes_node_pool.html.markdown b/website/docs/r/kubernetes_node_pool.html.markdown
diff --git a/website/docs/r/kubernetes_scale_worker.html.markdown b/website/docs/r/kubernetes_scale_worker.html.markdown
