emr support tag (#2026)

* emr support tag

* add changelog

---------

Co-authored-by: mikatong <mikatong@tencent.com>

Author: tongyiming

.changelog/2026.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/tencentcloud_emr_cluster: support `tags` param
+```

tencentcloud/resource_tc_emr_cluster.go

@@ -101,6 +101,7 @@ import (
 	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common"
 	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
 	emr "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/emr/v20190103"
+	"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
 )
 
 func resourceTencentCloudEmrCluster() *schema.Resource {
@@ -251,6 +252,12 @@ func resourceTencentCloudEmrCluster() *schema.Resource {
 				ForceNew:    true,
 				Description: "The ID of the security group to which the instance belongs, in the form of sg-xxxxxxxx.",
 			},
+			"tags": {
+				Type:        schema.TypeMap,
+				Optional:    true,
+				Computed:    true,
+				Description: "Tag description list.",
+			},
 		},
 	}
 }
@@ -269,6 +276,18 @@ func resourceTencentCloudEmrClusterUpdate(d *schema.ResourceData, meta interface
 	if !hasTimeUnit || !hasTimeSpan || !hasPayMode {
 		return innerErr.New("Time_unit, time_span or pay_mode must be set.")
 	}
+	if d.HasChange("tags") {
+		tcClient := meta.(*TencentCloudClient).apiV3Conn
+		tagService := &TagService{client: tcClient}
+		oldTags, newTags := d.GetChange("tags")
+		replaceTags, deleteTags := diffTags(oldTags.(map[string]interface{}), newTags.(map[string]interface{}))
+		resourceName := BuildTagResourceName("emr", "emr-instance", tcClient.Region, instanceId)
+		if err := tagService.ModifyTags(ctx, resourceName, replaceTags, deleteTags); err != nil {
+			return err
+		}
+	}
+
+	hasChange := false
 	request := emr.NewScaleOutInstanceRequest()
 	request.TimeUnit = common.StringPtr(timeUnit.(string))
 	request.TimeSpan = common.Uint64Ptr((uint64)(timeSpan.(int)))
@@ -280,16 +299,22 @@ func resourceTencentCloudEmrClusterUpdate(d *schema.ResourceData, meta interface
 
 	if d.HasChange("resource_spec.0.master_count") {
 		request.MasterCount = common.Uint64Ptr((uint64)(resourceSpec["master_count"].(int)))
+		hasChange = true
 	}
 	if d.HasChange("resource_spec.0.task_count") {
 		request.TaskCount = common.Uint64Ptr((uint64)(resourceSpec["task_count"].(int)))
+		hasChange = true
 	}
 	if d.HasChange("resource_spec.0.core_count") {
 		request.CoreCount = common.Uint64Ptr((uint64)(resourceSpec["core_count"].(int)))
+		hasChange = true
 	}
 	if d.HasChange("extend_fs_field") {
 		return innerErr.New("extend_fs_field not support update.")
 	}
+	if !hasChange {
+		return nil
+	}
 	_, err := emrService.UpdateInstance(ctx, request)
 	if err != nil {
 		return err
@@ -364,6 +389,15 @@ func resourceTencentCloudEmrClusterCreate(d *schema.ResourceData, meta interface
 	if err != nil {
 		return err
 	}
+
+	if tags := helper.GetTags(d, "tags"); len(tags) > 0 {
+		tagService := TagService{client: meta.(*TencentCloudClient).apiV3Conn}
+		region := meta.(*TencentCloudClient).apiV3Conn.Region
+		resourceName := fmt.Sprintf("qcs::emr:%s:uin/:emr-instance/%s", region, d.Id())
+		if err := tagService.ModifyTags(ctx, resourceName, tags, nil); err != nil {
+			return err
+		}
+	}
 	return nil
 }
 
@@ -458,5 +492,13 @@ func resourceTencentCloudEmrClusterRead(d *schema.ResourceData, meta interface{}
 	if err != nil {
 		return err
 	}
+
+	tagService := TagService{client: meta.(*TencentCloudClient).apiV3Conn}
+	region := meta.(*TencentCloudClient).apiV3Conn.Region
+	tags, err := tagService.DescribeResourceTags(ctx, "emr", "emr-instance", region, d.Id())
+	if err != nil {
+		return err
+	}
+	_ = d.Set("tags", tags)
 	return nil
 }

tencentcloud/resource_tc_emr_cluster_test.go

@@ -132,6 +132,7 @@ func TestAccTencentCloudEmrClusterResource(t *testing.T) {
 					resource.TestCheckResourceAttr(testEmrClusterResourceKey, "placement.project_id", "0"),
 					resource.TestCheckResourceAttrSet(testEmrClusterResourceKey, "instance_id"),
 					resource.TestCheckResourceAttr(testEmrClusterResourceKey, "sg_id", defaultEMRSgId),
+					resource.TestCheckResourceAttr(testEmrClusterResourceKey, "tags.emr-key", "emr-value"),
 				),
 			},
 		},
@@ -242,5 +243,8 @@ resource "tencentcloud_emr_cluster" "emrrrr" {
 	  project_id=0
 	}
 	sg_id=var.sg_id
+	tags = {
+        emr-key = "emr-value"
+    }
   }
 `

website/docs/r/emr_cluster.html.markdown

@@ -134,6 +134,7 @@ When TimeUnit is m, the number filled in by this parameter indicates the length
 				By default, the cluster Master node internet is enabled.
 * `resource_spec` - (Optional, List) Resource specification of EMR instance.
 * `sg_id` - (Optional, String, ForceNew) The ID of the security group to which the instance belongs, in the form of sg-xxxxxxxx.
+* `tags` - (Optional, Map) Tag description list.
 
 The `resource_spec` object supports the following: