# This is a combination of 2 commits.

# This is the 1st commit message:

修改拼写错误 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 的格式

# This is the commit message #2:

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

Author: ivan

tencentcloud/resource_tc_clb_instance.go

@@ -135,7 +135,7 @@ func resourceTencentCloudClbInstance() *schema.Resource {
 				Type:        schema.TypeList,
 				Optional:    true,
 				Elem:        &schema.Schema{Type: schema.TypeString},
-				Description: "Security groups of the CLB instance. Only supports `OPEN` CLBs.",
+				Description: "Security groups of the CLB instance. Supports both `OPEN` and `INTERNAL` CLBs.",
 			},
 			"target_region_info_region": {
 				Type:        schema.TypeString,
@@ -159,6 +159,27 @@ func resourceTencentCloudClbInstance() *schema.Resource {
 				Computed:    true,
 				Description: "Network operator, only applicable to open CLB. Valid values are `CMCC`(China Mobile), `CTCC`(Telecom), `CUCC`(China Unicom) and `BGP`. If this ISP is specified, network billing method can only use the bandwidth package billing (BANDWIDTH_PACKAGE).",
 			},
+			"load_balancer_pass_to_target": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				Default:     true,
+				Description: "Whether the target allow flow come from clb. If value is true, only check security group of clb, or check both clb and backend instance security group.",
+			},
+			"master_zone_id": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "Setting master zone id of cross available zone disaster recovery, only applicable to open CLB.",
+			},
+			"zone_id": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "Available zone id, only applicable to open CLB.",
+			},
+			"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",
+			},
 		},
 	}
 }
@@ -197,11 +218,7 @@ func resourceTencentCloudClbInstanceCreate(d *schema.ResourceData, meta interfac
 	if (targetRegionInfoRegion != "" && targetRegionInfoVpcId == "") || (targetRegionInfoRegion == "" && targetRegionInfoVpcId != "") {
 		return fmt.Errorf("[CHECK][CLB instance][Create] check: region and vpc_id must be set at same time")
 	}
-	if _, ok := d.GetOk("security_groups"); ok {
-		if networkType == CLB_NETWORK_TYPE_INTERNAL {
-			return fmt.Errorf("[CHECK][CLB instance][Create] check: INTERNAL network_type do not support this operation with sercurity_groups")
-		}
-	}
+
 	request := clb.NewCreateLoadBalancerRequest()
 	request.LoadBalancerType = helper.String(networkType)
 	request.LoadBalancerName = helper.String(clbName)
@@ -252,6 +269,26 @@ func resourceTencentCloudClbInstanceCreate(d *schema.ResourceData, meta interfac
 		}
 	}
 
+	if v, ok := d.GetOk("master_zone_id"); ok {
+		if networkType == CLB_NETWORK_TYPE_INTERNAL {
+			return fmt.Errorf("[CHECK][CLB instance][Create] check: INTERNAL network_type do not support master zone id setting")
+		}
+		request.MasterZoneId = helper.String(v.(string))
+	}
+
+	if v, ok := d.GetOk("zone_id"); ok {
+		if networkType == CLB_NETWORK_TYPE_INTERNAL {
+			return fmt.Errorf("[CHECK][CLB instance][Create] check: INTERNAL network_type do not support zone id setting")
+		}
+		request.ZoneId = helper.String(v.(string))
+	}
+
+	if v, ok := d.GetOk("slave_zone_id"); ok {
+		if networkType == CLB_NETWORK_TYPE_INTERNAL {
+			return fmt.Errorf("[CHECK][CLB instance][Create] check: INTERNAL network_type do not support slave zone id setting")
+		}
+		request.SlaveZoneId = helper.String(v.(string))
+	}
 	clbId := ""
 	var response *clb.CreateLoadBalancerResponse
 	err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
