optimize logic and modify labels describtion

Author: crab21

tencentcloud/internal/helper/helper.go

@@ -12,6 +12,7 @@ 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
@@ -40,6 +41,16 @@ 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,7 +71,6 @@ 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"
 )
 
@@ -111,7 +110,7 @@ func ResourceTencentCloudKubernetesAsScalingGroup() *schema.Resource {
 				Type:        schema.TypeMap,
 				Optional:    true,
 				ForceNew:    true,
-				Description: "Labels of kubernetes AS Group.",
+				Description: "Labels of kubernetes AS Group created nodes.",
 			},
 		},
 	}
@@ -726,22 +725,21 @@ 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
 		}
 
-		var labelsMap = map[string]string{}
 		for _, v := range labels {
 			labelsMap[*v.Name] = *v.Value
 		}
 		d.Set("labels", labelsMap)
 		return nil
 	})
 
-	if err != nil {
-		return err
-	}
-	return nil
+	return err
 }
 
 func resourceKubernetesAsScalingGroupCreate(d *schema.ResourceData, meta interface{}) error {
@@ -769,17 +767,7 @@ func resourceKubernetesAsScalingGroupCreate(d *schema.ResourceData, meta interfa
 		return err
 	}
 
-	labels := make([]*tke.Label, 0)
-	if v, ok := d.GetOk("labels"); ok {
-		vlabels := v.(map[string]interface{})
-		for key, value := range vlabels {
-			valueResult, ok := value.(string)
-			if !ok {
-				continue
-			}
-			labels = append(labels, &tke.Label{Name: helper.String(key), Value: helper.String(valueResult)})
-		}
-	}
+	labels := helper.GetLabels(d, "labels")
 
 	service := TkeService{client: meta.(*TencentCloudClient).apiV3Conn}
 

tencentcloud/resource_tc_kubernetes_cluster.go

@@ -136,7 +136,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
 	cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312"
-	tke "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525"
 	"github.com/terraform-providers/terraform-provider-tencentcloud/tencentcloud/internal/helper"
 )
 
@@ -604,7 +603,7 @@ func resourceTencentCloudTkeCluster() *schema.Resource {
 			Type:        schema.TypeMap,
 			Optional:    true,
 			ForceNew:    true,
-			Description: "Labels of tke cluster.",
+			Description: "Labels of tke cluster nodes.",
 		},
 	}
 
@@ -960,19 +959,8 @@ func resourceTencentCloudTkeClusterCreate(d *schema.ResourceData, meta interface
 
 	tags := helper.GetTags(d, "tags")
 
-	labels := make([]*tke.Label, 0)
-	if v, ok := d.GetOk("labels"); ok {
-		vlabels := v.(map[string]interface{})
-		for key, value := range vlabels {
-			valueResult, ok := value.(string)
-			if !ok {
-				continue
-			}
-			labels = append(labels, &tke.Label{Name: helper.String(key), Value: helper.String(valueResult)})
-		}
-
-		iAdvanced.Labels = labels
-	}
+	labels := helper.GetLabels(d, "labels")
+	iAdvanced.Labels = labels
 
 	service := TkeService{client: meta.(*TencentCloudClient).apiV3Conn}
 

tencentcloud/resource_tc_kubernetes_cluster_attachment.go

@@ -283,19 +283,8 @@ func resourceTencentCloudTkeClusterAttachmentCreate(d *schema.ResourceData, meta
 
 	request.InstanceAdvancedSettings = &tke.InstanceAdvancedSettings{}
 
-	labels := make([]*tke.Label, 0)
-	if v, ok := d.GetOk("labels"); ok {
-		vlabels := v.(map[string]interface{})
-		for key, value := range vlabels {
-			valueResult, ok := value.(string)
-			if !ok {
-				continue
-			}
-			labels = append(labels, &tke.Label{Name: helper.String(key), Value: helper.String(valueResult)})
-		}
-
-		request.InstanceAdvancedSettings.Labels = labels
-	}
+	labels := helper.GetLabels(d, "labels")
+	request.InstanceAdvancedSettings.Labels = labels
 
 	/*cvm has been  attached*/
 	var err error

website/docs/r/kubernetes_as_scaling_group.html.markdown

@@ -74,7 +74,7 @@ The following arguments are supported:
 * `auto_scaling_config` - (Required, ForceNew) Auto scaling config parameters.
 * `auto_scaling_group` - (Required, ForceNew) Auto scaling group parameters.
 * `cluster_id` - (Required, ForceNew) ID of the cluster.
-* `labels` - (Optional, ForceNew) Labels of kubernetes AS Group.
+* `labels` - (Optional, ForceNew) Labels of kubernetes AS Group created nodes.
 
 The `auto_scaling_config` object supports the following:
 

website/docs/r/kubernetes_cluster.html.markdown

@@ -150,7 +150,7 @@ The following arguments are supported:
 * `cluster_version` - (Optional, ForceNew) Version of the cluster, Default is '1.10.5'.
 * `container_runtime` - (Optional, ForceNew) Runtime type of the cluster, the available values include: 'docker' and 'containerd'. Default is 'docker'.
 * `ignore_cluster_cidr_conflict` - (Optional, ForceNew) Indicates whether to ignore the cluster cidr conflict error. Default is false.
-* `labels` - (Optional, ForceNew) Labels of tke cluster.
+* `labels` - (Optional, ForceNew) Labels of tke cluster nodes.
 * `managed_cluster_internet_security_policies` - (Optional) Security policies for managed cluster internet, like:'192.168.1.0/24' or '113.116.51.27', '0.0.0.0/0' means all. This field can only set when field `cluster_deploy_type` is 'MANAGED_CLUSTER' and `cluster_internet` is true. `managed_cluster_internet_security_policies` can not delete or empty once be set.
 * `master_config` - (Optional, ForceNew) Deploy the machine configuration information of the 'MASTER_ETCD' service, and create <=7 units for common users.
 * `project_id` - (Optional, ForceNew) Project ID, default value is 0.