CLB feature support (#590)

Author: gailwang

CHANGELOG.md

@@ -1,4 +1,20 @@
 ## 1.53.5 (Unreleased)
+
+ENHANCEMENTS:
+
+* Resource `tencentcloud_clb_instance` add `internet_charge_type`, `internet_bandwidth_max_out` to support internet traffic setting with OPEN CLB instance.
+* Resource `tencentcloud_clb_rule` add `http2_switch` to support HTTP2 protocol setting.
+* Resource `tencentcloud_kubernetes_cluster` add `lan_ip` to show node LAN IP.
+* Resource `tencentcloud_kubernetes_scale_worker` add `lan_ip` to show node LAN IP.
+* Resource `tencentcloud_kubernetes_cluster_attachment` add `state` to show node state.
+* Resource `tencentcloud_clb_rule` support certificate modifying.
+* Data Source `tencentcloud_clb_instances` add `internet_charge_type`, `internet_bandwidth_max_out`.
+* Data Source `tencentcloud_clb_rules` add `http2_switch`.
+
+BUG FIXES:
+
+* Resource: `tencentcloud_clb_attachment` fix bug that attach more than 20 targets will failed.
+
 ## 1.53.4 (February 08, 2021)
 
 ENHANCEMENTS:

tencentcloud/data_source_tc_clb_instances.go

@@ -134,6 +134,26 @@ func dataSourceTencentCloudClbInstances() *schema.Resource {
 							Computed:    true,
 							Description: "The available tags within this CLB.",
 						},
+						"address_ip_version": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "IP version, only applicable to open CLB. Valid values are `IPV4`, `IPV6` and `IPv6FullChain`.",
+						},
+						"vip_isp": {
+							Type:        schema.TypeString,
+							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).",
+						},
+						"internet_charge_type": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "Internet charge type, only applicable to open CLB. Valid values are `TRAFFIC_POSTPAID_BY_HOUR`, `BANDWIDTH_POSTPAID_BY_HOUR` and `BANDWIDTH_PACKAGE`.",
+						},
+						"internet_bandwidth_max_out": {
+							Type:        schema.TypeInt,
+							Computed:    true,
+							Description: "Max bandwidth out, only applicable to open CLB. Valid value ranges is [1, 2048]. Unit is MB.",
+						},
 					},
 				},
 			},
