修改拼写错误 favorate -> favorite, 解决 https://registry.terraform.io/providers/tencentcloudstack/tencentcloud/latest/docs/resources/instance 中的错误

添加支持 clb 创建目标工作组的逻辑，添加相应函数的参数

修复新添加的命令行参数错误,Elem字段使用 schema.Resource指针

添加安全组对内网clb的支持(注释掉对当前网络是否为内网的判断)

添加支持开启和关闭CLB安全组默认放通的配置

添加terraform支持external CLB创建AZ实例

添加clb创建目标工作组中，调用create后的update操作中的 port 字段

添加create中调用update操作时，设置load_balancer_pass_to_target

修改在 resourceTencentCloudClbInstanceUpdate 中对 LoadBalancerPassToTarget 取值的处理，修复 tf 文件该值有变化时，没有触发更改的问题

修改支持internal CLB的security group 中description注释部分

添加调用 CreateClusterInstances时，传入imageId参数来指定镜像，以及对镜像的验证，满足 img-xxx 的格式

回退版本(添加镜像)，该文件不再维护

修改命令行参数的key, os -> img_id

修改tke资源is_non_static_ip_mode描述不当的错误, static -> non-static

添加Update操作对Port的支持

需求 支持external CLB创建多AZ实例 Description添加master_zone及查询结果相应的字段

添加测试用命，及 hcl 测试说明文档注释

添加测试用命，及 hcl 测试说明文档注释

添加创建多实例，开启和关闭CLB安全组默认放通测试用例

完善测试文件

添加AS的参数 MultiZoneSubnetPolicy ，支持多可用区(子网)打散

gendoc

change changelog.md

Author: ivan

CHANGELOG.md

@@ -1,4 +1,20 @@
 ## 1.56.9 (Unreleased)
+## 1.56.10 (Jun 09, 2021)
+
+BUG FIXES:
+
+* Resource `tencentcloud_instance` fix words spell, in tencendcloud/resource_tc_instance.go L45, data.tencentcloud_availability_zones.my_favorate_zones.zones.0.name change to data.tencentcloud_availability_zones.my_favorite_zones.zones.0.name".
+* Resource `tencentcloud_kubernetes_clusters` fix the description of is_non_static_ip_mode
+
+ENHANCEMENTS:
+
+* Resource `tencentcloud_clb_target_group` add create target group.
+* Resource `tencentcloud_clb_instance` add internal CLB supports security group. 
+* Resource `tencentcloud_clb_instance` add supports open and close CLB security group, default is open.
+* Resource `tencentcloud_clb_instance` add external CLB create multi AZ instance.
+* Resource `tencentcloud_container_cluster_instance` add supports params of img_id to assign image.
+* Resource `tencentcloud_as_scaling_group` add MultiZoneSubnetPolicy.
+
 ## 1.56.8 (May 26, 2021)
 
 ENHANCEMENTS:

tencentcloud/data_source_tc_as_scaling_groups.go

@@ -196,6 +196,11 @@ func dataSourceTencentCloudAsScalingGroups() *schema.Resource {
 							Computed:    true,
 							Description: "Tags of the scaling group.",
 						},
+						"multi_zone_subnet_policy": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "Multi zone or subnet strategy, Valid values: PRIORITY and EQUALITY.",
+						},
 					},
 				},
 			},