@@ -312,13 +349,15 @@ func resourceTencentCloudClbInstanceCreate(d *schema.ResourceData, meta interfac
 	}
 
 	if targetRegionInfoRegion != "" {
+		isLoadBalancePassToTgt := d.Get("load_balancer_pass_to_target").(bool)
 		targetRegionInfo := clb.TargetRegionInfo{
 			Region: &targetRegionInfoRegion,
 			VpcId:  &targetRegionInfoVpcId,
 		}
 		mRequest := clb.NewModifyLoadBalancerAttributesRequest()
 		mRequest.LoadBalancerId = helper.String(clbId)
 		mRequest.TargetRegionInfo = &targetRegionInfo
+		mRequest.LoadBalancerPassToTarget = &isLoadBalancePassToTgt
 		err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
 			mResponse, e := meta.(*TencentCloudClient).apiV3Conn.UseClbClient().ModifyLoadBalancerAttributes(mRequest)
 			if e != nil {
@@ -402,6 +441,11 @@ func resourceTencentCloudClbInstanceRead(d *schema.ResourceData, meta interface{
 		_ = d.Set("internet_charge_type", instance.NetworkAttributes.InternetChargeType)
 	}
 
+	_ = d.Set("load_balancer_pass_to_target", instance.LoadBalancerPassToTarget)
+	_ = d.Set("master_zone_id", instance.MasterZone)
+	_ = d.Set("zone_id", instance.MasterZone)
+	_ = d.Set("slave_zone_id", instance.MasterZone)
+
 	tcClient := meta.(*TencentCloudClient).apiV3Conn
 	tagService := &TagService{client: tcClient}
 	tags, err := tagService.DescribeResourceTags(ctx, "clb", "clb", tcClient.Region, d.Id())
@@ -428,6 +472,7 @@ func resourceTencentCloudClbInstanceUpdate(d *schema.ResourceData, meta interfac
 	targetRegionInfo := clb.TargetRegionInfo{}
 	internet := clb.InternetAccessible{}
 	changed := false
+	isLoadBalancerPassToTgt := false
 
 	if d.HasChange("clb_name") {
 		changed = true
@@ -469,6 +514,11 @@ func resourceTencentCloudClbInstanceUpdate(d *schema.ResourceData, meta interfac
 		}
 	}
 
+	if d.HasChange("load_balancer_pass_to_target") {
+		changed = true
+		isLoadBalancerPassToTgt = d.Get("load_balancer_pass_to_target").(bool)
+	}
+
 	if changed {
 		request := clb.NewModifyLoadBalancerAttributesRequest()
 		request.LoadBalancerId = helper.String(clbId)
@@ -481,6 +531,9 @@ func resourceTencentCloudClbInstanceUpdate(d *schema.ResourceData, meta interfac
 		if d.HasChange("internet_charge_type") || d.HasChange("internet_bandwidth_max_out") {
 			request.InternetChargeInfo = &internet
 		}
+		if d.HasChange("load_balancer_pass_to_target") {
+			request.LoadBalancerPassToTarget = &isLoadBalancerPassToTgt
+		}
 		err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
 			response, e := meta.(*TencentCloudClient).apiV3Conn.UseClbClient().ModifyLoadBalancerAttributes(request)
 			if e != nil {
@@ -515,9 +568,7 @@ func resourceTencentCloudClbInstanceUpdate(d *schema.ResourceData, meta interfac
 	}
 
 	if d.HasChange("security_groups") {
-		if d.Get("network_type") == CLB_NETWORK_TYPE_INTERNAL {
-			return fmt.Errorf("[CHECK][CLB instance %s][Update] check: INTERNAL network_type do not support this operation with sercurity_groups", clbId)
-		}
+
 		sgRequest := clb.NewSetLoadBalancerSecurityGroupsRequest()
 		sgRequest.LoadBalancerId = helper.String(clbId)
 		securityGroups := d.Get("security_groups").([]interface{})

tencentcloud/resource_tc_clb_target_group.go

@@ -22,7 +22,6 @@ package tencentcloud
 
 import (
 	"context"
-
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	clb "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb/v20180317"
 )
@@ -50,6 +49,44 @@ func resourceTencentCloudClbTargetGroup() *schema.Resource {
 				ForceNew:    true,
 				Description: "VPC ID, default is based on the network.",
 			},
+			"port": {
+				Type:         schema.TypeInt,
+				Optional:     true,
+				ValidateFunc: validatePort,
+				Description:  "The default port of target group, add server after can use it.",
+			},
+			"target_group_instances": {
+				Type:        schema.TypeList,
+				Optional:    true,
+				Description: "The backend server of target group bind.",
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"bind_ip": {
+							Type:         schema.TypeString,
+							Required:     true,
+							ValidateFunc: validateIp,
+							Description:  "The internal ip of target group instance.",
+						},
+						"port": {
+							Type:         schema.TypeInt,
+							Required:     true,
+							ValidateFunc: validatePort,
+							Description:  "The port of target group instance.",
+						},
+						"weight": {
+							Type:        schema.TypeInt,
+							Optional:    true,
+							Description: "The weight of target group instance.",
+						},
+						"new_port": {
+							Type:         schema.TypeInt,
+							Optional:     true,
+							ValidateFunc: validatePort,
+							Description:  "The new port of target group instance.",
+						},
+					},
+				},
+			},
 		},
 	}
 }
@@ -63,12 +100,31 @@ func resourceTencentCloudClbTargetCreate(d *schema.ResourceData, meta interface{
 		clbService      = ClbService{client: meta.(*TencentCloudClient).apiV3Conn}
 		vpcId           = d.Get("vpc_id").(string)
 		targetGroupName = d.Get("target_group_name").(string)
+		port            = uint64(d.Get("port").(int))
 		insAttachments  = make([]*clb.TargetGroupInstance, 0)
 		targetGroupId   string
 		err             error
 	)
 
-	targetGroupId, err = clbService.CreateTargetGroup(ctx, targetGroupName, vpcId, insAttachments)
+	if v, ok := d.GetOk("target_group_instance"); ok {
+		targetGroupInstances := v.([]interface{})
+		for _, v1 := range targetGroupInstances {
+			value := v1.(map[string]interface{})
+			bindIP := value["bind_ip"].(string)
+			port := uint64(value["port"].(int))
+			weight := uint64(value["weight"].(int))
+			newPort := uint64(value["new_port"].(int))
+			tgtGrp := &clb.TargetGroupInstance{
+				BindIP:  &bindIP,
+				Port:    &port,
+				Weight:  &weight,
+				NewPort: &newPort,
+			}
+			insAttachments = append(insAttachments, tgtGrp)
+		}
+	}
+
+	targetGroupId, err = clbService.CreateTargetGroup(ctx, targetGroupName, vpcId, port, insAttachments)
 	if err != nil {
 		return err
 	}
@@ -99,6 +155,7 @@ func resourceTencentCloudClbTargetRead(d *schema.ResourceData, meta interface{})
 	}
 	_ = d.Set("target_group_name", targetGroupInfos[0].TargetGroupName)
 	_ = d.Set("vpc_id", targetGroupInfos[0].VpcId)
+	_ = d.Set("port", targetGroupInfos[0].Port)
 
 	return nil
 }

tencentcloud/resource_tc_instance.go

@@ -42,7 +42,7 @@ resource "tencentcloud_subnet" "app" {
 // Create 2 CVM instances to host awesome_app
 resource "tencentcloud_instance" "my_awesome_app" {
   instance_name              = "awesome_app"
-  availability_zone          = data.tencentcloud_availability_zones.my_favorate_zones.zones.0.name
+  availability_zone          = data.tencentcloud_availability_zones.my_favorite_zones.zones.0.name
   image_id                   = data.tencentcloud_images.my_favorite_image.images.0.image_id
   instance_type              = data.tencentcloud_instance_types.my_favorite_instance_types.instance_types.0.instance_type
   system_disk_type           = "CLOUD_PREMIUM"

tencentcloud/resource_tc_kubernetes_cluster.go

@@ -549,6 +549,7 @@ func TkeCvmCreateInfo() map[string]*schema.Schema {
 			Elem:        &schema.Schema{Type: schema.TypeString},
 			Description: "Disaster recover groups to which a CVM instance belongs. Only support maximum 1.",
 		},
+<<<<<<< HEAD
 		// InstanceAdvancedSettingsOverrides
 		"desired_pod_num": {
 			Type:        schema.TypeInt,
@@ -594,6 +595,13 @@ func TkeExistCvmCreateInfo() map[string]*schema.Schema {
 			ForceNew:    true,
 			Elem:        &schema.Schema{Type: schema.TypeInt},
 			Description: "Custom mode cluster, you can specify the number of pods for each node. corresponding to the existed_instances_para.instance_ids parameter.",
+=======
+		"os": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			ValidateFunc: validateImageID,
+			Description:  "The valid image id, format of img-xxx.",
+>>>>>>> 37314e6e... 添加调用 CreateClusterInstances时，传入imageId参数来指定镜像，以及对镜像的验证，满足 img-xxx 的格式
 		},
 	}
 }
@@ -1337,6 +1345,10 @@ func tkeGetCvmRunInstancesPara(dMap map[string]interface{}, meta interface{},
 		}
 	}
 
+	if v, ok := dMap["os"]; ok {
+		request.ImageId = helper.String(v.(string))
+	}
+
 	cvmJson = request.ToJsonString()
 
 	cvmJson = strings.Replace(cvmJson, `"Password":"",`, "", -1)

tencentcloud/service_tencentcloud_clb.go

@@ -1025,13 +1025,14 @@ func clbNewTarget(instanceId, port, weight interface{}) *clb.Target {
 	return &bk
 }
 
-func (me *ClbService) CreateTargetGroup(ctx context.Context, targetGroupName string, vpcId string,
+func (me *ClbService) CreateTargetGroup(ctx context.Context, targetGroupName string, vpcId string, port uint64,
 	targetGroupInstances []*clb.TargetGroupInstance) (targetGroupId string, err error) {
 	var response *clb.CreateTargetGroupResponse
 
 	request := clb.NewCreateTargetGroupRequest()
 	request.TargetGroupName = &targetGroupName
 	request.TargetGroupInstances = targetGroupInstances
+	request.Port = &port
 	if vpcId != "" {
 		request.VpcId = &vpcId
 	}

tencentcloud/validators.go

@@ -65,6 +65,14 @@ func validateIp(v interface{}, k string) (ws []string, errors []error) {
 	return
 }
 
+func validateImageID(v interface{}, k string) (ws []string, errors []error) {
+	value := v.(string)
+	if !strings.HasPrefix(value, "img-") {
+		errors = append(errors, fmt.Errorf("the format of %q is invalid: %s, it should begin with `img-`", k, value))
+	}
+	return
+}
+
 // NOTE not exactly strict, but ok for now
 func validateIntegerInRange(min, max int64) schema.SchemaValidateFunc {
 	return func(v interface{}, k string) (ws []string, errors []error) {