@@ -181,20 +201,26 @@ func dataSourceTencentCloudClbInstancesRead(d *schema.ResourceData, meta interfa
 	ids := make([]string, 0, len(clbs))
 	for _, clbInstance := range clbs {
 		mapping := map[string]interface{}{
-			"clb_id":                    *clbInstance.LoadBalancerId,
-			"clb_name":                  *clbInstance.LoadBalancerName,
-			"network_type":              *clbInstance.LoadBalancerType,
-			"status":                    *clbInstance.Status,
-			"create_time":               *clbInstance.CreateTime,
-			"status_time":               *clbInstance.StatusTime,
-			"project_id":                *clbInstance.ProjectId,
-			"vpc_id":                    *clbInstance.VpcId,
-			"subnet_id":                 *clbInstance.SubnetId,
+			"clb_id":                    clbInstance.LoadBalancerId,
+			"clb_name":                  clbInstance.LoadBalancerName,
+			"network_type":              clbInstance.LoadBalancerType,
+			"status":                    clbInstance.Status,
+			"create_time":               clbInstance.CreateTime,
+			"status_time":               clbInstance.StatusTime,
+			"project_id":                clbInstance.ProjectId,
+			"vpc_id":                    clbInstance.VpcId,
+			"subnet_id":                 clbInstance.SubnetId,
 			"clb_vips":                  helper.StringsInterfaces(clbInstance.LoadBalancerVips),
-			"target_region_info_region": *clbInstance.TargetRegionInfo.Region,
-			"target_region_info_vpc_id": *clbInstance.TargetRegionInfo.VpcId,
+			"target_region_info_region": clbInstance.TargetRegionInfo.Region,
+			"target_region_info_vpc_id": clbInstance.TargetRegionInfo.VpcId,
+			"address_ip_version":        clbInstance.AddressIPVersion,
+			"vip_isp":                   clbInstance.VipIsp,
 			"security_groups":           helper.StringsInterfaces(clbInstance.SecureGroups),
 		}
+		if clbInstance.NetworkAttributes != nil {
+			mapping["internet_charge_type"] = *clbInstance.NetworkAttributes.InternetChargeType
+			mapping["internet_bandwidth_max_out"] = *clbInstance.NetworkAttributes.InternetMaxBandwidthOut
+		}
 		if clbInstance.Tags != nil {
 			tags := make(map[string]interface{}, len(clbInstance.Tags))
 			for _, t := range clbInstance.Tags {

tencentcloud/data_source_tc_clb_listener_rules.go

@@ -160,10 +160,14 @@ func dataSourceTencentCloudClbListenerRules() *schema.Resource {
 						},
 						"scheduler": {
 							Type:        schema.TypeString,
-							Optional:    true,
 							Computed:    true,
 							Description: "Scheduling method of the CLB listener, and available values include 'WRR', 'IP_HASH' and 'LEAST_CONN'. The default is 'WRR'. NOTES: TCP/UDP/TCP_SSL listener allows direct configuration, HTTP/HTTPS listener needs to be configured in tencentcloud_clb_listener_rule.",
 						},
+						"http2_switch": {
+							Type:        schema.TypeBool,
+							Computed:    true,
+							Description: "Indicate to set HTTP2 protocol or not.",
+						},
 					},
 				},
 			},
@@ -228,11 +232,12 @@ func dataSourceTencentCloudClbListenerRulesRead(d *schema.ResourceData, meta int
 		mapping := map[string]interface{}{
 			"clb_id":              clbId,
 			"listener_id":         listenerId,
-			"rule_id":             *rule.LocationId,
-			"domain":              *rule.Domain,
-			"url":                 *rule.Url,
-			"session_expire_time": *rule.SessionExpireTime,
-			"scheduler":           *rule.Scheduler,
+			"rule_id":             rule.LocationId,
+			"domain":              rule.Domain,
+			"url":                 rule.Url,
+			"session_expire_time": rule.SessionExpireTime,
+			"scheduler":           rule.Scheduler,
+			"http2_switch":        rule.Http2,
 		}
 		if rule.HealthCheck != nil {
 			healthCheckSwitch := false

tencentcloud/resource_tc_clb_attachment.go

@@ -37,7 +37,9 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/pkg/errors"
 	clb "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb/v20180317"
+	sdkErrors "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
 	"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
+	"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/ratelimit"
 )
 
 func resourceTencentCloudClbServerAttachment() *schema.Resource {
@@ -134,29 +136,41 @@ func resourceTencentCloudClbServerAttachmentCreate(d *schema.ResourceData, meta
 		}
 	}
 
-	for _, inst_ := range d.Get("targets").(*schema.Set).List() {
-		inst := inst_.(map[string]interface{})
-		request.Targets = append(request.Targets, clbNewTarget(inst["instance_id"], inst["port"], inst["weight"]))
-	}
-	err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
-		requestId := ""
-		result, e := meta.(*TencentCloudClient).apiV3Conn.UseClbClient().RegisterTargets(request)
-		if e != nil {
-			return retryError(e)
-		} else {
-			log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]",
-				logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
-			requestId = *result.Response.RequestId
-			retryErr := waitForTaskFinish(requestId, meta.(*TencentCloudClient).apiV3Conn.UseClbClient())
-			if retryErr != nil {
-				return resource.NonRetryableError(errors.WithStack(retryErr))
+	insList := d.Get("targets").(*schema.Set).List()
+	insLen := len(insList)
+	for count := 0; count < insLen; count += 20 {
+		//this request only support 20 targets at most once time
+		request.Targets = make([]*clb.Target, 0, 20)
+		for i := 0; i < 20; i++ {
+			index := count + i
+			if index >= insLen {
+				break
 			}
+			inst := insList[index].(map[string]interface{})
+			request.Targets = append(request.Targets, clbNewTarget(inst["instance_id"], inst["port"], inst["weight"]))
+		}
+
+		err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
+			requestId := ""
+			ratelimit.Check(request.GetAction())
+			result, e := meta.(*TencentCloudClient).apiV3Conn.UseClbClient().RegisterTargets(request)
+			if e != nil {
+				return retryError(e)
+			} else {
+				log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]",
+					logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
+				requestId = *result.Response.RequestId
+				retryErr := waitForTaskFinish(requestId, meta.(*TencentCloudClient).apiV3Conn.UseClbClient())
+				if retryErr != nil {
+					return resource.NonRetryableError(errors.WithStack(retryErr))
+				}
+			}
+			return nil
+		})
+		if err != nil {
+			log.Printf("[CRITAL]%s create CLB attachment failed, reason:%+v", logId, err)
+			return err
 		}
-		return nil
-	})
-	if err != nil {
-		log.Printf("[CRITAL]%s create CLB attachment failed, reason:%+v", logId, err)
-		return err
 	}
 	id := fmt.Sprintf("%s#%v#%v", locationId, d.Get("listener_id"), d.Get("clb_id"))
 	d.SetId(id)
