merge master

Author: likexian

CHANGELOG.md

@@ -1,4 +1,13 @@
-## 1.21.2 (Unreleased)
+## 1.21.3 (Unreleased)
+## 1.21.2 (October 29, 2019)
+
+BUG FIXES:
+
+* Resource: `tencentcloud_gaap_realserver` add ip/domain exists check
+* Resource: `tencentcloud_kubernetes_cluster` add error handling logic and optional argument `tags`.
+* Resource: `tencentcloud_kubernetes_scale_worker` add error handling logic.
+* Data Source: `tencentcloud_kubernetes_clusters` add optional argument `tags`.
+
 ## 1.21.1 (October 23, 2019)
 
 ENHANCEMENTS:

examples/tencentcloud-tke/main.tf

@@ -30,6 +30,10 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
   }
 
   cluster_deploy_type = "MANAGED_CLUSTER"
+
+  tags = {
+    "test" = "test"
+  }
 }
 
 #examples for INDEPENDENT_CLUSTER  cluster

gendoc/gendoc_test.go

@@ -83,15 +83,15 @@ resource "tencentcloud_cos_bucket" "mycos" {
 func TestContainsBigSymbol(t *testing.T) {
 	cases := "中国人繁體字ａｂｃＡＢＣ～！＠＃￥％…＆（）—＋｛｝｜：“”《》？１２３４５６７８９０－＝【】＼；‘’，。、　"
 	for _, c := range cases {
-		if ContainsBigSymbol(string(c)) == "" {
+		if containsBigSymbol(string(c)) == "" {
 			t.Log(c)
 			t.Errorf("Expected %s to be Chinese symbol", string(c))
 		}
 	}
 
 	cases = "abcABC~!@#$%^&*()_+{}|:\"<>?`1234567890-=[]\\;',./ \t\r\n"
 	for _, c := range cases {
-		if ContainsBigSymbol(string(c)) != "" {
+		if containsBigSymbol(string(c)) != "" {
 			t.Errorf("Expected %s not to be Chinese symbol", string(c))
 		}
 	}

gendoc/main.go

@@ -63,9 +63,11 @@ func genIdx(fpath string) {
 		Resources    [][]string
 	}
 
-	resources := ""
-	dataSources := []Index{}
-	sources := []Index{}
+	var (
+		resources   string
+		dataSources []Index
+		sources     []Index
+	)
 
 	fname := "provider.go"
 	message("[START]get description from file: %s\n", fname)
@@ -212,10 +214,21 @@ func genDoc(dtype, fpath, name string, resource *schema.Resource) {
 		data["description_short"] = description
 	}
 
-	requiredArgs := []string{}
-	optionalArgs := []string{}
-	attributes := []string{}
-	subStruct := []string{}
+	var (
+		requiredArgs []string
+		optionalArgs []string
+		attributes   []string
+		subStruct    []string
+	)
+
+	if _, ok := resource.Schema["result_output_file"]; dtype == "data_source" && !ok {
+		if resource.DeprecationMessage != "" {
+			message("[SKIP!]argument 'result_output_file' is missing, skip: %s", fname)
+		} else {
+			message("[FAIL!]argument 'result_output_file' is missing: %s", fname)
+			os.Exit(1)
+		}
+	}
 
 	for k, v := range resource.Schema {
 		if v.Description == "" {
@@ -307,7 +320,7 @@ func genDoc(dtype, fpath, name string, resource *schema.Resource) {
 
 // getAttributes get attributes from schema
 func getAttributes(step int, k string, v *schema.Schema) []string {
-	attributes := []string{}
+	var attributes []string
 	ident := strings.Repeat(" ", step*2)
 
 	if v.Description == "" {
@@ -321,14 +334,14 @@ func getAttributes(step int, k string, v *schema.Schema) []string {
 			v.Description = fmt.Sprintf("(**Deprecated**) %s %s", v.Deprecated, v.Description)
 		}
 		if _, ok := v.Elem.(*schema.Resource); ok {
-			listAttributes := []string{}
+			var listAttributes []string
 			for kk, vv := range v.Elem.(*schema.Resource).Schema {
 				attrs := getAttributes(step+1, kk, vv)
 				if len(attrs) > 0 {
 					listAttributes = append(listAttributes, attrs...)
 				}
 			}
-			slistAttributes := ""
+			var slistAttributes string
 			sort.Strings(listAttributes)
 			if len(listAttributes) > 0 {
 				slistAttributes = "\n" + strings.Join(listAttributes, "\n")
@@ -356,20 +369,22 @@ func getFileDescription(fname string) (string, error) {
 
 // getSubStruct get sub structure from go file
 func getSubStruct(step int, k string, v *schema.Schema) []string {
-	subStructs := []string{}
+	var subStructs []string
 
 	if v.Description == "" {
 		return subStructs
 	} else {
 		checkDescription(k, v.Description)
 	}
 
-	subStruct := []string{}
+	var subStruct []string
 	if v.Type == schema.TypeMap || v.Type == schema.TypeList || v.Type == schema.TypeSet {
 		if _, ok := v.Elem.(*schema.Resource); ok {
 			subStruct = append(subStruct, fmt.Sprintf("\nThe `%s` object supports the following:\n", k))
-			requiredArgs := []string{}
-			optionalArgs := []string{}
+			var (
+				requiredArgs []string
+				optionalArgs []string
+			)
 			for kk, vv := range v.Elem.(*schema.Resource).Schema {
 				if vv.Required {
 					opt := "Required"
@@ -402,7 +417,7 @@ func getSubStruct(step int, k string, v *schema.Schema) []string {
 
 // formatHCL format HLC code
 func formatHCL(s string) string {
-	rr := []string{}
+	var rr []string
 
 	s = strings.TrimSpace(s)
 	m := hclMatch.FindAllStringSubmatch(s, -1)

go.sum

@@ -496,6 +496,7 @@ github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxr
 github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041 h1:llrF3Fs4018ePo4+G/HV/uQUqEI1HMDjCeOf2V6puPc=
 github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=

tencentcloud/connectivity/client.go

@@ -44,8 +44,8 @@ type TencentCloudClient struct {
 	mongodbConn *mongodb.Client
 	tkeConn     *tke.Client
 	camConn     *cam.Client
-	gaapCoon    *gaap.Client
-	sslCoon     *ssl.Client
+	gaapConn    *gaap.Client
+	sslConn     *ssl.Client
 }
 
 // NewTencentCloudClient returns a new TencentCloudClient
@@ -245,28 +245,28 @@ func (me *TencentCloudClient) UseTkeClient() *tke.Client {
 
 // UseGaapClient returns gaap client for service
 func (me *TencentCloudClient) UseGaapClient() *gaap.Client {
-	if me.gaapCoon != nil {
-		return me.gaapCoon
+	if me.gaapConn != nil {
+		return me.gaapConn
 	}
 
 	cpf := newTencentCloudClientProfile(300)
-	me.gaapCoon, _ = gaap.NewClient(me.Credential, me.Region, cpf)
-	me.gaapCoon.WithHttpTransport(&LogRoundTripper{})
+	me.gaapConn, _ = gaap.NewClient(me.Credential, me.Region, cpf)
+	me.gaapConn.WithHttpTransport(&LogRoundTripper{})
 
-	return me.gaapCoon
+	return me.gaapConn
 }
 
 // UseSslClient returns ssl client for service
 func (me *TencentCloudClient) UseSslClient() *ssl.Client {
-	if me.sslCoon != nil {
-		return me.sslCoon
+	if me.sslConn != nil {
+		return me.sslConn
 	}
 
 	cpf := newTencentCloudClientProfile(300)
-	me.sslCoon, _ = ssl.NewClient(me.Credential, me.Region, cpf)
-	me.sslCoon.WithHttpTransport(&LogRoundTripper{})
+	me.sslConn, _ = ssl.NewClient(me.Credential, me.Region, cpf)
+	me.sslConn.WithHttpTransport(&LogRoundTripper{})
 
-	return me.sslCoon
+	return me.sslConn
 }
 
 // UseCamClient returns cam client for service

tencentcloud/data_source_tc_image.go

@@ -101,6 +101,11 @@ func dataSourceTencentCloudSourceImages() *schema.Resource {
 				ValidateFunc: validateNotEmpty,
 				Description:  "A string to apply with fuzzy match to the os_name atrribute on the image list returned by TencentCloud. **NOTE**: when os_name is provided, highest priority is applied in this field instead of `image_name_regex`.",
 			},
+			"result_output_file": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "Used to save results.",
+			},
 			"image_id": {
 				Type:        schema.TypeString,
 				Computed:    true,
@@ -197,12 +202,17 @@ func dataSourceTencentCloudImagesRead(d *schema.ResourceData, meta interface{})
 		return errors.New("No image found")
 	}
 
-	id := dataResourceIdHash(resultImageId)
-	d.SetId(id)
-
+	d.SetId(dataResourceIdHash(resultImageId))
 	if err := d.Set("image_id", resultImageId); err != nil {
 		return err
 	}
 
+	output, ok := d.GetOk("result_output_file")
+	if ok && output.(string) != "" {
+		if err = writeToFile(output.(string), resultImageId); err != nil {
+			return err
+		}
+	}
+
 	return nil
 }

tencentcloud/data_source_tc_kubernetes_clusters.go

@@ -4,22 +4,23 @@ Use this data source to query detailed information of kubernetes clusters.
 Example Usage
 
 ```hcl
-data "tencentcloud_kubernetes_clusters"  "name" {
-    cluster_name ="terraform"
+data "tencentcloud_kubernetes_clusters" "name" {
+  cluster_name ="terraform"
 }
 
-data "tencentcloud_kubernetes_clusters"  "id" {
-    cluster_id ="cls-godovr32"
+data "tencentcloud_kubernetes_clusters" "id" {
+  cluster_id ="cls-godovr32"
 }
 ```
 */
 package tencentcloud
 
 import (
 	"context"
+	"log"
+
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/helper/schema"
-	"log"
 )
 
 func tkeClusterInfo() map[string]*schema.Schema {
@@ -93,7 +94,7 @@ func tkeClusterInfo() map[string]*schema.Schema {
 		"cluster_node_num": {
 			Type:        schema.TypeInt,
 			Computed:    true,
-			Description: "Number of nodes in the  cluster.",
+			Description: "Number of nodes in the cluster.",
 		},
 		"worker_instances_list": {
 			Type:        schema.TypeList,
@@ -103,6 +104,11 @@ func tkeClusterInfo() map[string]*schema.Schema {
 				Schema: tkeCvmState(),
 			},
 		},
+		"tags": {
+			Type:        schema.TypeMap,
+			Computed:    true,
+			Description: "Tags of the cluster.",
+		},
 	}
 
 	for k, v := range tkeSecurityInfo() {
@@ -128,12 +134,17 @@ func dataSourceTencentCloudKubernetesClusters() *schema.Resource {
 				Optional:      true,
 				Description:   "Name of the cluster. Conflict with cluster_id, can not be set at the same time.",
 			},
-
+			"tags": {
+				Type:        schema.TypeMap,
+				Optional:    true,
+				Description: "Tags of the cluster.",
+			},
 			"result_output_file": {
 				Type:        schema.TypeString,
 				Optional:    true,
 				Description: "Used to save results.",
 			},
+
 			"list": {
 				Type:        schema.TypeList,
 				Computed:    true,
@@ -156,8 +167,10 @@ func dataSourceTencentCloudKubernetesClustersRead(d *schema.ResourceData, meta i
 		client: meta.(*TencentCloudClient).apiV3Conn,
 	}
 
-	id := ""
-	name := ""
+	var (
+		id   string
+		name string
+	)
 
 	if v, ok := d.GetOk("cluster_id"); ok {
 		id = v.(string)
@@ -167,8 +180,9 @@ func dataSourceTencentCloudKubernetesClustersRead(d *schema.ResourceData, meta i
 		name = v.(string)
 	}
 
-	infos, err := service.DescribeClusters(ctx, id, name)
+	tags := getTags(d, "tags")
 
+	infos, err := service.DescribeClusters(ctx, id, name)
 	if err != nil && id == "" {
 		err = resource.Retry(readRetryTimeout, func() *resource.RetryError {
 			infos, err = service.DescribeClusters(ctx, id, name)
@@ -193,7 +207,16 @@ func dataSourceTencentCloudKubernetesClustersRead(d *schema.ResourceData, meta i
 		}
 	}
 
+LOOP:
 	for _, info := range infos {
+		if len(tags) > 0 {
+			for k, v := range tags {
+				if info.Tags[k] != v {
+					continue LOOP
+				}
+			}
+		}
+
 		var infoMap = map[string]interface{}{}
 		infoMap["cluster_name"] = info.ClusterName
 		infoMap["cluster_desc"] = info.ClusterDescription
@@ -208,6 +231,7 @@ func dataSourceTencentCloudKubernetesClustersRead(d *schema.ResourceData, meta i
 		infoMap["cluster_max_pod_num"] = info.MaxClusterServiceNum
 		infoMap["cluster_max_service_num"] = info.MaxClusterServiceNum
 		infoMap["cluster_node_num"] = info.ClusterNodeNum
+		infoMap["tags"] = info.Tags
 
 		_, workers, err := service.DescribeClusterInstances(ctx, info.ClusterId)
 		if err != nil {