fix logic for describe tke group

Author: crab21

tencentcloud/resource_tc_kubernetes_as_scaling_group.go

@@ -715,29 +715,24 @@ func resourceKubernetesAsScalingGroupRead(d *schema.ResourceData, meta interface
 		return nil
 	}
 
-	err = resource.Retry(3*readRetryTimeout, func() *resource.RetryError {
-		groupId := []*string{&asGroupId}
-		_, clusterAsGroupSet, err := service.DescribeClusterAsGroupsByGroupId(ctx, clusterId, groupId)
-
+	err = resource.Retry(readRetryTimeout, func() *resource.RetryError {
+		clusterAsGroupSet, err := service.DescribeClusterAsGroupsByGroupId(ctx, clusterId, asGroupId)
 		if err != nil {
 			return retryError(err)
 		}
 
-		var labelsMap = map[string]string{}
-		if len(clusterAsGroupSet) == 0 {
-			d.Set("labels", labelsMap)
+		if clusterAsGroupSet == nil {
 			return nil
 		}
 
-		for _, value := range clusterAsGroupSet {
-			labels := value.Labels
-			if len(labels) == 0 {
-				continue
-			}
+		labels := clusterAsGroupSet.Labels
+		if len(labels) == 0 {
+			return nil
+		}
 
-			for _, v := range labels {
-				labelsMap[*v.Name] = *v.Value
-			}
+		var labelsMap = map[string]string{}
+		for _, v := range labels {
+			labelsMap[*v.Name] = *v.Value
 		}
 		d.Set("labels", labelsMap)
 		return nil
@@ -746,7 +741,6 @@ func resourceKubernetesAsScalingGroupRead(d *schema.ResourceData, meta interface
 	if err != nil {
 		return err
 	}
-
 	return nil
 }
 

tencentcloud/service_tencentcloud_tke.go

@@ -513,31 +513,25 @@ func (me *TkeService) CreateClusterAsGroup(ctx context.Context, id, groupPara, c
 	return
 }
 
-func (me *TkeService) DescribeClusterAsGroupsByGroupId(ctx context.Context, id string, groupId []*string) (totalCount *uint64, clusterAsGroupSet []*tke.ClusterAsGroup, errRet error) {
+func (me *TkeService) DescribeClusterAsGroupsByGroupId(ctx context.Context, id string, groupId string) (clusterAsGroupSet *tke.ClusterAsGroup, errRet error) {
 	logId := getLogId(ctx)
 	request := tke.NewDescribeClusterAsGroupsRequest()
 
-	defer func() {
-		if errRet != nil {
-			log.Printf("[CRITAL]%s api[%s] fail, reason[%s]\n", logId, request.GetAction(), errRet.Error())
-		}
-	}()
 	request.ClusterId = &id
-	if len(groupId) > 0 {
-		request.AutoScalingGroupIds = groupId
-	}
+	request.AutoScalingGroupIds = []*string{&groupId}
 
 	ratelimit.Check(request.GetAction())
-	response, errRet := me.client.UseTkeClient().DescribeClusterAsGroups(request)
+	response, err := me.client.UseTkeClient().DescribeClusterAsGroups(request)
 
-	if response == nil || response.Response == nil {
-		errRet = fmt.Errorf("DescribeClusterAsGroupsByGroupId return nil response")
+	if err != nil {
+		log.Printf("[CRITAL]%s api[%s] fail, reason[%s]\n", logId, request.GetAction(), errRet.Error())
+		errRet = err
 		return
 	}
 
-	totalCount = response.Response.TotalCount
-	clusterAsGroupSet = response.Response.ClusterAsGroupSet
-
+	if len(response.Response.ClusterAsGroupSet) > 0 {
+		clusterAsGroupSet = response.Response.ClusterAsGroupSet[0]
+	}
 	return
 }