fix clb target (#2148)

* fix clb target * add changelog * update unit test --------- Co-authored-by: mikatong <[email protected]>
tencentcloudstack · Oct 7, 2023 · 92e743a · 92e743a
1 parent cdaa060
commit 92e743a
Show file tree

Hide file tree

Showing 6 changed files with 157 additions and 102 deletions.
diff --git a/.changelog/2148.txt b/.changelog/2148.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+resource/tencentcloud_clb_attachment: fix http backend delete problem.
+```
diff --git a/tencentcloud/basic_test.go b/tencentcloud/basic_test.go
@@ -1120,3 +1120,21 @@ variable "instance_id" {
 `
 
 // End of Clickhouse
+
+// CLB
+const clbTargetEniTestCase = instanceCommonTestCase + `
+resource "tencentcloud_eni" "clb_eni_target" {
+  name        = "ci-test-eni"
+  vpc_id      = var.cvm_vpc_id
+  subnet_id   = var.cvm_subnet_id
+  description = "clb eni backend"
+  ipv4_count  = 1
+}
+
+resource "tencentcloud_eni_attachment" "foo" {
+  eni_id      = tencentcloud_eni.clb_eni_target.id
+  instance_id = tencentcloud_instance.default.id
+}
+`
+
+//End of Clb
diff --git a/tencentcloud/extension_clb.go b/tencentcloud/extension_clb.go
@@ -124,3 +124,8 @@ const (
 	CLB_TARGET_TYPE_NODE        = "NODE"
 	CLB_TARGET_TYPE_TARGETGROUP = "TARGETGROUP"
 )
+
+const (
+	CLB_BACKEND_TYPE_CVM = "CVM"
+	CLB_BACKEND_TYPE_ENI = "ENI"
+)
diff --git a/tencentcloud/resource_tc_clb_attachment.go b/tencentcloud/resource_tc_clb_attachment.go
@@ -455,51 +455,25 @@ func resourceTencentCloudClbServerAttachmentRead(d *schema.ResourceData, meta in
 	} else if instance.Targets != nil {
 		onlineTargets = instance.Targets
 	}
-
-	//this may cause problems when there are members in two dimensions array
-	//need to read state of the tfstate file to clear the relationships
-	//in this situation, import action is not supported
-	// TL,DR: just update partial targets which this resource declared.
-	stateTargets := d.Get("targets").(*schema.Set)
-	if stateTargets.Len() != 0 {
-		//the old state exist
-		//create a new attachment with state
-		exactTargets := make([]interface{}, 0)
-		for i := range onlineTargets {
-			v := onlineTargets[i]
-			if *v.Type == "CVM" && v.InstanceId != nil {
-				target := map[string]interface{}{
-					"weight":      int(*v.Weight),
-					"port":        int(*v.Port),
-					"instance_id": *v.InstanceId,
-				}
-				if stateTargets.Contains(target) {
-					exactTargets = append(exactTargets, map[string]interface{}{
-						"weight":      int(*v.Weight),
-						"port":        int(*v.Port),
-						"instance_id": *v.InstanceId,
-					})
-				}
-
-			} else if len(v.PrivateIpAddresses) > 0 && *v.PrivateIpAddresses[0] != "" {
-				target := map[string]interface{}{
-					"weight": int(*v.Weight),
-					"port":   int(*v.Port),
-					"eni_ip": *v.PrivateIpAddresses[0],
-				}
-				if stateTargets.Contains(target) {
-					exactTargets = append(exactTargets, map[string]interface{}{
-						"weight": int(*v.Weight),
-						"port":   int(*v.Port),
-						"eni_ip": *v.PrivateIpAddresses[0],
-					})
-				}
+	targets := make([]interface{}, 0)
+	for _, onlineTarget := range onlineTargets {
+		if *onlineTarget.Type == CLB_BACKEND_TYPE_CVM {
+			target := map[string]interface{}{
+				"weight":      int(*onlineTarget.Weight),
+				"port":        int(*onlineTarget.Port),
+				"instance_id": *onlineTarget.InstanceId,
 			}
+			targets = append(targets, target)
+		} else if *onlineTarget.Type == CLB_BACKEND_TYPE_ENI {
+			target := map[string]interface{}{
+				"weight": int(*onlineTarget.Weight),
+				"port":   int(*onlineTarget.Port),
+				"eni_ip": *onlineTarget.PrivateIpAddresses[0],
+			}
+			targets = append(targets, target)
 		}
-		_ = d.Set("targets", exactTargets)
-	} else {
-		_ = d.Set("targets", flattenBackendList(onlineTargets))
 	}
+	_ = d.Set("targets", targets)
 
 	return nil
 }
@@ -508,11 +482,15 @@ func resourceTencentCloudClbServerAttachmentRead(d *schema.ResourceData, meta in
 // If remove diffs created, check existing cvm instance first, filter target groups which already deregister
 func getRemoveCandidates(ctx context.Context, clbService ClbService, clbId string, listenerId string, locationId string, remove []interface{}) []interface{} {
 	removeCandidates := make([]interface{}, 0)
-	existAttachments, err := clbService.DescribeAttachmentByPara(ctx, clbId, listenerId, locationId)
+	listenerBackend, err := clbService.DescribeAttachmentByPara(ctx, clbId, listenerId, locationId)
 	if err != nil {
 		return removeCandidates
 	}
-	existTargetGroups := existAttachments.Targets
+	existTargetGroups := make([]*clb.Backend, 0)
+	existTargetGroups = append(existTargetGroups, listenerBackend.Targets...)
+	if len(listenerBackend.Rules) > 0 {
+		existTargetGroups = append(existTargetGroups, listenerBackend.Rules[0].Targets...)
+	}
 
 	for _, item := range remove {
 		target := item.(map[string]interface{})
@@ -551,7 +529,7 @@ func targetGroupContainsEni(targets []*clb.Backend, eniIp interface{}) (contains
 		return
 	}
 	for _, target := range targets {
-		if len(target.PrivateIpAddresses) > 0 && target.PrivateIpAddresses[0] != nil {
+		if len(target.PrivateIpAddresses) == 0 || target.PrivateIpAddresses[0] == nil {
 			continue
 		}
 		if ip == *target.PrivateIpAddresses[0] {