Merge branch 'master' of https://github.com/tencentcloudstack/terraform-provider-tencentcloud

Author: hellertang

.changelog/1326.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/tencentcloud_teo_zone: change tag description from zoneName to zoneId
+```

tencentcloud/resource_tc_teo_zone.go

@@ -343,7 +343,7 @@ func resourceTencentCloudTeoZoneCreate(d *schema.ResourceData, meta interface{})
 	ctx := context.WithValue(context.TODO(), logIdKey, logId)
 	if tags := helper.GetTags(d, "tags"); len(tags) > 0 {
 		tagService := TagService{client: meta.(*TencentCloudClient).apiV3Conn}
-		resourceName := fmt.Sprintf("qcs::teo::uin/:zone/%s", zoneName)
+		resourceName := fmt.Sprintf("qcs::teo::uin/:zone/%s", zoneId)
 		if err := tagService.ModifyTags(ctx, resourceName, tags, nil); err != nil {
 			return err
 		}
@@ -507,7 +507,7 @@ func resourceTencentCloudTeoZoneRead(d *schema.ResourceData, meta interface{}) e
 
 	tcClient := meta.(*TencentCloudClient).apiV3Conn
 	tagService := &TagService{client: tcClient}
-	tags, err := tagService.DescribeResourceTags(ctx, "teo", "zone", "", *zone.ZoneName)
+	tags, err := tagService.DescribeResourceTags(ctx, "teo", "zone", "", zoneId)
 	if err != nil {
 		return err
 	}
@@ -605,7 +605,7 @@ func resourceTencentCloudTeoZoneUpdate(d *schema.ResourceData, meta interface{})
 		tagService := &TagService{client: tcClient}
 		oldTags, newTags := d.GetChange("tags")
 		replaceTags, deleteTags := diffTags(oldTags.(map[string]interface{}), newTags.(map[string]interface{}))
-		resourceName := BuildTagResourceName("teo", "zone", "", d.Get("zone_name").(string))
+		resourceName := BuildTagResourceName("teo", "zone", "", zoneId)
 		if err := tagService.ModifyTags(ctx, resourceName, replaceTags, deleteTags); err != nil {
 			return err
 		}

tencentcloud/resource_tc_teo_zone_test.go

@@ -61,7 +61,7 @@ func TestAccTencentCloudTeoZone_basic(t *testing.T) {
 					resource.TestCheckResourceAttr("tencentcloud_teo_zone.basic", "type", "full"),
 					resource.TestCheckResourceAttr("tencentcloud_teo_zone.basic", "paused", "false"),
 					resource.TestCheckResourceAttr("tencentcloud_teo_zone.basic", "cname_speed_up", "enabled"),
-					//resource.TestCheckResourceAttr("tencentcloud_teo_zone.basic", "vanity_name_servers.0.servers", ""),
+					resource.TestCheckResourceAttr("tencentcloud_teo_zone.basic", "tags.createdBy", "terraform"),
 				),
 			},
 			//{
@@ -122,13 +122,12 @@ resource "tencentcloud_teo_zone" "basic" {
   cname_speed_up          = "enabled"
   plan_type               = "ent_with_bot"
   paused                  = false
-  tags                    = {}
   type                    = "full"
   zone_name               = "tf-teo.xyz"
 
-  #tags = {
-  #  "TestKey" = "terraform"
-  #}
+  tags = {
+    "createdBy" = "terraform"
+  }
 }
 
 `