fix retry

Author: “guojunchu”

tencentcloud/resource_tc_clb_target_group.go

@@ -75,13 +75,7 @@ func resourceTencentCloudClbTargetCreate(d *schema.ResourceData, meta interface{
 		err             error
 	)
 
-	err = resource.Retry(writeRetryTimeout, func() *resource.RetryError {
-		targetGroupId, err = clbService.CreateTargetGroup(ctx, targetGroupName, vpcId, insAttachments)
-		if err != nil {
-			return retryError(err)
-		}
-		return nil
-	})
+	targetGroupId, err = clbService.CreateTargetGroup(ctx, targetGroupName, vpcId, insAttachments)
 	if err != nil {
 		return err
 	}

tencentcloud/resource_tc_clb_target_group_instance_attachment.go

@@ -152,13 +152,8 @@ func resourceTencentCloudClbTGAttachmentInstanceCreate(d *schema.ResourceData, m
 		err           error
 	)
 
-	err = resource.Retry(writeRetryTimeout, func() *resource.RetryError {
-		err = clbService.RegisterTargetInstances(ctx, targetGroupId, bindIp, uint64(port), uint64(weight))
-		if err != nil {
-			return retryError(err, InternalError)
-		}
-		return nil
-	})
+	err = clbService.RegisterTargetInstances(ctx, targetGroupId, bindIp, uint64(port), uint64(weight))
+
 	if err != nil {
 		return err
 	}
@@ -268,13 +263,8 @@ func resourceTencentCloudClbTGAttachmentInstanceDelete(d *schema.ResourceData, m
 		return err
 	}
 
-	err = resource.Retry(writeRetryTimeout, func() *resource.RetryError {
-		e := clbService.DeregisterTargetInstances(ctx, targetGroupId, bindIp, port)
-		if e != nil {
-			return retryError(e, InternalError)
-		}
-		return nil
-	})
+	err = clbService.DeregisterTargetInstances(ctx, targetGroupId, bindIp, port)
+
 	if err != nil {
 		return err
 	}

tencentcloud/service_tencentcloud_clb.go

@@ -893,15 +893,22 @@ func clbNewTarget(instanceId, port, weight interface{}) *clb.Target {
 
 func (me *ClbService) CreateTargetGroup(ctx context.Context, targetGroupName string, vpcId string,
 	targetGroupInstances []*clb.TargetGroupInstance) (targetGroupId string, err error) {
+	var response *clb.CreateTargetGroupResponse
+
 	request := clb.NewCreateTargetGroupRequest()
 	request.TargetGroupName = &targetGroupName
 	request.TargetGroupInstances = targetGroupInstances
 	if vpcId != "" {
 		request.VpcId = &vpcId
 	}
 
-	response, err := me.client.UseClbClient().CreateTargetGroup(request)
-
+	err = resource.Retry(writeRetryTimeout, func() *resource.RetryError {
+		response, err = me.client.UseClbClient().CreateTargetGroup(request)
+		if err != nil {
+			return retryError(err)
+		}
+		return nil
+	})
 	if err != nil {
 		return
 	}
@@ -925,7 +932,7 @@ func (me *ClbService) ModifyTargetGroup(ctx context.Context, targetGroupId strin
 	return nil
 }
 
-func (me *ClbService) RegisterTargetInstances(ctx context.Context, targetGroupId, bindIp string, port, weight uint64) error {
+func (me *ClbService) RegisterTargetInstances(ctx context.Context, targetGroupId, bindIp string, port, weight uint64) (err error) {
 	request := clb.NewRegisterTargetGroupInstancesRequest()
 	request.TargetGroupId = &targetGroupId
 	request.TargetGroupInstances = []*clb.TargetGroupInstance{
@@ -935,15 +942,21 @@ func (me *ClbService) RegisterTargetInstances(ctx context.Context, targetGroupId
 			Weight: &weight,
 		},
 	}
-
-	_, err := me.client.UseClbClient().RegisterTargetGroupInstances(request)
+	err = resource.Retry(writeRetryTimeout, func() *resource.RetryError {
+		_, err := me.client.UseClbClient().RegisterTargetGroupInstances(request)
+		if err != nil {
+			return retryError(err, InternalError)
+		}
+		return nil
+	})
 	if err != nil {
 		return err
 	}
+
 	return nil
 }
 
-func (me *ClbService) DeregisterTargetInstances(ctx context.Context, targetGroupId, bindIp string, port uint64) error {
+func (me *ClbService) DeregisterTargetInstances(ctx context.Context, targetGroupId, bindIp string, port uint64) (err error) {
 	request := clb.NewDeregisterTargetGroupInstancesRequest()
 	request.TargetGroupId = &targetGroupId
 	request.TargetGroupInstances = []*clb.TargetGroupInstance{
@@ -953,18 +966,31 @@ func (me *ClbService) DeregisterTargetInstances(ctx context.Context, targetGroup
 		},
 	}
 
-	_, err := me.client.UseClbClient().DeregisterTargetGroupInstances(request)
+	err = resource.Retry(writeRetryTimeout, func() *resource.RetryError {
+		_, err := me.client.UseClbClient().DeregisterTargetGroupInstances(request)
+		if err != nil {
+			return retryError(err, InternalError)
+		}
+		return nil
+	})
 	if err != nil {
 		return err
 	}
+
 	return nil
 }
 
 func (me *ClbService) DeleteTarget(ctx context.Context, targetGroupId string) error {
 	request := clb.NewDeleteTargetGroupsRequest()
 	request.TargetGroupIds = []*string{&targetGroupId}
 
-	_, err := me.client.UseClbClient().DeleteTargetGroups(request)
+	err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
+		_, err := me.client.UseClbClient().DeleteTargetGroups(request)
+		if err != nil {
+			return retryError(err, InternalError)
+		}
+		return nil
+	})
 	if err != nil {
 		return err
 	}