Merge pull request #472 from piggona/yuanhaojin

fix issue: tag not creating in time

Author: oliverpei

CHANGELOG.md

@@ -8,6 +8,8 @@ ENHANCEMENTS:
 
 * Data Source: `tencentcloud_images` supports list of snapshots.
 * Resource: `tencentcloud_kubernetes_cluster_attachment` add new argument `worker_config` to support config with existing instances.
+* Resource: `tencentcloud_ccn` add new argument `tags` to support tags settings..
+* Resource `tencentcloud_cfs_file_system` add new argument `tags` to support tags settings.
 
 ## 1.38.2 (July 03, 2020)
 

tencentcloud/common.go

@@ -191,7 +191,7 @@ func CheckNil(object interface{}, fields map[string]string) (nilFields []string)
 	return
 }
 
-// BuildTagResourceName builds the Tencent Clould specific name of a resource description.
+// BuildTagResourceName builds the Tencent Cloud specific name of a resource description.
 // The format is `qcs:project_id:service_type:region:account:resource`.
 // For more information, go to https://cloud.tencent.com/document/product/598/10606.
 func BuildTagResourceName(serviceType, resourceType, region, id string) string {

tencentcloud/data_source_tc_cfs_file_systems_test.go

@@ -44,7 +44,7 @@ resource "tencentcloud_subnet" "subnet" {
 }
 
 resource "tencentcloud_cfs_access_group" "foo" {
-  name = "test_cfs_access_rule"
+	name = "test_cfs_access_rule"
 }
 
 resource "tencentcloud_cfs_file_system" "foo" {

tencentcloud/resource_tc_as_scaling_group.go

@@ -303,15 +303,6 @@ func resourceTencentCloudAsScalingGroupCreate(d *schema.ResourceData, meta inter
 		}
 	}
 
-	if tags := helper.GetTags(d, "tags"); len(tags) > 0 {
-		for k, v := range tags {
-			request.Tags = append(request.Tags, &as.Tag{
-				Key:   helper.String(k),
-				Value: helper.String(v),
-			})
-		}
-	}
-
 	var id string
 	if err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
 		ratelimit.Check(request.GetAction())
@@ -357,6 +348,15 @@ func resourceTencentCloudAsScalingGroupCreate(d *schema.ResourceData, meta inter
 		return err
 	}
 
+	if tags := helper.GetTags(d, "tags"); len(tags) > 0 {
+		tcClient := meta.(*TencentCloudClient).apiV3Conn
+		tagService := &TagService{client: tcClient}
+		resourceName := BuildTagResourceName("as", "auto-scaling-group", tcClient.Region, d.Id())
+		if err := tagService.ModifyTags(ctx, resourceName, tags, nil); err != nil {
+			return err
+		}
+	}
+
 	return resourceTencentCloudAsScalingGroupRead(d, meta)
 }
 
@@ -431,10 +431,13 @@ func resourceTencentCloudAsScalingGroupRead(d *schema.ResourceData, meta interfa
 		_ = d.Set("forward_balancer_ids", forwardLoadBalancers)
 	}
 