@@ -171,7 +185,6 @@ func resourceTencentCloudClbServerAttachmentDelete(d *schema.ResourceData, meta
 	defer clbActionMu.Unlock()
 
 	logId := getLogId(contextNil)
-	ctx := context.WithValue(context.TODO(), logIdKey, logId)
 
 	attachmentId := d.Id()
 
@@ -191,23 +204,49 @@ func resourceTencentCloudClbServerAttachmentDelete(d *schema.ResourceData, meta
 		request.LocationId = helper.String(locationId)
 	}
 
-	//check exists
-	clbService := ClbService{
-		client: meta.(*TencentCloudClient).apiV3Conn,
-	}
-
-	err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
-		e := clbService.DeleteAttachmentById(ctx, clbId, listenerId, locationId, d.Get("targets").(*schema.Set).List())
-		if e != nil {
-			return retryError(e)
+	insList := d.Get("targets").(*schema.Set).List()
+	insLen := len(insList)
+	for count := 0; count < insLen; count += 20 {
+		//this request only support 20 targets at most once time
+		request.Targets = make([]*clb.Target, 0, 20)
+		for i := 0; i < 20; i++ {
+			index := count + i
+			if index >= insLen {
+				break
+			}
+			inst := insList[index].(map[string]interface{})
+			request.Targets = append(request.Targets, clbNewTarget(inst["instance_id"], inst["port"], inst["weight"]))
 		}
 
-		return nil
-	})
-	if err != nil {
-		log.Printf("[CRITAL]%s reason[%+v]", logId, err)
-		return err
+		err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
+			requestId := ""
+			ratelimit.Check(request.GetAction())
+			result, e := meta.(*TencentCloudClient).apiV3Conn.UseClbClient().DeregisterTargets(request)
+			if e != nil {
+
+				ee, ok := e.(*sdkErrors.TencentCloudSDKError)
+				if ok && ee.GetCode() == "InvalidParameter" {
+					return nil
+				}
+				return retryError(e)
+
+			} else {
+				log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]",
+					logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
+				requestId = *result.Response.RequestId
+				retryErr := waitForTaskFinish(requestId, meta.(*TencentCloudClient).apiV3Conn.UseClbClient())
+				if retryErr != nil {
+					return resource.NonRetryableError(errors.WithStack(retryErr))
+				}
+			}
+			return nil
+		})
+		if err != nil {
+			log.Printf("[CRITAL]%s create CLB attachment failed, reason:%+v", logId, err)
+			return err
+		}
 	}
+
 	return nil
 }