add tag with resource datasource NAT POSTGRE and add cos_bucket_url with COS

Author: gailwang

CHANGELOG.md

@@ -1,4 +1,14 @@
 ## 1.45.4 (Unreleased)
+
+ENHANCEMENTS:
+
+* Resource: `tencentcloud_cos_bucket` add new argument `cos_bucket_url`.
+* Resource: `tencentcloud_nat_gateway` add new argument `tags`.
+* Resource: `tencentcloud_postgresql_instance` add new argument `tags`.
+* Data Source: `tencentcloud_cos_buckets` add new argument `cos_bucket_url`.
+* Data Source: `tencentcloud_nat_gateways` add new argument `tags`.
+* Data Source: `tencentcloud_postgresql_instances` add new argument `tags`.
+
 ## 1.45.3 (October 21, 2020)
 
 BUG FIXES:

go.sum

@@ -458,8 +458,6 @@ 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 v1.0.25 h1:tLExcllerEwYTIx/58PA9r5v69uPfpc2yf6DLtDggTo=
-github.com/tencentcloud/tencentcloud-sdk-go v1.0.25/go.mod h1:asUz5BPXxgoPGaRgZaVm1iGcUAuHyYUo1nXqKa83cvI=
 github.com/tencentcloud/tencentcloud-sdk-go v1.0.37 h1:zNJfC6+5sj/OloSq6GzmdSC9lwlZbgQ438zz3qH+v4k=
 github.com/tencentcloud/tencentcloud-sdk-go v1.0.37/go.mod h1:asUz5BPXxgoPGaRgZaVm1iGcUAuHyYUo1nXqKa83cvI=
 github.com/tetafro/godot v0.3.7 h1:+mecr7RKrUKB5UQ1gwqEMn13sDKTyDR8KNIquB9mm+8=

tencentcloud/data_source_tc_cos_buckets.go

@@ -173,6 +173,11 @@ func dataSourceTencentCloudCosBuckets() *schema.Resource {
 							Computed:    true,
 							Description: "The tags of a bucket.",
 						},
+						"cos_bucket_url": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "The URL of this cos bucket.",
+						},
 					},
 				},
 			},
@@ -234,7 +239,7 @@ LOOP:
 		}
 
 		bucket["tags"] = respTags
-
+		bucket["cos_bucket_url"] = fmt.Sprintf("%s.cos.%s.myqcloud.com", *v.Name, meta.(*TencentCloudClient).apiV3Conn.Region)
 		bucketList = append(bucketList, bucket)
 	}
 

tencentcloud/data_source_tc_cos_buckets_test.go

@@ -24,6 +24,7 @@ func TestAccTencentCloudCosBucketDataSource_basic(t *testing.T) {
 					resource.TestCheckResourceAttr("data.tencentcloud_cos_buckets.bucket_list", "bucket_list.0.cors_rules.#", "0"),
 					resource.TestCheckResourceAttr("data.tencentcloud_cos_buckets.bucket_list", "bucket_list.0.lifecycle_rules.#", "0"),
 					resource.TestCheckResourceAttr("data.tencentcloud_cos_buckets.bucket_list", "bucket_list.0.website.#", "0"),
+					resource.TestCheckResourceAttrSet("data.tencentcloud_cos_buckets.bucket_list", "bucket_list.0.cos_bucket_url"),
 				),
 			},
 		},

tencentcloud/data_source_tc_nat_gateways.go

@@ -96,6 +96,11 @@ func dataSourceTencentCloudNatGateways() *schema.Resource {
 							Computed:    true,
 							Description: "Create time of the NAT gateway.",
 						},
+						"tags": {
+							Type:        schema.TypeMap,
+							Computed:    true,
+							Description: "The available tags within this NAT gateway.",
+						},
 					},
 				},
 			},
@@ -170,6 +175,13 @@ func dataSourceTencentCloudNatGatewaysRead(d *schema.ResourceData, meta interfac
 			"assigned_eip_set": flattenAddressList((*nat).PublicIpAddressSet),
 			"create_time":      *nat.CreatedTime,
 		}
+		if nat.TagSet != nil {
+			tags := make(map[string]interface{}, len(nat.TagSet))
+			for _, t := range nat.TagSet {
+				tags[*t.Key] = *t.Value
+			}
+			mapping["tags"] = tags
+		}
 		natList = append(natList, mapping)
 		ids = append(ids, *nat.NatGatewayId)
 	}

tencentcloud/data_source_tc_nat_gateways_test.go

@@ -18,6 +18,7 @@ func TestAccTencentCloudNatGatewaysDataSource(t *testing.T) {
 					resource.TestCheckResourceAttr("data.tencentcloud_nat_gateways.multi_nat", "nats.#", "2"),
 					resource.TestCheckResourceAttr("data.tencentcloud_nat_gateways.multi_nat", "nats.0.name", "terraform_test_nats"),
 					resource.TestCheckResourceAttr("data.tencentcloud_nat_gateways.multi_nat", "nats.1.bandwidth", "500"),
+					resource.TestCheckResourceAttr("data.tencentcloud_nat_gateways.multi_nat", "nats.0.tags.tf", "test"),
 				),
 			},
 		},
