Merge remote-tracking branch 'upstream/master'

Author: cyberHermanwang

CHANGELOG.md

@@ -40,22 +40,24 @@ func main() {
 	filePath := filepath.Dir(filename)
 	message("generating doc from: %s\n", filePath)
 
-	// document for DataSources
-	for k, v := range provider.DataSourcesMap {
-		genDoc("data_source", filePath, k, v)
-	}
+	// document for Index
+	products := genIdx(filePath)
 
-	// document for Resources
-	for k, v := range provider.ResourcesMap {
-		genDoc("resource", filePath, k, v)
-	}
+	for _, product := range products {
+		// document for DataSources
+		for _, dataSource := range product.DataSources {
+			genDoc(product.Name, "data_source", filePath, dataSource, provider.DataSourcesMap[dataSource])
+		}
 
-	// document for Index
-	genIdx(filePath)
+		// document for Resources
+		for _, resource := range product.Resources {
+			genDoc(product.Name, "resource", filePath, resource, provider.ResourcesMap[resource])
+		}
+	}
 }
 
 // genIdx generating index for resource
-func genIdx(filePath string) {
+func genIdx(filePath string) (prods []Product) {
 	filename := "provider.go"
 
 	message("[START]get description from file: %s\n", filename)
@@ -81,7 +83,7 @@ func genIdx(filePath string) {
 	doc := strings.TrimSpace(description[pos+16:])
 	// description = strings.TrimSpace(description[:pos])
 
-	prods, err := GetIndex(doc)
+	prods, err = GetIndex(doc)
 	if err != nil {
 		message("[FAIL!]: %s", err)
 		os.Exit(1)
@@ -111,11 +113,13 @@ func genIdx(filePath string) {
 	}
 
 	message("[SUCC.]write doc to file success: %s", filename)
+	return
 }
 
 // genDoc generating doc for data source and resource
-func genDoc(dtype, fpath, name string, resource *schema.Resource) {
+func genDoc(product, dtype, fpath, name string, resource *schema.Resource) {
 	data := map[string]string{
+		"product":           product,
 		"name":              name,
 		"dtype":             strings.Replace(dtype, "_", "", -1),
 		"resource":          name[len(cloudMark)+1:],

gendoc/main.go

@@ -2,6 +2,7 @@ package main
 
 const (
 	docTPL = `---
+subcategory: "{{.product}}"
 layout: "{{.cloud_mark}}"
 page_title: "{{.cloud_title}}: {{.name}}"
 sidebar_current: "docs-{{.cloud_mark}}-{{.dtype}}-{{.resource}}"

gendoc/template.go

@@ -16,7 +16,6 @@ require (
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/pkg/errors v0.9.1
 	github.com/tencentcloud/tencentcloud-sdk-go v3.0.229+incompatible
-	github.com/terraform-providers/terraform-provider-tencentcloud v1.38.3 // indirect
 	github.com/yangwenmai/ratelimit v0.0.0-20180104140304-44221c2292e1
 	github.com/zclconf/go-cty v1.4.2 // indirect
 	golang.org/x/sys v0.0.0-20200523222454-059865788121 // indirect

go.mod

@@ -458,11 +458,8 @@ github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/tdakkota/asciicheck v0.0.0-20200416190851-d7f85be797a2 h1:Xr9gkxfOP0KQWXKNqmwe8vEeSUiUj4Rlee9CMVX2ZUQ=
 github.com/tdakkota/asciicheck v0.0.0-20200416190851-d7f85be797a2/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM=
-github.com/tencentcloud/tencentcloud-sdk-go v3.0.196+incompatible/go.mod h1:0PfYow01SHPMhKY31xa+EFz2RStxIqj6JFAJS+IkCi4=
 github.com/tencentcloud/tencentcloud-sdk-go v3.0.229+incompatible h1:ZlFfQuJYC+g2bEjlZUvIUQUifHhzWM69GTzFh0qzLl4=
 github.com/tencentcloud/tencentcloud-sdk-go v3.0.229+incompatible/go.mod h1:0PfYow01SHPMhKY31xa+EFz2RStxIqj6JFAJS+IkCi4=
-github.com/terraform-providers/terraform-provider-tencentcloud v1.38.3 h1:1RfGV7CiPmeyrG41LdvuJ3CmPao2QxHnEQnXKqVAxSk=
-github.com/terraform-providers/terraform-provider-tencentcloud v1.38.3/go.mod h1:5jcaioF+8fIC9h4RBZV0e32uanncMZr5c2/8p/CWCU8=
 github.com/tetafro/godot v0.3.7 h1:+mecr7RKrUKB5UQ1gwqEMn13sDKTyDR8KNIquB9mm+8=
 github.com/tetafro/godot v0.3.7/go.mod h1:/7NLHhv08H1+8DNj0MElpAACw1ajsCuf3TKNQxA5S+0=
 github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e h1:RumXZ56IrCj4CL+g1b9OL/oH0QnsF976bC8xQFYUD5Q=

go.sum

@@ -153,7 +153,7 @@ func TencentMongodbBasicInfo() map[string]*schema.Schema {
 		"tags": {
 			Type:        schema.TypeMap,
 			Optional:    true,
-			Description: "The tags of the Mongodb.",
+			Description: "The tags of the Mongodb. Key name `project` is system reserved and can't be used.",
 		},
 		// payment
 		"charge_type": {

tencentcloud/extension_mongodb.go

@@ -366,6 +366,9 @@ func resourceTencentCloudMongodbInstanceRead(d *schema.ResourceData, meta interf
 		if tag.TagValue == nil {
 			return errors.New("mongodb tag value is nil")
 		}
+		if *tag.TagKey == "project" {
+			continue
+		}
 
 		tags[*tag.TagKey] = *tag.TagValue
 	}

tencentcloud/resource_tc_mongodb_instance.go

@@ -361,6 +361,9 @@ func resourceMongodbShardingInstanceRead(d *schema.ResourceData, meta interface{
 		if tag.TagValue == nil {
 			return errors.New("mongodb tag value is nil")
 		}
+		if *tag.TagKey == "project" {
+			continue
+		}
 
 		tags[*tag.TagKey] = *tag.TagValue
 	}

tencentcloud/resource_tc_mongodb_sharding_instance.go

@@ -421,6 +421,9 @@ func resourceTencentCloudMongodbStandbyInstanceRead(d *schema.ResourceData, meta
 		if tag.TagValue == nil {
 			return errors.New("mongodb tag value is nil")
 		}
+		if *tag.TagKey == "project" {
+			continue
+		}
 
 		tags[*tag.TagKey] = *tag.TagValue
 	}