-	tags := make(map[string]string, len(scalingGroup.Tags))
-	for _, tag := range scalingGroup.Tags {
-		tags[*tag.Key] = *tag.Value
+	tcClient := meta.(*TencentCloudClient).apiV3Conn
+	tagService := &TagService{client: tcClient}
+	tags, err := tagService.DescribeResourceTags(ctx, "as", "auto-scaling-group", tcClient.Region, d.Id())
+	if err != nil {
+		return err
 	}
+
 	_ = d.Set("tags", tags)
 
 	return nil
@@ -606,14 +609,14 @@ func resourceTencentCloudAsScalingGroupUpdate(d *schema.ResourceData, meta inter
 	}
 
 	if d.HasChange("tags") {
-		oldTags, newTags := d.GetChange("tags")
-		replaceTags, deleteTags := diffTags(oldTags.(map[string]interface{}), newTags.(map[string]interface{}))
+		oldValue, newValue := d.GetChange("tags")
+		replaceTags, deleteTags := diffTags(oldValue.(map[string]interface{}), newValue.(map[string]interface{}))
 
-		resourceName := BuildTagResourceName("as", "auto-scaling-group", region, scalingGroupId)
-		if err := tagService.ModifyTags(ctx, resourceName, replaceTags, deleteTags); err != nil {
+		resourceName := BuildTagResourceName("as", "auto-scaling-group", region, d.Id())
+		err := tagService.ModifyTags(ctx, resourceName, replaceTags, deleteTags)
+		if err != nil {
 			return err
 		}
-
 		d.SetPartial("tags")
 	}
 

tencentcloud/resource_tc_cbs_storage.go

@@ -173,18 +173,6 @@ func resourceTencentCloudCbsStorageCreate(d *schema.ResourceData, meta interface
 	if _, ok := d.GetOk("encrypt"); ok {
 		request.Encrypt = helper.String("ENCRYPT")
 	}
-	if v, ok := d.GetOk("tags"); ok {
-		tags := v.(map[string]interface{})
-		request.Tags = make([]*cbs.Tag, 0, len(tags))
-		for key, value := range tags {
-			tag := cbs.Tag{
-				Key:   helper.String(key),
-				Value: helper.String(value.(string)),
-			}
-			request.Tags = append(request.Tags, &tag)
-		}
-	}
-
 	chargeType := d.Get("charge_type").(string)
 	request.DiskChargeType = &chargeType
 
@@ -239,6 +227,14 @@ func resourceTencentCloudCbsStorageCreate(d *schema.ResourceData, meta interface
 	if err != nil {
 		return err
 	}
+	if tags := helper.GetTags(d, "tags"); len(tags) > 0 {
+		tcClient := meta.(*TencentCloudClient).apiV3Conn
+		tagService := &TagService{client: tcClient}
+		resourceName := BuildTagResourceName("cvm", "volume", tcClient.Region, d.Id())
+		if err := tagService.ModifyTags(ctx, resourceName, tags, nil); err != nil {
+			return err
+		}
+	}
 
 	return resourceTencentCloudCbsStorageRead(d, meta)
 }
@@ -279,7 +275,6 @@ func resourceTencentCloudCbsStorageRead(d *schema.ResourceData, meta interface{}
 	_ = d.Set("storage_name", storage.DiskName)
 	_ = d.Set("project_id", storage.Placement.ProjectId)
 	_ = d.Set("encrypt", storage.Encrypt)
-	_ = d.Set("tags", flattenCbsTagsMapping(storage.Tags))
 	_ = d.Set("storage_status", storage.DiskState)
 	_ = d.Set("attached", storage.Attached)
 	_ = d.Set("charge_type", storage.DiskChargeType)
@@ -289,6 +284,15 @@ func resourceTencentCloudCbsStorageRead(d *schema.ResourceData, meta interface{}
 		_ = d.Set("prepaid_renew_flag", storage.RenewFlag)
 	}
 
+	tcClient := meta.(*TencentCloudClient).apiV3Conn
+	tagService := &TagService{client: tcClient}
+	tags, err := tagService.DescribeResourceTags(ctx, "cvm", "volume", tcClient.Region, d.Id())
+	if err != nil {
+		return err
+	}
+
+	_ = d.Set("tags", tags)
+
 	return nil
 }
 
@@ -417,13 +421,13 @@ func resourceTencentCloudCbsStorageUpdate(d *schema.ResourceData, meta interface
 	}
 
 	if d.HasChange("tags") {
-		oldInterface, newInterface := d.GetChange("tags")
-		replaceTags, deleteTags := diffTags(oldInterface.(map[string]interface{}), newInterface.(map[string]interface{}))
-		tagService := TagService{
-			client: meta.(*TencentCloudClient).apiV3Conn,
-		}
-		region := meta.(*TencentCloudClient).apiV3Conn.Region
-		resourceName := fmt.Sprintf("qcs::cvm:%s:uin/:volume/%s", region, storageId)
+
+		oldValue, newValue := d.GetChange("tags")
+		replaceTags, deleteTags := diffTags(oldValue.(map[string]interface{}), newValue.(map[string]interface{}))
+
+		tcClient := meta.(*TencentCloudClient).apiV3Conn
+		tagService := &TagService{client: tcClient}
+		resourceName := BuildTagResourceName("cvm", "volume", tcClient.Region, d.Id())
 		err := tagService.ModifyTags(ctx, resourceName, replaceTags, deleteTags)
 		if err != nil {
 			return err

tencentcloud/resource_tc_ccn.go

@@ -28,6 +28,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/terraform-providers/terraform-provider-tencentcloud/tencentcloud/internal/helper"
 )
 
 func resourceTencentCloudCcn() *schema.Resource {
@@ -77,6 +78,11 @@ func resourceTencentCloudCcn() *schema.Resource {
 				Computed:    true,
 				Description: "Creation time of resource.",
 			},
+			"tags": {
+				Type:        schema.TypeMap,
+				Optional:    true,
+				Description: "Instance tag.",
+			},
 		},
 	}
 }
@@ -103,6 +109,15 @@ func resourceTencentCloudCcnCreate(d *schema.ResourceData, meta interface{}) err
 	}
 	d.SetId(info.ccnId)
 
+	if tags := helper.GetTags(d, "tags"); len(tags) > 0 {
+		tcClient := meta.(*TencentCloudClient).apiV3Conn
+		tagService := &TagService{client: tcClient}
+		resourceName := BuildTagResourceName("vpc", "ccn", tcClient.Region, d.Id())
+		if err := tagService.ModifyTags(ctx, resourceName, tags, nil); err != nil {
+			return err
+		}
+	}
+
 	return resourceTencentCloudCcnRead(d, meta)
 }
 