@@ -241,23 +246,24 @@ func dataSourceTencentCloudAsScalingGroupRead(d *schema.ResourceData, meta inter
 		}
 
 		mapping := map[string]interface{}{
-			"scaling_group_id":     scalingGroup.AutoScalingGroupId,
-			"scaling_group_name":   scalingGroup.AutoScalingGroupName,
-			"configuration_id":     scalingGroup.LaunchConfigurationId,
-			"status":               scalingGroup.AutoScalingGroupStatus,
-			"instance_count":       scalingGroup.InstanceCount,
-			"max_size":             scalingGroup.MaxSize,
-			"min_size":             scalingGroup.MinSize,
-			"vpc_id":               scalingGroup.VpcId,
-			"subnet_ids":           helper.StringsInterfaces(scalingGroup.SubnetIdSet),
-			"zones":                helper.StringsInterfaces(scalingGroup.ZoneSet),
-			"default_cooldown":     scalingGroup.DefaultCooldown,
-			"desired_capacity":     scalingGroup.DesiredCapacity,
-			"load_balancer_ids":    helper.StringsInterfaces(scalingGroup.LoadBalancerIdSet),
-			"termination_policies": helper.StringsInterfaces(scalingGroup.TerminationPolicySet),
-			"retry_policy":         scalingGroup.RetryPolicy,
-			"create_time":          scalingGroup.CreatedTime,
-			"tags":                 tags,
+			"scaling_group_id":         scalingGroup.AutoScalingGroupId,
+			"scaling_group_name":       scalingGroup.AutoScalingGroupName,
+			"configuration_id":         scalingGroup.LaunchConfigurationId,
+			"status":                   scalingGroup.AutoScalingGroupStatus,
+			"instance_count":           scalingGroup.InstanceCount,
+			"max_size":                 scalingGroup.MaxSize,
+			"min_size":                 scalingGroup.MinSize,
+			"vpc_id":                   scalingGroup.VpcId,
+			"subnet_ids":               helper.StringsInterfaces(scalingGroup.SubnetIdSet),
+			"zones":                    helper.StringsInterfaces(scalingGroup.ZoneSet),
+			"default_cooldown":         scalingGroup.DefaultCooldown,
+			"desired_capacity":         scalingGroup.DesiredCapacity,
+			"load_balancer_ids":        helper.StringsInterfaces(scalingGroup.LoadBalancerIdSet),
+			"termination_policies":     helper.StringsInterfaces(scalingGroup.TerminationPolicySet),
+			"retry_policy":             scalingGroup.RetryPolicy,
+			"create_time":              scalingGroup.CreatedTime,
+			"tags":                     tags,
+			"multi_zone_subnet_policy": scalingGroup.MultiZoneSubnetPolicy,
 		}
 		if scalingGroup.ForwardLoadBalancerSet != nil && len(scalingGroup.ForwardLoadBalancerSet) > 0 {
 			forwardLoadBalancers := make([]map[string]interface{}, 0, len(scalingGroup.ForwardLoadBalancerSet))

tencentcloud/data_source_tc_clb_instances.go

@@ -56,6 +56,11 @@ func dataSourceTencentCloudClbInstances() *schema.Resource {
 				Optional:    true,
 				Description: "Used to save results.",
 			},
+			"master_zone": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "Master available zone id.",
+			},
 			"clb_list": {
 				Type:        schema.TypeList,
 				Computed:    true,
@@ -154,6 +159,31 @@ func dataSourceTencentCloudClbInstances() *schema.Resource {
 							Computed:    true,
 							Description: "Max bandwidth out, only applicable to open CLB. Valid value ranges is [1, 2048]. Unit is MB.",
 						},
+						"zone_id": {
+							Type:        schema.TypeInt,
+							Computed:    true,
+							Description: "Available zone unique id(numerical representation), This field maybe null, means cannot get a valid value.",
+						},
+						"zone": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "Available zone unique id(string representation), This field maybe null, means cannot get a valid value.",
+						},
+						"zone_name": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "Available zone name, This field maybe null, means cannot get a valid value.",
+						},
+						"zone_region": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "Region that this available zone belong to, This field maybe null, means cannot get a valid value.",
+						},
+						"local_zone": {
+							Type:        schema.TypeBool,
+							Computed:    true,
+							Description: "Whether this available zone is local zone, This field maybe null, means cannot get a valid value.",
+						},
 					},
 				},
 			},
