Merge pull request #550 from ChuGuai/master

add tcp/udp listener target group attachment

Author: gailwang

CHANGELOG.md

@@ -1,4 +1,11 @@
 ## 1.47.1 (Unreleased)
+
+ENHANCEMENTS:
+* Resource: `tencentcloud_clb_listener` add computed argument `target_type`.
+
+DEPRECATED:
+* Resource: `tencentcloud_clb_target_group_attachment`: optional argument `targrt_group_id` is no longer supported, replace by `target_group_id`.
+
 ## 1.47.0 (November 13, 2020)
 
 ENHANCEMENTS:

tencentcloud/resource_tc_clb_listener.go

@@ -29,6 +29,7 @@ resource "tencentcloud_clb_listener" "TCP_listener" {
   health_check_unhealth_num  = 3
   session_expire_time        = 30
   scheduler                  = "WRR"
+  target_type                = "TARGETGROUP"
 }
 ```
 
@@ -64,6 +65,7 @@ resource "tencentcloud_clb_listener" "TCPSSL_listener" {
   health_check_health_num    = 3
   health_check_unhealth_num  = 3
   scheduler                  = "WRR"
+  target_type                = "TARGETGROUP"
 }
 ```
 Import
@@ -196,6 +198,13 @@ func resourceTencentCloudClbListener() *schema.Resource {
 				Optional:    true,
 				Description: "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": {
+				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.",
+			},
 			//computed
 			"listener_id": {
 				Type:        schema.TypeString,
@@ -256,6 +265,13 @@ func resourceTencentCloudClbListenerCreate(d *schema.ResourceData, meta interfac
 		scheduler = v.(string)
 		request.Scheduler = helper.String(scheduler)
 	}
+	if v, ok := d.GetOk("target_type"); ok {
+		targetType := v.(string)
+		request.TargetType = &targetType
+	} else if protocol == CLB_LISTENER_PROTOCOL_TCP || protocol == CLB_LISTENER_PROTOCOL_UDP || protocol == CLB_LISTENER_PROTOCOL_TCPSSL {
+		targetType := CLB_TARGET_TYPE_NODE
+		request.TargetType = &targetType
+	}
 
 	if v, ok := d.GetOk("session_expire_time"); ok {
 		if !(protocol == CLB_LISTENER_PROTOCOL_TCP || protocol == CLB_LISTENER_PROTOCOL_UDP) {
@@ -358,6 +374,7 @@ func resourceTencentCloudClbListenerRead(d *schema.ResourceData, meta interface{
 	_ = d.Set("clb_id", clbId)
 	_ = d.Set("listener_id", instance.ListenerId)
 	_ = d.Set("listener_name", instance.ListenerName)
+	_ = d.Set("target_type", instance.TargetType)
 	_ = d.Set("port", instance.Port)
 	_ = d.Set("protocol", instance.Protocol)
 	_ = d.Set("session_expire_time", instance.SessionExpireTime)

tencentcloud/resource_tc_clb_listener_test.go

@@ -263,6 +263,7 @@ resource "tencentcloud_clb_listener" "listener_basic" {
   listener_name       = "listener_basic"
   session_expire_time = 30
   scheduler           = "WRR"
+  target_type         = "TARGETGROUP"
 }
 `
 
@@ -284,6 +285,7 @@ resource "tencentcloud_clb_listener" "listener_tcp" {
   health_check_unhealth_num  = 2
   session_expire_time        = 30
   scheduler                  = "WRR"
+  target_type         = "TARGETGROUP"
 }
 `
 
@@ -305,6 +307,7 @@ resource "tencentcloud_clb_listener" "listener_tcp"{
   health_check_unhealth_num  = 3
   session_expire_time        = 60
   scheduler                  = "WRR"
+  target_type         = "TARGETGROUP"
 }
 `
 
@@ -327,6 +330,7 @@ resource "tencentcloud_clb_listener" "listener_tcpssl" {
   health_check_health_num    = 2
   health_check_unhealth_num  = 2
   scheduler                  = "WRR"
+  target_type         = "TARGETGROUP"
 }
 `
 const testAccClbListener_tcpssl_update = `
@@ -348,6 +352,7 @@ resource "tencentcloud_clb_listener" "listener_tcpssl"{
   health_check_health_num    = 3
   health_check_unhealth_num  = 3
   scheduler                  = "WRR"
+  target_type         = "TARGETGROUP"
 }
 `
 const testAccClbListener_https = `

tencentcloud/resource_tc_clb_target_group_attachment.go

@@ -34,7 +34,7 @@ resource "tencentcloud_clb_target_group_attachment" "group" {
     clb_id          = tencentcloud_clb_instance.clb_basic.id
     listener_id     = tencentcloud_clb_listener.listener_basic.id
     rule_id         = tencentcloud_clb_listener_rule.rule_basic.id
-    targrt_group_id = tencentcloud_clb_target_group.test.id
+    target_group_id = tencentcloud_clb_target_group.test.id
 }
 ```
 
@@ -62,6 +62,7 @@ func resourceTencentCloudClbTargetGroupAttachment() *schema.Resource {
 	return &schema.Resource{
 		Create: resourceTencentCloudClbTargetGroupAttachmentCreate,
 		Read:   resourceTencentCloudClbTargetGroupAttachmentRead,
+		Update: resourceTencentCloudClbTargetGroupAttachmentUpdate,
 		Delete: resourceTencentCloudClbTargetGroupAttachmentDelete,
 		Importer: &schema.ResourceImporter{
 			State: schema.ImportStatePassthrough,
@@ -80,40 +81,61 @@ func resourceTencentCloudClbTargetGroupAttachment() *schema.Resource {
 				Description: "ID of the CLB listener.",
 			},
 			"targrt_group_id": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "ID of the CLB target group.",
+				Deprecated:  "It has been deprecated from version 1.47.1. Use `target_group_id` instead.",
+			},
+			"target_group_id": {
 				Type:        schema.TypeString,
 				ForceNew:    true,
-				Required:    true,
+				Optional:    true,
 				Description: "ID of the CLB target group.",
 			},
 			"rule_id": {
 				Type:        schema.TypeString,
-				Required:    true,
+				Optional:    true,
 				ForceNew:    true,
 				Description: "ID of the CLB listener rule.",
 			},
 		},
 	}
 }
-
 func resourceTencentCloudClbTargetGroupAttachmentCreate(d *schema.ResourceData, meta interface{}) error {
 	defer logElapsed("resource.tencentcloud_clb_target_group_attachment.create")()
 
 	var (
 		clbService = ClbService{
 			client: meta.(*TencentCloudClient).apiV3Conn,
 		}
-		logId            = getLogId(contextNil)
-		ctx              = context.WithValue(context.TODO(), logIdKey, logId)
-		listenerId       = d.Get("listener_id").(string)
-		clbId            = d.Get("clb_id").(string)
-		targrtGroupId    = d.Get("targrt_group_id").(string)
-		locationId       = d.Get("rule_id").(string)
-		targetInfos      []*clb.TargetGroupInfo
-		instance         *clb.LoadBalancer
-		listener         *clb.Listener
-		isRuleExist, has bool
-		err              error
+		logId         = getLogId(contextNil)
+		ctx           = context.WithValue(context.TODO(), logIdKey, logId)
+		locationId    string
+		listenerId    = d.Get("listener_id").(string)
+		clbId         = d.Get("clb_id").(string)
+		targetGroupId string
+
+		targetInfos []*clb.TargetGroupInfo
+		instance    *clb.LoadBalancer
+		has         bool
+		err         error
 	)
+	if v, ok := d.GetOk("rule_id"); ok {
+		locationId = v.(string)
+	}
+	vTarget, eHas := d.GetOk("target_group_id")
+	vTargrt, rHas := d.GetOk("targrt_group_id")
+
+	if eHas || rHas {
+		if rHas {
+			targetGroupId = vTargrt.(string)
+		}
+		if eHas {
+			targetGroupId = vTarget.(string)
+		}
+	} else {
+		return fmt.Errorf("'target_group_id' or 'targrt_group_id' at least set one, please use 'target_group_id'")
+	}
 
 	//check listenerId
 	checkErr := ListenerIdCheck(listenerId)
@@ -125,26 +147,6 @@ func resourceTencentCloudClbTargetGroupAttachmentCreate(d *schema.ResourceData,
 	if checkErr != nil {
 		return checkErr
 	}
-	//check rule
-	err = resource.Retry(readRetryTimeout, func() *resource.RetryError {
-		listener, err = clbService.DescribeListenerById(ctx, listenerId, clbId)
-		if err != nil {
-			return retryError(err, InternalError)
-		}
-		return nil
-	})
-	if err != nil {
-		return err
-	}
-	for _, rule := range listener.Rules {
-		if locationId == *rule.LocationId && (rule.TargetType != nil && *rule.TargetType == CLB_TARGET_TYPE_TARGETGROUP) {
-			isRuleExist = true
-			break
-		}
-	}
-	if !isRuleExist {
-		return fmt.Errorf("rule bound to the listener of the CLB instance does not exist or the rule not in targetgroup mode")
-	}
 
 	//check target group
 	err = resource.Retry(readRetryTimeout, func() *resource.RetryError {
@@ -158,7 +160,7 @@ func resourceTencentCloudClbTargetGroupAttachmentCreate(d *schema.ResourceData,
 		return err
 	}
 	err = resource.Retry(readRetryTimeout, func() *resource.RetryError {
-		targetInfos, err = clbService.DescribeTargetGroups(ctx, targrtGroupId, nil)
+		targetInfos, err = clbService.DescribeTargetGroups(ctx, targetGroupId, nil)
 		if err != nil {
 			return retryError(err, InternalError)
 		}
@@ -171,22 +173,22 @@ func resourceTencentCloudClbTargetGroupAttachmentCreate(d *schema.ResourceData,
 		return fmt.Errorf("CLB instance needs to be in the same VPC as the backend target group")
 	}
 
-	err = clbService.AssociateTargetGroups(ctx, listenerId, clbId, targrtGroupId, locationId)
+	err = clbService.AssociateTargetGroups(ctx, listenerId, clbId, targetGroupId, locationId)
 	if err != nil {
 		return err
 	}
 
 	// wait status
-	has, err = clbService.DescribeAssociateTargetGroups(ctx, []string{targrtGroupId, listenerId, clbId, locationId})
+	has, err = clbService.DescribeAssociateTargetGroups(ctx, []string{targetGroupId, listenerId, clbId, locationId})
 	if err != nil {
 		return err
 	}
 	if !has {
-		return fmt.Errorf("AssociateTargetGroups faild, targrtGroupId = %s, listenerId = %s, clbId = %s, ruleId = %s",
-			targrtGroupId, listenerId, clbId, locationId)
+		return fmt.Errorf("AssociateTargetGroups faild, targetGroupId = %s, listenerId = %s, clbId = %s, ruleId = %s",
+			targetGroupId, listenerId, clbId, locationId)
 	}
 
-	d.SetId(strings.Join([]string{targrtGroupId, listenerId, clbId, locationId}, FILED_SP))
+	d.SetId(strings.Join([]string{targetGroupId, listenerId, clbId, locationId}, FILED_SP))
 
 	return resourceTencentCloudClbTargetGroupAttachmentRead(d, meta)
 }
@@ -207,7 +209,7 @@ func resourceTencentCloudClbTargetGroupAttachmentRead(d *schema.ResourceData, me
 
 	ids := strings.Split(id, FILED_SP)
 	if len(ids) != 4 {
-		return fmt.Errorf("CLB target group attachment id must contains clb_id, listernrt_id, targrt_group_id, rule_id")
+		return fmt.Errorf("CLB target group attachment id is clb_id#listener_id#target_group_id#rule_id(only required for 7 layer CLB)")
 	}
 
 	has, err := clbService.DescribeAssociateTargetGroups(ctx, ids)
@@ -219,14 +221,21 @@ func resourceTencentCloudClbTargetGroupAttachmentRead(d *schema.ResourceData, me
 		return nil
 	}
 
-	_ = d.Set("targrt_group_id", ids[0])
+	_ = d.Set("target_group_id", ids[0])
 	_ = d.Set("listener_id", ids[1])
 	_ = d.Set("clb_id", ids[2])
-	_ = d.Set("rule_id", ids[3])
+	if ids[3] != "" {
+		_ = d.Set("rule_id", ids[3])
+	}
 
 	return nil
 }
 
+func resourceTencentCloudClbTargetGroupAttachmentUpdate(d *schema.ResourceData, meta interface{}) error {
+	defer logElapsed("resource.tencentcloud_clb_target_group_attachment.update")()
+	return resourceTencentCloudClbTargetGroupAttachmentRead(d, meta)
+}
+
 func resourceTencentCloudClbTargetGroupAttachmentDelete(d *schema.ResourceData, meta interface{}) error {
 	defer logElapsed("resource.tencentcloud_clb_target_group_attachment.delete")()
 
@@ -243,7 +252,7 @@ func resourceTencentCloudClbTargetGroupAttachmentDelete(d *schema.ResourceData,
 
 	ids := strings.Split(id, FILED_SP)
 	if len(ids) != 4 {
-		return fmt.Errorf("CLB target group attachment id must contains clb_id, listernrt_id, targrt_group_id, rule_id")
+		return fmt.Errorf("CLB target group attachment id is clb_id#listener_id#target_group_id#rule_id(only required for 7 layer CLB)")
 	}
 
 	if err := clbService.DisassociateTargetGroups(ctx, ids[0], ids[1], ids[2], ids[3]); err != nil {
@@ -264,12 +273,18 @@ func resourceTencentCloudClbTargetGroupAttachmentDelete(d *schema.ResourceData,
 				if rule.LocationId != nil {
 					originLocationId = *rule.LocationId
 				}
-
-				if originListenerId == ids[1] && originClbId == ids[2] && originLocationId == ids[3] {
+				if *rule.Protocol == CLB_LISTENER_PROTOCOL_TCP || *rule.Protocol == CLB_LISTENER_PROTOCOL_UDP || *rule.Protocol == CLB_LISTENER_PROTOCOL_TCPSSL {
+					if originListenerId == ids[1] && originClbId == ids[2] {
+						return resource.RetryableError(
+							fmt.Errorf("rule association target group instance still exist. [targetGroupId=%s, listenerId=%s, cldId=%s]",
+								ids[0], ids[1], ids[2]))
+					}
+				} else if originListenerId == ids[1] && originClbId == ids[2] && originLocationId == ids[3] {
 					return resource.RetryableError(
 						fmt.Errorf("rule association target group instance still exist. [targetGroupId=%s, listenerId=%s, cldId=%s, ruleId=%s]",
 							ids[0], ids[1], ids[2], ids[3]))
 				}
+
 			}
 		}
 		return nil