@@ -137,6 +152,14 @@ func resourceTencentCloudCcnRead(d *schema.ResourceData, meta interface{}) error
 	if err != nil {
 		return err
 	}
+	tcClient := meta.(*TencentCloudClient).apiV3Conn
+	tagService := &TagService{client: tcClient}
+	tags, err := tagService.DescribeResourceTags(ctx, "vpc", "ccn", tcClient.Region, d.Id())
+	if err != nil {
+		return err
+	}
+
+	_ = d.Set("tags", tags)
 	return nil
 }
 
@@ -152,9 +175,11 @@ func resourceTencentCloudCcnUpdate(d *schema.ResourceData, meta interface{}) err
 		name        = ""
 		description = ""
 		change      = false
+		changeList  = []string{}
 	)
 	if d.HasChange("name") {
 		name = d.Get("name").(string)
+		changeList = append(changeList, "name")
 		change = true
 	}
 
@@ -165,14 +190,35 @@ func resourceTencentCloudCcnUpdate(d *schema.ResourceData, meta interface{}) err
 		if description == "" {
 			return fmt.Errorf("can not set description='' ")
 		}
+		changeList = append(changeList, "description")
 		change = true
 	}
 
+	d.Partial(true)
 	if change {
 		if err := service.ModifyCcnAttribute(ctx, d.Id(), name, description); err != nil {
 			return err
 		}
+		for _, val := range changeList {
+			d.SetPartial(val)
+		}
+	}
+
+	if d.HasChange("tags") {
+
+		oldValue, newValue := d.GetChange("tags")
+		replaceTags, deleteTags := diffTags(oldValue.(map[string]interface{}), newValue.(map[string]interface{}))
+
+		tcClient := meta.(*TencentCloudClient).apiV3Conn
+		tagService := &TagService{client: tcClient}
+		resourceName := BuildTagResourceName("vpc", "ccn", tcClient.Region, d.Id())
+		err := tagService.ModifyTags(ctx, resourceName, replaceTags, deleteTags)
+		if err != nil {
+			return err
+		}
+		d.SetPartial("tags")
 	}
+	d.Partial(false)
 	return resourceTencentCloudCcnRead(d, meta)
 }
 

tencentcloud/resource_tc_ccn_test.go

@@ -35,6 +35,30 @@ func TestAccTencentCloudCcnV3Basic(t *testing.T) {
 				ImportState:       true,
 				ImportStateVerify: true,
 			},
