add

Author: SevenEarth

tencentcloud/services/tke/resource_tc_kubernetes_scale_worker.go

@@ -573,28 +573,57 @@ func resourceTencentCloudKubernetesScaleWorkerDeleteOnExit(ctx context.Context)
 		return nil
 	}
 
-	err = service.DeleteClusterInstances(ctx, clusterId, needDeletes)
-	if err != nil {
-		err = resource.Retry(3*tccommon.WriteRetryTimeout, func() *resource.RetryError {
-			err = service.DeleteClusterInstances(ctx, clusterId, needDeletes)
+	if len(needDeletes) <= 100 {
+		err = service.DeleteClusterInstances(ctx, clusterId, needDeletes)
+		if err != nil {
+			err = resource.Retry(3*tccommon.WriteRetryTimeout, func() *resource.RetryError {
+				err = service.DeleteClusterInstances(ctx, clusterId, needDeletes)
 
-			if e, ok := err.(*errors.TencentCloudSDKError); ok {
-				if e.GetCode() == "InternalError.ClusterNotFound" {
-					return nil
-				}
+				if e, ok := err.(*errors.TencentCloudSDKError); ok {
+					if e.GetCode() == "InternalError.ClusterNotFound" {
+						return nil
+					}
 
-				if e.GetCode() == "InternalError.Param" &&
-					strings.Contains(e.GetMessage(), `PARAM_ERROR[some instances []is not in right state`) {
-					return nil
+					if e.GetCode() == "InternalError.Param" &&
+						strings.Contains(e.GetMessage(), `PARAM_ERROR[some instances []is not in right state`) {
+						return nil
+					}
 				}
-			}
 
+				if err != nil {
+					return tccommon.RetryError(err, tccommon.InternalError)
+				}
+				return nil
+			})
+		}
+	} else {
+		for _, subsubSlice := range spliteInstanceIds(helper.Strings(needDeletes), 100) {
+			tmpDeletes := helper.PStrings(subsubSlice)
+			err = service.DeleteClusterInstances(ctx, clusterId, tmpDeletes)
 			if err != nil {
-				return tccommon.RetryError(err, tccommon.InternalError)
+				err = resource.Retry(3*tccommon.WriteRetryTimeout, func() *resource.RetryError {
+					err = service.DeleteClusterInstances(ctx, clusterId, tmpDeletes)
+
+					if e, ok := err.(*errors.TencentCloudSDKError); ok {
+						if e.GetCode() == "InternalError.ClusterNotFound" {
+							return nil
+						}
+
+						if e.GetCode() == "InternalError.Param" &&
+							strings.Contains(e.GetMessage(), `PARAM_ERROR[some instances []is not in right state`) {
+							return nil
+						}
+					}
+
+					if err != nil {
+						return tccommon.RetryError(err, tccommon.InternalError)
+					}
+					return nil
+				})
 			}
-			return nil
-		})
+		}
 	}
+
 	return nil
 }
 
@@ -683,8 +712,8 @@ func resourceTencentCloudKubernetesScaleWorkerReadPreRequest1(ctx context.Contex
 	meta := tccommon.ProviderMetaFromContext(ctx)
 	ctxData := tccommon.DataFromContext(ctx)
 	instanceIds := ctxData.Get("instanceIds").([]*string)
-	req.Limit = helper.Int64(0)
-	req.Offset = helper.Int64(100)
+	req.Limit = helper.Int64(100)
+	req.Offset = helper.Int64(0)
 	if len(instanceIds) <= 100 {
 		req.InstanceIds = instanceIds
 		resp, err = meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseCvmV20170312Client().DescribeInstances(req)
@@ -697,26 +726,32 @@ func resourceTencentCloudKubernetesScaleWorkerReadPreRequest1(ctx context.Contex
 			tmpTotalCount  int64
 			tmpInstanceSet []*cvm.Instance
 		)
+		tmpResp := new(cvm.DescribeInstancesResponse)
 		subSlices := spliteInstanceIds(instanceIds, 100)
 		for _, subsubSlice := range subSlices {
 			req.InstanceIds = subsubSlice
-			tmpResp, err := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseCvmV20170312Client().DescribeInstances(req)
-			log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, req.GetAction(), req.ToJsonString(), tmpResp.ToJsonString())
+			response, err := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseCvmV20170312Client().DescribeInstances(req)
+			log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, req.GetAction(), req.ToJsonString(), response.ToJsonString())
 			if err != nil {
 				return nil, err
 			}
 
-			if tmpResp.Response.TotalCount != nil {
-				tmpTotalCount += *tmpResp.Response.TotalCount
+			if response.Response.TotalCount != nil {
+				tmpTotalCount += *response.Response.TotalCount
 			}
 
-			if len(tmpResp.Response.InstanceSet) != 0 {
-				tmpInstanceSet = append(tmpInstanceSet, tmpResp.Response.InstanceSet...)
+			if len(response.Response.InstanceSet) != 0 {
+				tmpInstanceSet = append(tmpInstanceSet, response.Response.InstanceSet...)
 			}
+
 		}
 
-		resp.Response.TotalCount = &tmpTotalCount
-		resp.Response.InstanceSet = tmpInstanceSet
+		tmpResp.Response = &cvm.DescribeInstancesResponseParams{
+			TotalCount:  &tmpTotalCount,
+			InstanceSet: tmpInstanceSet,
+		}
+
+		resp = tmpResp
 	}
 
 	return resp, nil
@@ -748,6 +783,7 @@ func spliteInstanceIds(slice []*string, size int) [][]*string {
 		if end > len(slice) {
 			end = len(slice)
 		}
+
 		result = append(result, slice[i:end])
 	}
 

tencentcloud/services/tke/resource_tc_kubernetes_scale_worker_extension.go

@@ -124,7 +124,7 @@ The following arguments are supported:
 
 * `cluster_id` - (Required, String, ForceNew) ID of the cluster.
 * `worker_config` - (Required, List, ForceNew) Deploy the machine configuration information of the 'WORK' service, and create <=20 units for common users.
-* `create_result_output_file` - (Optional, String) Used to save results of CVMs creation error messages.
+* `create_result_output_file` - (Optional, String, ForceNew) Used to save results of CVMs creation error messages.
 * `data_disk` - (Optional, List, ForceNew) Configurations of tke data disk.
 * `desired_pod_num` - (Optional, Int, ForceNew) Indicate to set desired pod number in current node. Valid when the cluster enable customized pod cidr.
 * `docker_graph_path` - (Optional, String, ForceNew) Docker graph path. Default is `/var/lib/docker`.