optimize code and style

Author: crab21

tencentcloud/internal/helper/helper.go

@@ -12,7 +12,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/hashcode"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/pkg/errors"
-	tke "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525"
 )
 
 // Generates a hash for the set hash function used by the IDs
@@ -41,16 +40,6 @@ func GetTags(d *schema.ResourceData, k string) map[string]string {
 	return tags
 }
 
-func GetLabels(d *schema.ResourceData, k string) []*tke.Label {
-	labels := make([]*tke.Label, 0)
-	if raw, ok := d.GetOk(k); ok {
-		for k, v := range raw.(map[string]interface{}) {
-			labels = append(labels, &tke.Label{Name: String(k), Value: String(v.(string))})
-		}
-	}
-	return labels
-}
-
 func BuildToken() string {
 	buf := make([]byte, 16)
 	_, _ = rand.Read(buf)

tencentcloud/resource_tc_kubernetes_as_scaling_group.go

@@ -71,6 +71,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	as "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/as/v20180419"
 	sdkErrors "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
+	tke "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525"
 	"github.com/terraform-providers/terraform-provider-tencentcloud/tencentcloud/internal/helper"
 )
 
@@ -714,8 +715,9 @@ func resourceKubernetesAsScalingGroupRead(d *schema.ResourceData, meta interface
 		return nil
 	}
 
+	var clusterAsGroupSet *tke.ClusterAsGroup
 	err = resource.Retry(readRetryTimeout, func() *resource.RetryError {
-		clusterAsGroupSet, err := service.DescribeClusterAsGroupsByGroupId(ctx, clusterId, asGroupId)
+		clusterAsGroupSet, err = service.DescribeClusterAsGroupsByGroupId(ctx, clusterId, asGroupId)
 		if err != nil {
 			return retryError(err)
 		}
@@ -727,18 +729,17 @@ func resourceKubernetesAsScalingGroupRead(d *schema.ResourceData, meta interface
 		labels := clusterAsGroupSet.Labels
 		var labelsMap = make(map[string]string, len(labels))
 
-		if len(labels) == 0 {
-			d.Set("labels", labelsMap)
-			return nil
-		}
-
 		for _, v := range labels {
 			labelsMap[*v.Name] = *v.Value
 		}
 		d.Set("labels", labelsMap)
 		return nil
 	})
 
+	if clusterAsGroupSet == nil {
+		d.SetId("")
+	}
+
 	return err
 }
 
@@ -767,7 +768,7 @@ func resourceKubernetesAsScalingGroupCreate(d *schema.ResourceData, meta interfa
 		return err
 	}
 
-	labels := helper.GetLabels(d, "labels")
+	labels := GetTkeLabels(d, "labels")
 
 	service := TkeService{client: meta.(*TencentCloudClient).apiV3Conn}
 

tencentcloud/resource_tc_kubernetes_cluster.go

@@ -959,8 +959,7 @@ func resourceTencentCloudTkeClusterCreate(d *schema.ResourceData, meta interface
 
 	tags := helper.GetTags(d, "tags")
 
-	labels := helper.GetLabels(d, "labels")
-	iAdvanced.Labels = labels
+	iAdvanced.Labels = GetTkeLabels(d, "labels")
 
 	service := TkeService{client: meta.(*TencentCloudClient).apiV3Conn}
 

tencentcloud/resource_tc_kubernetes_cluster_attachment.go

@@ -283,8 +283,7 @@ func resourceTencentCloudTkeClusterAttachmentCreate(d *schema.ResourceData, meta
 
 	request.InstanceAdvancedSettings = &tke.InstanceAdvancedSettings{}
 
-	labels := helper.GetLabels(d, "labels")
-	request.InstanceAdvancedSettings.Labels = labels
+	request.InstanceAdvancedSettings.Labels = GetTkeLabels(d, "labels")
 
 	/*cvm has been  attached*/
 	var err error

tencentcloud/service_tencentcloud_tke.go

@@ -6,6 +6,7 @@ import (
 	"log"
 	"strings"
 
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	tke "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525"
 	"github.com/terraform-providers/terraform-provider-tencentcloud/tencentcloud/connectivity"
 	"github.com/terraform-providers/terraform-provider-tencentcloud/tencentcloud/internal/helper"
@@ -524,7 +525,7 @@ func (me *TkeService) DescribeClusterAsGroupsByGroupId(ctx context.Context, id s
 	response, err := me.client.UseTkeClient().DescribeClusterAsGroups(request)
 
 	if err != nil {
-		log.Printf("[CRITAL]%s api[%s] fail, reason[%s]\n", logId, request.GetAction(), errRet.Error())
+		log.Printf("[CRITAL]%s api[%s] fail, reason[%s]\n", logId, request.GetAction(), err.Error())
 		errRet = err
 		return
 	}
@@ -750,3 +751,13 @@ func (me *TkeService) DescribeImages(ctx context.Context) (imageIds []string, er
 	}
 	return
 }
+
+func GetTkeLabels(d *schema.ResourceData, k string) []*tke.Label {
+	labels := make([]*tke.Label, 0)
+	if raw, ok := d.GetOk(k); ok {
+		for k, v := range raw.(map[string]interface{}) {
+			labels = append(labels, &tke.Label{Name: helper.String(k), Value: helper.String(v.(string))})
+		}
+	}
+	return labels
+}