@@ -44,6 +45,10 @@ resource "tencentcloud_nat_gateway" "dev_nat" {
   assigned_eip_set = [
     tencentcloud_eip.eip_dev_dnat.public_ip,
   ]
+
+  tags = {
+	tf = "test"
+	}
 }
 resource "tencentcloud_nat_gateway" "test_nat" {
   vpc_id           = tencentcloud_vpc.main.id

tencentcloud/data_source_tc_postgresql_instances.go

@@ -148,6 +148,11 @@ func dataSourceTencentCloudPostgresqlInstances() *schema.Resource {
 							Computed:    true,
 							Description: "Create time of the postgresql instance.",
 						},
+						"tags": {
+							Type:        schema.TypeMap,
+							Computed:    true,
+							Description: "The available tags within this postgresql.",
+						},
 					},
 				},
 			},
@@ -185,6 +190,8 @@ func dataSourceTencentCloudPostgresqlInstanceRead(d *schema.ResourceData, meta i
 
 	ids := make([]string, 0, len(instanceList))
 	list := make([]map[string]interface{}, 0, len(instanceList))
+	tcClient := meta.(*TencentCloudClient).apiV3Conn
+	tagService := &TagService{client: tcClient}
 
 	for _, v := range instanceList {
 		listItem := make(map[string]interface{})
@@ -222,6 +229,15 @@ func dataSourceTencentCloudPostgresqlInstanceRead(d *schema.ResourceData, meta i
 		} else {
 			listItem["charge_type"] = COMMON_PAYTYPE_POSTPAID
 		}
+
+		//the describe list API is delayed with argument `tag`
+		tagList, err := tagService.DescribeResourceTags(ctx, "postgres", "DBInstanceId", tcClient.Region, *v.DBInstanceId)
+		if err != nil {
+			return err
+		}
+
+		listItem["tags"] = tagList
+
 		list = append(list, listItem)
 		ids = append(ids, *v.DBInstanceId)
 	}

tencentcloud/data_source_tc_postgresql_instances_test.go

@@ -21,7 +21,6 @@ func TestAccTencentCloudDataPostgresqlInstances(t *testing.T) {
 					resource.TestCheckResourceAttr(testDataPostgresqlInstancesName, "instance_list.#", "1"),
 					resource.TestCheckResourceAttrSet(testDataPostgresqlInstancesName, "instance_list.0.id"),
 					resource.TestCheckResourceAttrSet(testDataPostgresqlInstancesName, "instance_list.0.create_time"),
-					resource.TestCheckResourceAttrSet(testDataPostgresqlInstancesName, "instance_list.0.id"),
 					resource.TestCheckResourceAttr(testDataPostgresqlInstancesName, "instance_list.0.charge_type", "POSTPAID_BY_HOUR"),
 					resource.TestCheckResourceAttr(testDataPostgresqlInstancesName, "instance_list.0.engine_version", "9.3.5"),
 					resource.TestCheckResourceAttr(testDataPostgresqlInstancesName, "instance_list.0.project_id", "0"),
@@ -31,6 +30,7 @@ func TestAccTencentCloudDataPostgresqlInstances(t *testing.T) {
 					resource.TestCheckResourceAttrSet(testDataPostgresqlInstancesName, "instance_list.0.private_access_port"),
 					resource.TestCheckResourceAttrSet(testDataPostgresqlInstancesName, "instance_list.0.public_access_switch"),
 					resource.TestCheckResourceAttrSet(testDataPostgresqlInstancesName, "instance_list.0.charset"),
+					resource.TestCheckResourceAttr(testDataPostgresqlInstancesName, "instance_list.0.tags.tf", "test"),
 				),
 			},
 		},
@@ -52,6 +52,10 @@ charset = "UTF8"
 project_id = 0
 memory = 2
 storage = 10
+
+	tags = {
+		tf = "test"
+	}
 }
 
 data "tencentcloud_postgresql_instances" "id_test"{

tencentcloud/resource_tc_cos_bucket.go

@@ -271,6 +271,12 @@ func resourceTencentCloudCosBucket() *schema.Resource {
 				Optional:    true,
 				Description: "The tags of a bucket.",
 			},
+			//computed
+			"cos_bucket_url": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "The URL of this cos bucket.",
+			},
 		},
 	}
 }
@@ -323,6 +329,8 @@ func resourceTencentCloudCosBucketRead(d *schema.ResourceData, meta interface{})
 		}
 	}
 
+	cosBuckeUrl := fmt.Sprintf("%s.cos.%s.myqcloud.com", d.Id(), meta.(*TencentCloudClient).apiV3Conn.Region)
+	_ = d.Set("cos_bucket_url", cosBuckeUrl)
 	// set bucket in the import case
 	if _, ok := d.GetOk("bucket"); !ok {
 		_ = d.Set("bucket", d.Id())

tencentcloud/resource_tc_cos_bucket_test.go

@@ -82,6 +82,7 @@ func TestAccTencentCloudCosBucket_basic(t *testing.T) {
 					testAccCheckCosBucketExists("tencentcloud_cos_bucket.bucket_basic"),
 					resource.TestCheckResourceAttr("tencentcloud_cos_bucket.bucket_basic", "encryption_algorithm", "AES256"),
 					resource.TestCheckResourceAttr("tencentcloud_cos_bucket.bucket_basic", "versioning_enable", "true"),
+					resource.TestCheckResourceAttrSet("tencentcloud_cos_bucket.bucket_basic", "cos_bucket_url"),
 				),
 			},
 			{