tdmq support tag (#1197)

Author: hellertang

tencentcloud/resource_tc_tdmq_instance.go

@@ -7,6 +7,9 @@ Example Usage
 resource "tencentcloud_tdmq_instance" "foo" {
   cluster_name = "example"
   remark = "this is description."
+  tags = {
+    "createdBy" = "terraform"
+  }
 }
 ```
 
@@ -23,10 +26,12 @@ package tencentcloud
 import (
 	"context"
 	"fmt"
+	"log"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
+	tdmq "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdmq/v20200217"
+	"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
 )
 
 func resourceTencentCloudTdmqInstance() *schema.Resource {
@@ -55,6 +60,11 @@ func resourceTencentCloudTdmqInstance() *schema.Resource {
 				Optional:    true,
 				Description: "Description of the tdmq cluster.",
 			},
+			"tags": {
+				Type:        schema.TypeMap,
+				Optional:    true,
+				Description: "Tag description list.",
+			},
 		},
 	}
 }
@@ -65,30 +75,50 @@ func resourceTencentCloudTdmqCreate(d *schema.ResourceData, meta interface{}) er
 	logId := getLogId(contextNil)
 	ctx := context.WithValue(context.TODO(), logIdKey, logId)
 
-	tdmqService := TdmqService{client: meta.(*TencentCloudClient).apiV3Conn}
-
 	var (
-		clusterName   string
-		bindClusterId uint64
-		remark        string
+		request  = tdmq.NewCreateClusterRequest()
+		response *tdmq.CreateClusterResponse
 	)
-	if temp, ok := d.GetOk("cluster_name"); ok {
-		clusterName = temp.(string)
-		if len(clusterName) < 1 {
-			return fmt.Errorf("cluster_name should be not empty string")
-		}
+	if v, ok := d.GetOk("cluster_name"); ok {
+		request.ClusterName = helper.String(v.(string))
 	}
 
-	bindClusterId = uint64(d.Get("bind_cluster_id").(int))
+	if v, ok := d.GetOk("bind_cluster_id"); ok {
+		request.BindClusterId = helper.IntUint64(v.(int))
+	}
 
-	if temp, ok := d.GetOk("remark"); ok {
-		remark = temp.(string)
+	if v, ok := d.GetOk("remark"); ok {
+		request.Remark = helper.String(v.(string))
 	}
 
-	clusterId, err := tdmqService.CreateTdmqInstance(ctx, clusterName, bindClusterId, remark)
+	err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
+		result, e := meta.(*TencentCloudClient).apiV3Conn.UseTdmqClient().CreateCluster(request)
+		if e != nil {
+			return retryError(e)
+		} else {
+			log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n",
+				logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
+		}
+		response = result
+		return nil
+	})
+
 	if err != nil {
+		log.Printf("[CRITAL]%s create cls logset failed, reason:%+v", logId, err)
 		return err
 	}
+
+	clusterId := *response.Response.ClusterId
+
+	if tags := helper.GetTags(d, "tags"); len(tags) > 0 {
+		tagService := TagService{client: meta.(*TencentCloudClient).apiV3Conn}
+		region := meta.(*TencentCloudClient).apiV3Conn.Region
+		resourceName := fmt.Sprintf("qcs::tdmq:%s:uin/:cluster/%s", region, clusterId)
+		if err := tagService.ModifyTags(ctx, resourceName, tags, nil); err != nil {
+			return err
+		}
+	}
+
 	d.SetId(clusterId)
 
 	return resourceTencentCloudTdmqRead(d, meta)
@@ -122,6 +152,15 @@ func resourceTencentCloudTdmqRead(d *schema.ResourceData, meta interface{}) erro
 	if err != nil {
 		return err
 	}
+
+	tcClient := meta.(*TencentCloudClient).apiV3Conn
+	tagService := &TagService{client: tcClient}
+	tags, err := tagService.DescribeResourceTags(ctx, "tdmq", "cluster", tcClient.Region, d.Id())
+	if err != nil {
+		return err
+	}
+	_ = d.Set("tags", tags)
+
 	return nil
 }
 
@@ -153,15 +192,20 @@ func resourceTencentCloudTdmqUpdate(d *schema.ResourceData, meta interface{}) er
 		remark = old.(string)
 	}
 
-	d.Partial(true)
-
 	if err := service.ModifyTdmqInstanceAttribute(ctx, id, clusterName, remark); err != nil {
 		return err
 	}
-	d.SetPartial("cluster_name")
-	d.SetPartial("remark")
 
-	d.Partial(false)
+	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("tdmq", "cluster", tcClient.Region, d.Id())
+		if err := tagService.ModifyTags(ctx, resourceName, replaceTags, deleteTags); err != nil {
+			return err
+		}
+	}
 	return resourceTencentCloudTdmqRead(d, meta)
 }
 
@@ -172,18 +216,11 @@ func resourceTencentCloudTdmqDelete(d *schema.ResourceData, meta interface{}) er
 	ctx := context.WithValue(context.TODO(), logIdKey, logId)
 
 	service := TdmqService{client: meta.(*TencentCloudClient).apiV3Conn}
+	clusterId := d.Id()
 
-	err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
-		if err := service.DeleteTdmqInstance(ctx, d.Id()); err != nil {
-			if sdkErr, ok := err.(*errors.TencentCloudSDKError); ok {
-				if sdkErr.Code == VPCNotFound {
-					return nil
-				}
-			}
-			return resource.RetryableError(err)
-		}
-		return nil
-	})
+	if err := service.DeleteTdmqInstance(ctx, clusterId); err != nil {
+		return err
+	}
 
-	return err
+	return nil
 }

tencentcloud/service_tencentcloud_tdmq.go

@@ -26,38 +26,6 @@ type TdmqService struct {
 
 // ////////api
 // tdmq instance
-func (me *TdmqService) CreateTdmqInstance(ctx context.Context, clusterName string, bindClusterId uint64,
-	remark string) (clusterId string, errRet error) {
-	logId := getLogId(ctx)
-	request := tdmq.NewCreateClusterRequest()
-	defer func() {
-		if errRet != nil {
-			log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n",
-				logId, request.GetAction(), request.ToJsonString(), errRet.Error())
-		}
-	}()
-
-	request.ClusterName = &clusterName
-	request.BindClusterId = &bindClusterId
-	request.Remark = &remark
-
-	var response *tdmq.CreateClusterResponse
-	if err := resource.Retry(readRetryTimeout, func() *resource.RetryError {
-		ratelimit.Check(request.GetAction())
-		result, err := me.client.UseTdmqClient().CreateCluster(request)
-		if err != nil {
-			return retryError(err)
-		}
-		response = result
-		return nil
-	}); err != nil {
-		log.Printf("[CRITAL]%s create tdmq failed, reason: %v", logId, err)
-		errRet = err
-		return
-	}
-	clusterId = *response.Response.ClusterId
-	return
-}
 
 func (me *TdmqService) DescribeTdmqInstanceById(ctx context.Context,
 	clusterId string) (info *tdmq.Cluster, has bool, errRet error) {
@@ -132,17 +100,13 @@ func (me *TdmqService) DeleteTdmqInstance(ctx context.Context, clusterId string)
 		}
 	}()
 	request.ClusterId = &clusterId
-	if err := resource.Retry(readRetryTimeout, func() *resource.RetryError {
-		ratelimit.Check(request.GetAction())
-		_, err := me.client.UseTdmqClient().DeleteCluster(request)
-		if err != nil {
-			return retryError(err, InternalError)
-		}
-		return nil
-	}); err != nil {
-		log.Printf("[CRITAL]%s delete tdmq failed, reason: %v", logId, err)
+	response, err := me.client.UseTdmqClient().DeleteCluster(request)
+	if err != nil {
+		errRet = err
 		return err
 	}
+	log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n",
+		logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
 	return
 }
 

website/docs/r/tdmq_instance.html.markdown

@@ -17,6 +17,9 @@ Provide a resource to create a TDMQ instance.
 resource "tencentcloud_tdmq_instance" "foo" {
   cluster_name = "example"
   remark       = "this is description."
+  tags = {
+    "createdBy" = "terraform"
+  }
 }
 ```
 
@@ -27,6 +30,7 @@ The following arguments are supported:
 * `cluster_name` - (Required, String) The name of tdmq cluster to be created.
 * `bind_cluster_id` - (Optional, Int) The Dedicated Cluster Id.
 * `remark` - (Optional, String) Description of the tdmq cluster.
+* `tags` - (Optional, Map) Tag description list.
 
 ## Attributes Reference