add

Author: SevenEarth

go.mod

@@ -43,10 +43,10 @@ require (
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/chdfs v1.0.600
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ciam v1.0.695
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ckafka v1.0.1073
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.1132
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.1188
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.1033
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.1148
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1182
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1188
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.1153
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.1161

go.sum

@@ -877,6 +877,10 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.1107 h1:sUiyGf
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.1107/go.mod h1:L1r6mc7XjFlyLlOVqRvPEhjXneHywnyjyv9EoiGBRvM=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.1132 h1:dXKq4d4zTZYV0q1uyf7AJM+u00dd5ndL7lqGfjkmQW0=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.1132/go.mod h1:nwCB78ZVNC6VC+rd31yxhUeff/Ve7z4+yrL3A2B+/dg=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.1184 h1:FXG6AtnA+jSUZ4GquFlRhso6SNSTyksQozT97IfH0Ds=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.1184/go.mod h1:CtYhxx30ljC4PyxMfG8dWe6a0hse5kkQIcHSXLrgb0g=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.1188 h1:zzaIE12soTfyAgRvBYhb5bYxFXRCelvYXDEfvtkT5Y4=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.1188/go.mod h1:qIWFhWbmMuUaWCCKVSkdJ1BzKEOqkMeo+uKYS6jJimQ=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.1033 h1:dIr+MVsZeUBiKZELfJh5HRJdI+BI6lCp5pv/2oXekuk=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.1033/go.mod h1:7oFlNimGSTHFy6JV7W/IZKuJWr+NUjCnGLTvb9MWNrY=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.1078 h1:6yf63sgR2q1ikVedWTXldtrArDHXG01yIdcWSSI5e5Y=
@@ -991,6 +995,10 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1182 h1:it8
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1182/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1132 h1:ecdDh9up1kMKSZtEpvRHGF6BsIlfBtdCSBZm3SK5/Xk=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1132/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1184 h1:HYVyUfze24rRgaB8hOZeAJ+XNsPO/jhxYTpGmR0xwNQ=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1184/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1188 h1:cU9Phfaym7taAUgGrEQ/0Y+w3r5+kWwGROhaL3hIYnY=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1188/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993 h1:WlPgXldQCxt7qi5Xrc6j6zTrsXWzN5BcOGs7Irq7fwQ=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993/go.mod h1:Z9U8zNtyuyKhjS0698wqsrG/kLx1TQ5CEixXBwVe7xY=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860 h1:F3esKBIT3HW9+7Gt8cVgf8X06VdGIczpgLBUECzSEzU=

tencentcloud/provider.go

@@ -1364,6 +1364,7 @@ func Provider() *schema.Provider {
 			"tencentcloud_clb_target_group":                                                         clb.ResourceTencentCloudClbTargetGroup(),
 			"tencentcloud_clb_target_group_instance_attachment":                                     clb.ResourceTencentCloudClbTGAttachmentInstance(),
 			"tencentcloud_clb_target_group_attachment":                                              clb.ResourceTencentCloudClbTargetGroupAttachment(),
+			"tencentcloud_clb_target_group_attachments":                                             clb.ResourceTencentCloudClbTargetGroupAttachments(),
 			"tencentcloud_clb_log_set":                                                              clb.ResourceTencentCloudClbLogSet(),
 			"tencentcloud_clb_log_topic":                                                            clb.ResourceTencentCloudClbLogTopic(),
 			"tencentcloud_clb_customized_config":                                                    clb.ResourceTencentCloudClbCustomizedConfig(),
@@ -2317,7 +2318,6 @@ func Provider() *schema.Provider {
 			"tencentcloud_cdwpg_userhba":                                                            cdwpg.ResourceTencentCloudCdwpgUserhba(),
 			"tencentcloud_clickhouse_keyval_config":                                                 cdwch.ResourceTencentCloudClickhouseKeyvalConfig(),
 			"tencentcloud_clickhouse_xml_config":                                                    cdwch.ResourceTencentCloudClickhouseXmlConfig(),
-			"tencentcloud_clb_target_group_attachments":                                             clb.ResourceTencentCloudClbTargetGroupAttachments(),
 			"tencentcloud_vpc_peer_connect_manager":                                                 vpc.ResourceTencentCloudVpcPeerConnectManager(),
 			"tencentcloud_vpc_peer_connect_accept_operation":                                        vpc.ResourceTencentCloudVpcPeerConnectAcceptOperation(),
 			"tencentcloud_vpc_peer_connect_reject_operation":                                        vpc.ResourceTencentCloudVpcPeerConnectRejectOperation(),

tencentcloud/services/clb/resource_tc_clb_listener.go

@@ -284,6 +284,7 @@ func ResourceTencentCloudClbListener() *schema.Resource {
 			"full_end_ports": {
 				Type:        schema.TypeList,
 				Optional:    true,
+				ForceNew:    true,
 				Description: "End port of the full port segment listener.",
 				Elem:        &schema.Schema{Type: schema.TypeInt},
 			},

tencentcloud/services/clb/resource_tc_clb_target_group.go

@@ -46,8 +46,7 @@ func ResourceTencentCloudClbTargetGroup() *schema.Resource {
 				Type:        schema.TypeList,
 				Optional:    true,
 				Description: "The backend server of target group bind.",
-				Deprecated: "It has been deprecated from version 1.77.3. " +
-					"please use `tencentcloud_clb_target_group_instance_attachment` instead.",
+				Deprecated:  "It has been deprecated from version 1.77.3. Please use `tencentcloud_clb_target_group_instance_attachment` instead.",
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"bind_ip": {
@@ -202,9 +201,7 @@ func resourceTencentCloudClbTargetCreate(d *schema.ResourceData, meta interface{
 	}
 
 	d.SetId(*response.Response.TargetGroupId)
-
 	return resourceTencentCloudClbTargetRead(d, meta)
-
 }
 
 func resourceTencentCloudClbTargetRead(d *schema.ResourceData, meta interface{}) error {
@@ -334,10 +331,5 @@ func resourceTencentCloudClbTargetDelete(d *schema.ResourceData, meta interface{
 		targetGroupId = d.Id()
 	)
 
-	err := clbService.DeleteTarget(ctx, targetGroupId)
-	if err != nil {
-		return err
-	}
-
-	return nil
+	return clbService.DeleteTarget(ctx, targetGroupId)
 }

tencentcloud/services/clb/resource_tc_clb_target_group_attachment.md

@@ -53,6 +53,13 @@ resource "tencentcloud_clb_listener_rule" "example" {
 resource "tencentcloud_clb_target_group" "example" {
   target_group_name = "tf-example"
   vpc_id            = tencentcloud_vpc.vpc.id
+  port              = 8090
+  type              = "v1"
+
+  tags {
+    tag_key   = "tagKey"
+    tag_value = "tagValue"
+  }
 }
 
 // create clb target group attachment
@@ -61,6 +68,7 @@ resource "tencentcloud_clb_target_group_attachment" "example" {
   target_group_id = tencentcloud_clb_target_group.example.id
   listener_id     = tencentcloud_clb_listener.example.listener_id
   rule_id         = tencentcloud_clb_listener_rule.example.rule_id
+  weight          = 10
 }
 ```
 

tencentcloud/services/clb/resource_tc_clb_target_group_attachments.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"log"
 	"regexp"
+	"strconv"
 	"strings"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
@@ -72,11 +73,11 @@ func ResourceTencentCloudClbTargetGroupAttachments() *schema.Resource {
 							Description: "Forwarding rule ID.",
 						},
 						"weight": {
-							Type:         schema.TypeInt,
-							Optional:     true,
-							ForceNew:     true,
-							ValidateFunc: tccommon.ValidateIntegerInRange(0, 100),
-							Description:  "Target group weight, range [0, 100]. It only takes effect when binding to the v2 target group. If it does not exist, it defaults to 10.",
+							// why int to string? (fix map int zero value)
+							Type:        schema.TypeString,
+							Optional:    true,
+							ForceNew:    true,
+							Description: "Target group weight, range ['0', '100']. It only takes effect when binding to the v2 target group.",
 						},
 					},
 				},
@@ -196,15 +197,15 @@ func resourceTencentCloudClbTargetGroupAttachmentsRead(d *schema.ResourceData, m
 	}
 
 	if len(targetGroupAttachments) < 1 {
-		d.SetId("")
 		log.Printf("[WARN]%s resource `ClbTargetGroupAttachments` [%s] not found, please check if it has been deleted.\n", logId, d.Id())
+		d.SetId("")
 		return nil
 	}
 	var associationsList []interface{}
 
 	for _, attachment := range targetGroupAttachments {
 		info := strings.Split(attachment, tccommon.FILED_SP)
-		if len(info) != 4 {
+		if len(info) != 5 {
 			return fmt.Errorf("id is broken,%s", info)
 		}
 		associationsMap := map[string]interface{}{}
@@ -222,6 +223,9 @@ func resourceTencentCloudClbTargetGroupAttachmentsRead(d *schema.ResourceData, m
 		if info[3] != "" && info[3] != "null" {
 			associationsMap["location_id"] = info[3]
 		}
+		if info[4] != "" && info[4] != "null" {
+			associationsMap["weight"] = info[4]
+		}
 		associationsList = append(associationsList, associationsMap)
 	}
 
@@ -280,10 +284,6 @@ func parseParamToRequest(d *schema.ResourceData, param string, id string) (assoc
 					if v, ok := dMap[name].(string); ok && v != "" {
 						setString(name, v, &targetGroupAssociation)
 					}
-
-					if v, ok := dMap[name].(int); ok {
-						setInt(name, v, &targetGroupAssociation)
-					}
 				}
 			}
 			associations = append(associations, &targetGroupAssociation)
@@ -301,6 +301,9 @@ func setString(fieldName string, value string, request *clb.TargetGroupAssociati
 		request.ListenerId = helper.String(value)
 	case "location_id":
 		request.LocationId = helper.String(value)
+	case "weight":
+		valueInt, _ := strconv.Atoi(value)
+		request.Weight = helper.IntInt64(valueInt)
 	default:
 		log.Printf("Invalid field name: %s\n", fieldName)
 	}
@@ -337,9 +340,10 @@ func margeReadRequest(d *schema.ResourceData) ([]string, map[string]struct{}) {
 			processIds(resourceId, dMap, "target_group_id", isBindFromClb(resourceId), &ids)
 			processIds(resourceId, dMap, "listener_id", isBindFromClb(resourceId), &ids)
 			processIds(resourceId, dMap, "location_id", isBindFromClb(resourceId), &ids)
+			processIds(resourceId, dMap, "weight", isBindFromClb(resourceId), &ids)
 
-			if groupId, ok := dMap["target_group_id"]; ok && groupId.(string) != "" {
-				targetGroupList = append(targetGroupList, groupId.(string))
+			if groupId, ok := dMap["target_group_id"].(string); ok && groupId != "" {
+				targetGroupList = append(targetGroupList, groupId)
 			}
 
 			associationsSet[strings.Join(ids, tccommon.FILED_SP)] = struct{}{}
@@ -356,11 +360,10 @@ func processIds(id string, dMap map[string]interface{}, key string, clbFlag bool
 	} else if !clbFlag && key == "target_group_id" {
 		*ids = append(*ids, id)
 	} else {
-		if v, ok := dMap[key]; ok && v.(string) != "" {
-			*ids = append(*ids, v.(string))
+		if v, ok := dMap[key].(string); ok && v != "" {
+			*ids = append(*ids, v)
 		} else {
 			*ids = append(*ids, "null")
 		}
-
 	}
 }

tencentcloud/services/clb/resource_tc_clb_target_group_attachments.md

@@ -1,31 +1,33 @@
-Provides a resource to create a clb target_group_attachments
+Provides a resource to create a CLB target group attachments
 
-This resource supports bidirectional binding (target group binding to the load balancer, load balancer binding to the target group). When choosing either the load balancer or the target group as the binding target, up to 20 combinations can be bound at most.
+~> **NOTE:** This resource supports bidirectional binding (target group binding to the load balancer, load balancer binding to the target group). When choosing either the load balancer or the target group as the binding target, up to 20 combinations can be bound at most.
 
 Example Usage
 
 Load balancer binding to the target group
 
 ```hcl
-resource "tencentcloud_clb_target_group_attachments" "target_group_attachments" {
-  load_balancer_id = "lb-phbx2420"
+resource "tencentcloud_clb_target_group_attachments" "example" {
+  load_balancer_id = "lb-lmgp1eis"
   associations {
-    listener_id = "lbl-m2q6sp9m"
-    target_group_id = "lbtg-5xunivs0"
-    location_id = "loc-jjqr0ric"
+    listener_id     = "lbl-jbdfcswy"
+    target_group_id = "lbtg-bjosq37w"
+    location_id     = "loc-bjl41tpc"
+    weight          = "10"
   }
 }
-
 ```
+
 Target group binding to the load balancer
+
 ```hcl
-resource "tencentcloud_clb_target_group_attachments" "target_group_attachments" {
-  target_group_id = "lbtg-5xunivs0"
-  associations { 
-    listener_id = "lbl-m2q6sp9m"
+resource "tencentcloud_clb_target_group_attachments" "example" {
+  load_balancer_id = "lb-lmgp1eis"
+  associations {
+    listener_id      = "lbl-jbdfcswy"
     load_balancer_id = "lb-phbx2420"
-    location_id = "loc-jjqr0ric"
+    location_id      = "loc-bjl41tpc"
+    weight           = "10"
   }
 }
-
-```
+```

tencentcloud/services/clb/resource_tc_clb_target_group_instance_attachment.go

@@ -43,14 +43,14 @@ func ResourceTencentCloudClbTGAttachmentInstance() *schema.Resource {
 			},
 			"port": {
 				Type:        schema.TypeInt,
-				Optional:    true,
+				Required:    true,
 				ForceNew:    true,
 				Description: "The port of the target group instance, fully listening to the target group does not support passing this field.",
 			},
 			"weight": {
 				Type:        schema.TypeInt,
-				Optional:    true,
-				Description: "The weight of the target group instance.",
+				Required:    true,
+				Description: "The weight of the target group instance. Value range: 0-100.",
 			},
 		},
 	}
@@ -115,7 +115,6 @@ func resourceTencentCloudClbTGAttachmentInstanceCreate(d *schema.ResourceData, m
 	}
 
 	d.SetId(strings.Join([]string{targetGroupId, bindIp, strconv.Itoa(port)}, tccommon.FILED_SP))
-
 	return resourceTencentCloudClbTGAttachmentInstanceRead(d, meta)
 }
 
@@ -233,10 +232,5 @@ func resourceTencentCloudClbTGAttachmentInstanceDelete(d *schema.ResourceData, m
 		return err
 	}
 
-	err = clbService.DeregisterTargetInstances(ctx, targetGroupId, bindIp, port)
-	if err != nil {
-		return err
-	}
-
-	return nil
+	return clbService.DeregisterTargetInstances(ctx, targetGroupId, bindIp, port)
 }

tencentcloud/services/clb/resource_tc_clb_target_group_instance_attachment.md

@@ -62,11 +62,18 @@ data "tencentcloud_instances" "instances" {
 resource "tencentcloud_clb_target_group" "example" {
   target_group_name = "tf-example"
   vpc_id            = tencentcloud_vpc.vpc.id
+  port              = 8090
+  type              = "v1"
+
+  tags {
+    tag_key   = "tagKey"
+    tag_value = "tagValue"
+  }
 }
 
 resource "tencentcloud_clb_target_group_instance_attachment" "example" {
   target_group_id = tencentcloud_clb_target_group.example.id
-  bind_ip         = data.tencentcloud_instances.instances.instance_list[0].private_ip
+  bind_ip         = tencentcloud_instance.example.private_ip
   port            = 8080
   weight          = 10
 }
@@ -77,5 +84,5 @@ Import
 CLB target group instance attachment can be imported using the id, e.g.
 
 ```
-$ terraform import tencentcloud_clb_target_group_instance_attachment.example lbtg-3k3io0i0#172.16.48.18#8080
+$ terraform import tencentcloud_clb_target_group_instance_attachment.example lbtg-3k3io0i0#10.0.30.25#8080
 ```