+			// add tag
+			{
+				Config: testAccCcn_multiTags("master"),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					testAccCheckCcnExists(keyName),
+					resource.TestCheckResourceAttr(keyName, "tags.role", "master"),
+				),
+			},
+			// update tag
+			{
+				Config: testAccCcn_multiTags("master-version2"),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					testAccCheckCcnExists(keyName),
+					resource.TestCheckResourceAttr(keyName, "tags.role", "master-version2"),
+				),
+			},
+			// remove tag
+			{
+				Config: testAccCcnConfig,
+				Check: resource.ComposeAggregateTestCheckFunc(
+					testAccCheckCcnExists(keyName),
+					resource.TestCheckNoResourceAttr(keyName, "tags.role"),
+				),
+			},
 		},
 	})
 }
@@ -131,6 +155,20 @@ resource tencentcloud_ccn main {
 }
 `
 
+func testAccCcn_multiTags(value string) string {
+	return fmt.Sprintf(
+		`
+resource tencentcloud_ccn main {
+	name        = "ci-temp-test-ccn"
+	description = "ci-temp-test-ccn-des"
+	qos         = "AG"
+	tags = {
+		role = "%s"
+	}
+}
+`, value)
+}
+
 const testAccCcnConfigUpdate = `
 resource tencentcloud_ccn main {
   name        = "ci-temp-test-ccn-update"

tencentcloud/resource_tc_cfs_file_system.go

@@ -98,6 +98,11 @@ func resourceTencentCloudCfsFileSystem() *schema.Resource {
 				Computed:    true,
 				Description: "Create time of the file system.",
 			},
+			"tags": {
+				Type:        schema.TypeMap,
+				Optional:    true,
+				Description: "Instance tags.",
+			},
 		},
 	}
 }
@@ -166,6 +171,14 @@ func resourceTencentCloudCfsFileSystemCreate(d *schema.ResourceData, meta interf
 	if err != nil {
 		return err
 	}
+	if tags := helper.GetTags(d, "tags"); len(tags) > 0 {
+		tcClient := meta.(*TencentCloudClient).apiV3Conn
+		tagService := &TagService{client: tcClient}
+		resourceName := BuildTagResourceName("cfs", "filesystem", tcClient.Region, d.Id())
+		if err := tagService.ModifyTags(ctx, resourceName, tags, nil); err != nil {
+			return err
+		}
+	}
 
 	return resourceTencentCloudCfsFileSystemRead(d, meta)
 }
@@ -220,6 +233,15 @@ func resourceTencentCloudCfsFileSystemRead(d *schema.ResourceData, meta interfac
 	if err != nil {
 		return err
 	}
+	tcClient := meta.(*TencentCloudClient).apiV3Conn
+	tagService := &TagService{client: tcClient}
+	tags, err := tagService.DescribeResourceTags(ctx, "cfs", "filesystem", tcClient.Region, d.Id())
+	if err != nil {
+		return err
+	}
+
+	_ = d.Set("tags", tags)
+
 	if mountTarget != nil {
 		_ = d.Set("vpc_id", mountTarget.VpcId)
 		_ = d.Set("subnet_id", mountTarget.SubnetId)
@@ -268,6 +290,21 @@ func resourceTencentCloudCfsFileSystemUpdate(d *schema.ResourceData, meta interf
 		d.SetPartial("access_group_id")
 	}
 
+	if d.HasChange("tags") {
+
+		oldValue, newValue := d.GetChange("tags")
+		replaceTags, deleteTags := diffTags(oldValue.(map[string]interface{}), newValue.(map[string]interface{}))
+
+		tcClient := meta.(*TencentCloudClient).apiV3Conn
+		tagService := &TagService{client: tcClient}
+		resourceName := BuildTagResourceName("cfs", "filesystem", tcClient.Region, d.Id())
+		err := tagService.ModifyTags(ctx, resourceName, replaceTags, deleteTags)
+		if err != nil {
+			return err
+		}
+		d.SetPartial("tags")
+	}
+
 	d.Partial(false)
 
 	return resourceTencentCloudCfsFileSystemRead(d, meta)