fix(tke): [] fix paging instance of scale worker cannot work

Author: lyu571

tencentcloud/services/tke/resource_tc_kubernetes_scale_worker_extension.go

@@ -28,7 +28,10 @@ var WorkersNewWorkerInstancesList []map[string]interface{}
 var WorkersLabelsMap map[string]string
 
 func init() {
-
+	// need to support append by multiple calls when the paging occurred
+	WorkersNewWorkerInstancesList = make([]map[string]interface{}, 0)
+	WorkersLabelsMap = make(map[string]string)
+	WorkersInstanceIds = make([]*string, 0)
 }
 
 func customScaleWorkerResourceImporter(ctx context.Context, d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) {
@@ -91,9 +94,9 @@ func resourceTencentCloudKubernetesScaleWorkerReadPostRequest1(ctx context.Conte
 		}
 	}
 
-	WorkersNewWorkerInstancesList = make([]map[string]interface{}, 0, len(workers))
-	WorkersLabelsMap = make(map[string]string)
-	WorkersInstanceIds = make([]*string, 0)
+	// WorkersNewWorkerInstancesList = make([]map[string]interface{}, 0, len(workers))
+	// WorkersLabelsMap = make(map[string]string)
+	// WorkersInstanceIds = make([]*string, 0)
 	for sub, cvmInfo := range workers {
 		if _, ok := instanceMap[cvmInfo.InstanceId]; !ok {
 			continue
@@ -486,7 +489,7 @@ func resourceTencentCloudKubernetesScaleWorkerCreateOnStart(ctx context.Context)
 				return resource.NonRetryableError(fmt.Errorf("cluster all instances state is failed"))
 			} else {
 				e = fmt.Errorf("cluster instances is still initializing.")
-				return tccommon.RetryError(e)
+				return resource.RetryableError(e)
 			}
 		}
 	})

tencentcloud/services/tke/service_tencentcloud_tke.go

@@ -3424,26 +3424,47 @@ func (me *TkeService) DescribeKubernetesScaleWorkerById1(ctx context.Context, cl
 	request := tke.NewDescribeClusterInstancesRequest()
 	request.ClusterId = helper.String(clusterId)
 
+	ret = &tke.DescribeClusterInstancesResponseParams{
+		InstanceSet: make([]*tke.Instance, 0),
+		TotalCount:  new(uint64),
+	}
+
 	defer func() {
 		if errRet != nil {
 			log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n", logId, request.GetAction(), request.ToJsonString(), errRet.Error())
 		}
 	}()
 
-	ratelimit.Check(request.GetAction())
+	var offset int64 = 0
+	var pageSize int64 = 100
+	for {
+		request.Offset = &offset
+		request.Limit = &pageSize
+		ratelimit.Check(request.GetAction())
 
-	response, err := me.client.UseTkeClient().DescribeClusterInstances(request)
-	if err != nil {
-		errRet = err
-		return
-	}
-	log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
+		response, err := me.client.UseTkeClient().DescribeClusterInstances(request)
+		if err != nil {
+			errRet = err
+			return
+		}
+		log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
 
-	if err := resourceTencentCloudKubernetesScaleWorkerReadPostRequest1(ctx, request, response); err != nil {
-		return nil, err
-	}
+		if err := resourceTencentCloudKubernetesScaleWorkerReadPostRequest1(ctx, request, response); err != nil {
+			return nil, err
+		}
 
-	ret = response.Response
+		if response == nil || len(response.Response.InstanceSet) < 1 {
+			break
+		}
+		count := len(response.Response.InstanceSet)
+		ret.InstanceSet = append(ret.InstanceSet, response.Response.InstanceSet...)
+		*ret.TotalCount += *helper.IntUint64(count)
+
+		if count < int(pageSize) {
+			break
+		}
+		offset += pageSize
+	}
 	return
 }