fix retry

Author: “guojunchu”

tencentcloud/resource_tc_clb_target_group.go

@@ -23,7 +23,6 @@ package tencentcloud
 import (
 	"context"
 
-	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	clb "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb/v20180317"
 )
@@ -51,12 +50,6 @@ func resourceTencentCloudClbTargetGroup() *schema.Resource {
 				ForceNew:    true,
 				Description: "VPC ID, default is based on the network.",
 			},
-			//computed
-			"target_group_id": {
-				Type:        schema.TypeString,
-				Computed:    true,
-				Description: "Target group ID.",
-			},
 		},
 	}
 }
@@ -124,7 +117,7 @@ func resourceTencentCloudClbTargetUpdate(d *schema.ResourceData, meta interface{
 		targetGroupName := d.Get("target_group_name").(string)
 		err := clbService.ModifyTargetGroup(ctx, targetGroupId, targetGroupName)
 		if err != nil {
-			return nil
+			return err
 		}
 	}
 	return resourceTencentCloudClbTargetRead(d, meta)
@@ -140,13 +133,8 @@ func resourceTencentCloudClbTargetDelete(d *schema.ResourceData, meta interface{
 		targetGroupId = d.Id()
 	)
 
-	err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
-		e := clbService.DeleteTarget(ctx, targetGroupId)
-		if e != nil {
-			return retryError(e, InternalError)
-		}
-		return nil
-	})
+	err := clbService.DeleteTarget(ctx, targetGroupId)
+
 	if err != nil {
 		return err
 	}

tencentcloud/resource_tc_clb_target_group_attachment.go

@@ -204,6 +204,7 @@ func resourceTencentCloudClbTargetGroupAttachmentRead(d *schema.ResourceData, me
 		return err
 	}
 	if !has {
+		d.SetId("")
 		return nil
 	}
 

tencentcloud/resource_tc_clb_target_group_instance_attachment.go

@@ -237,7 +237,7 @@ func resourceTencentCloudClbTGAttachmentInstanceUpdate(d *schema.ResourceData, m
 		newWeight := d.Get("weight").(int)
 		err := clbService.ModifyTargetGroupInstancesWeight(ctx, targetGroupId, bindIp, uint64(port), uint64(newWeight))
 		if err != nil {
-			return nil
+			return err
 		}
 	}
 	return resourceTencentCloudClbTGAttachmentInstanceRead(d, meta)

tencentcloud/service_tencentcloud_clb.go

@@ -1183,7 +1183,15 @@ func (me *ClbService) ModifyTargetGroupInstancesWeight(ctx context.Context, targ
 	request.TargetGroupId = &targetGroupId
 	request.TargetGroupInstances = []*clb.TargetGroupInstance{&instance}
 
-	_, err := me.client.UseClbClient().ModifyTargetGroupInstancesWeight(request)
+	err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
+		ratelimit.Check(request.GetAction())
+		_, err := me.client.UseClbClient().ModifyTargetGroupInstancesWeight(request)
+		if err != nil {
+			return retryError(err, InternalError)
+		}
+		return nil
+	})
+
 	if err != nil {
 		return err
 	}