@@ -180,6 +210,9 @@ func dataSourceTencentCloudClbInstancesRead(d *schema.ResourceData, meta interfa
 	if v, ok := d.GetOk("network_type"); ok {
 		params["network_type"] = v.(string)
 	}
+	if v, ok := d.GetOk("master_zone"); ok {
+		params["master_zone"] = v.(string)
+	}
 
 	clbService := ClbService{
 		client: meta.(*TencentCloudClient).apiV3Conn,
@@ -221,6 +254,14 @@ func dataSourceTencentCloudClbInstancesRead(d *schema.ResourceData, meta interfa
 			mapping["internet_charge_type"] = *clbInstance.NetworkAttributes.InternetChargeType
 			mapping["internet_bandwidth_max_out"] = *clbInstance.NetworkAttributes.InternetMaxBandwidthOut
 		}
+		if clbInstance.MasterZone != nil {
+			mapping["zone_id"] = *clbInstance.MasterZone.ZoneId
+			mapping["zone"] = *clbInstance.MasterZone.Zone
+			mapping["zone_name"] = *clbInstance.MasterZone.ZoneName
+			mapping["zone_region"] = *clbInstance.MasterZone.ZoneRegion
+			mapping["local_zone"] = *clbInstance.MasterZone.LocalZone
+		}
+
 		if clbInstance.Tags != nil {
 			tags := make(map[string]interface{}, len(clbInstance.Tags))
 			for _, t := range clbInstance.Tags {

tencentcloud/data_source_tc_kubernetes_clusters.go

@@ -137,7 +137,7 @@ func tkeClusterInfo() map[string]*schema.Schema {
 		"is_non_static_ip_mode": {
 			Type:        schema.TypeBool,
 			Computed:    true,
-			Description: "Indicates whether static ip mode is enabled.",
+			Description: "Indicates whether non-static ip mode is enabled.",
 		},
 		"kube_proxy_mode": {
 			Type:        schema.TypeString,

tencentcloud/extension_as.go

@@ -147,3 +147,8 @@ const (
 	SCALING_GROUP_IN_ACTIVITY_STATUS     = "IN_ACTIVITY"
 	SCALING_GROUP_NOT_IN_ACTIVITY_STATUS = "NOT_IN_ACTIVITY"
 )
+
+const (
+	MultiZoneSubnetPolicyPriority = "PRIORITY"
+	MultiZoneSubnetPolicyEquality = "EQUALITY"
+)

tencentcloud/resource_tc_as_scaling_group.go

@@ -216,6 +216,13 @@ func resourceTencentCloudAsScalingGroup() *schema.Resource {
 				Computed:    true,
 				Description: "The time when the AS group was created.",
 			},
+			"multi_zone_subnet_policy": {
+				Type:     schema.TypeString,
+				Optional: true,
+				ValidateFunc: validateAllowedStringValue([]string{MultiZoneSubnetPolicyPriority,
+					MultiZoneSubnetPolicyEquality}),
+				Description: "Multi zone or subnet strategy, Valid values: PRIORITY and EQUALITY.",
+			},
 		},
 	}
 }
@@ -303,6 +310,10 @@ func resourceTencentCloudAsScalingGroupCreate(d *schema.ResourceData, meta inter
 		}
 	}
 
+	if v, ok := d.GetOk("multi_zone_subnet_policy"); ok {
+		request.MultiZoneSubnetPolicy = helper.String(v.(string))
+	}
+
 	var id string
 	if err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
 		ratelimit.Check(request.GetAction())
@@ -408,6 +419,7 @@ func resourceTencentCloudAsScalingGroupRead(d *schema.ResourceData, meta interfa
 	_ = d.Set("termination_policies", helper.StringsInterfaces(scalingGroup.TerminationPolicySet))
 	_ = d.Set("retry_policy", scalingGroup.RetryPolicy)
 	_ = d.Set("create_time", scalingGroup.CreatedTime)
+	_ = d.Set("multi_zone_subnet_policy", scalingGroup.MultiZoneSubnetPolicy)
 
 	if scalingGroup.ForwardLoadBalancerSet != nil && len(scalingGroup.ForwardLoadBalancerSet) > 0 {
 		forwardLoadBalancers := make([]map[string]interface{}, 0, len(scalingGroup.ForwardLoadBalancerSet))
@@ -521,6 +533,11 @@ func resourceTencentCloudAsScalingGroupUpdate(d *schema.ResourceData, meta inter
 		}
 	}
 
+	if d.HasChange("multi_zone_subnet_policy") {
+		updateAttrs = append(updateAttrs, "multi_zone_subnet_policy")
+		request.MultiZoneSubnetPolicy = helper.String(d.Get("multi_zone_subnet_policy").(string))
+	}
+
 	if err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
 		ratelimit.Check(request.GetAction())
 

tencentcloud/resource_tc_clb_instance.go

@@ -37,6 +37,60 @@ resource "tencentcloud_clb_instance" "open_clb" {
 }
 ```
 
+Default enable
+
+```hcl
+resource "tencentcloud_subnet" "subnet" {
+  availability_zone = "ap-guangzhou-1"
+  name              = "sdk-feature-test"
+  vpc_id            = tencentcloud_vpc.foo.id
+  cidr_block        = "10.0.20.0/28"
+  is_multicast      = false
+}
+
+resource "tencentcloud_security_group" "sglab" {
+  name        = "sg_o0ek7r93"
+  description = "favourite sg"
+  project_id  = 0
+}
+
+resource "tencentcloud_vpc" "foo" {
+  name         = "for-my-open-clb"
+  cidr_block   = "10.0.0.0/16"
+
+  tags = {
+    "test" = "mytest"
+  }
+}
+
+resource "tencentcloud_clb_instance" "open_clb" {
+  network_type                 = "OPEN"
+  clb_name                     = "my-open-clb"
+  project_id                   = 0
+  vpc_id                       = tencentcloud_vpc.foo.id
+  load_balancer_pass_to_target = true
+
+  security_groups              = [tencentcloud_security_group.sglab.id]
+  target_region_info_region    = "ap-guangzhou"
+  target_region_info_vpc_id    = tencentcloud_vpc.foo.id
+
+  tags = {
+    test = "open"
+  }
+}
+```
+
+CREATE multiple instance
+
+```hcl
+resource "tencentcloud_clb_instance" "open_clb1" {
+  network_type              = "OPEN"
+  clb_name = "hello"
+  master_zone_id = "ap-guangzhou-3"
+}
+~
+```
+
 Import
 
 CLB instance can be imported using the id, e.g.
@@ -178,7 +232,7 @@ func resourceTencentCloudClbInstance() *schema.Resource {
 			"slave_zone_id": {
 				Type:        schema.TypeString,
 				Optional:    true,
-				Description: "Setting slave zone id of cross available zone disaster recovery, only applicable to open CLB. this zone will undertake traffic when the master is down",
+				Description: "Setting slave zone id of cross available zone disaster recovery, only applicable to open CLB. this zone will undertake traffic when the master is down.",
 			},
 		},
 	}