fix/api-gateway-service (#1898)

* fix/api-gateway-service

* fix/api-gateway-service

* fix/api-gateway-service

* fix/api-gateway-service

* fix/api-gateway-service

* fix/api-gateway-service

* fix/api-gateway-service

* fix/api-gateway-service

* fix/api-gateway-service

* add changelog

* fix testcases

---------

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

Author: SevenEarth

.changelog/1898.txt

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

tencentcloud/common.go

@@ -84,6 +84,8 @@ var retryableErrorCode = []string{
 	"InvalidParameter.ActionInProgress",
 	// posgresql
 	"OperationDenied.InstanceStatusLimitError",
+	// apigw
+	"UnsupportedOperation.UnsupportedDeleteService",
 }
 
 // retryableCosErrorCode is retryable error code for COS/CI SDK

tencentcloud/resource_tc_api_gateway_service.go

@@ -5,14 +5,18 @@ Example Usage
 
 ```hcl
 resource "tencentcloud_api_gateway_service" "service" {
-  service_name   = "niceservice"
-  protocol       = "http&https"
-  service_desc   = "your nice service"
-  net_type       = ["INNER", "OUTER"]
-  ip_version     = "IPv4"
-  release_limit  = 500
-  pre_limit      = 500
-  test_limit     = 500
+  service_name = "niceservice"
+  protocol     = "http&https"
+  service_desc = "your nice service"
+  net_type     = ["INNER", "OUTER"]
+  ip_version   = "IPv4"
+  tags         = {
+    test-key1 = "test-value1"
+    test-key2 = "test-value2"
+  }
+  release_limit = 500
+  pre_limit     = 500
+  test_limit    = 500
 }
 ```
 
@@ -89,6 +93,11 @@ func resourceTencentCloudAPIGatewayService() *schema.Resource {
 				ValidateFunc: validateAllowedStringValue(API_GATEWAY_NET_IP_VERSIONS),
 				Description:  "IP version number. Valid values: `IPv4`, `IPv6`. Default value: `IPv4`.",
 			},
+			"tags": {
+				Type:        schema.TypeMap,
+				Optional:    true,
+				Description: "Tag description list.",
+			},
 			"release_limit": {
 				Type:        schema.TypeInt,
 				Optional:    true,
@@ -299,6 +308,15 @@ func resourceTencentCloudAPIGatewayServiceCreate(d *schema.ResourceData, meta in
 		}
 	}
 
+	if tags := helper.GetTags(d, "tags"); len(tags) > 0 {
+		tagService := TagService{client: meta.(*TencentCloudClient).apiV3Conn}
+		region := meta.(*TencentCloudClient).apiV3Conn.Region
+		resourceName := fmt.Sprintf("qcs::apigw:%s:uin/:service/%s", region, serviceId)
+		if err := tagService.ModifyTags(ctx, resourceName, tags, nil); err != nil {
+			return err
+		}
+	}
+
 	d.SetId(serviceId)
 
 	return resourceTencentCloudAPIGatewayServiceRead(d, meta)
@@ -451,6 +469,15 @@ func resourceTencentCloudAPIGatewayServiceRead(d *schema.ResourceData, meta inte
 	_ = d.Set("test_limit", testLimit)
 	_ = d.Set("release_limit", releaseLimit)
 
+	tcClient := meta.(*TencentCloudClient).apiV3Conn
+	tagService := &TagService{client: tcClient}
+	tags, err := tagService.DescribeResourceTags(ctx, "apigw", "service", tcClient.Region, serviceId)
+	if err != nil {
+		return err
+	}
+
+	_ = d.Set("tags", tags)
+
 	return nil
 }
 
@@ -527,6 +554,17 @@ func resourceTencentCloudAPIGatewayServiceUpdate(d *schema.ResourceData, meta in
 
 	}
 
+	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("apigw", "service", tcClient.Region, serviceId)
+		if err := tagService.ModifyTags(ctx, resourceName, replaceTags, deleteTags); err != nil {
+			return err
+		}
+	}
+
 	d.Partial(false)
 	return resourceTencentCloudAPIGatewayServiceRead(d, meta)
 }

tencentcloud/resource_tc_api_gateway_service_test.go

@@ -12,7 +12,8 @@ import (
 var testAPIGatewayServiceResourceName = "tencentcloud_api_gateway_service"
 var testAPIGatewayServiceResourceKey = testAPIGatewayServiceResourceName + ".service"
 
-func TestAccTencentCloudNeedFixAPIGateWayServiceResource(t *testing.T) {
+// go test -i; go test -test.run TestAccTencentCloudApiGateWayServiceResource_basic -v
+func TestAccTencentCloudApiGateWayServiceResource_basic(t *testing.T) {
 	t.Parallel()
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
@@ -30,15 +31,17 @@ func TestAccTencentCloudNeedFixAPIGateWayServiceResource(t *testing.T) {
 					resource.TestCheckResourceAttrSet(testAPIGatewayServiceResourceKey, "create_time"),
 					resource.TestCheckResourceAttrSet(testAPIGatewayServiceResourceKey, "internal_sub_domain"),
 					resource.TestCheckResourceAttrSet(testAPIGatewayServiceResourceKey, "inner_http_port"),
+					resource.TestCheckResourceAttr(testAPIGatewayServiceResourceKey, "tags.test-key", "test-value"),
 					resource.TestCheckResourceAttr(testAPIGatewayServiceResourceKey, "release_limit", "500"),
 					resource.TestCheckResourceAttr(testAPIGatewayServiceResourceKey, "pre_limit", "500"),
 					resource.TestCheckResourceAttr(testAPIGatewayServiceResourceKey, "test_limit", "500"),
 				),
 			},
 			{
-				ResourceName:      testAPIGatewayServiceResourceKey,
-				ImportState:       true,
-				ImportStateVerify: true,
+				ResourceName:            testAPIGatewayServiceResourceKey,
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"modify_time"},
 			},
 			{
 				Config: testAccAPIGatewayServiceUpdate,
@@ -53,6 +56,7 @@ func TestAccTencentCloudNeedFixAPIGateWayServiceResource(t *testing.T) {
 					resource.TestCheckResourceAttrSet(testAPIGatewayServiceResourceKey, "internal_sub_domain"),
 					resource.TestCheckResourceAttrSet(testAPIGatewayServiceResourceKey, "outer_sub_domain"),
 					resource.TestCheckResourceAttrSet(testAPIGatewayServiceResourceKey, "inner_http_port"),
+					resource.TestCheckResourceAttr(testAPIGatewayServiceResourceKey, "tags.test-key1", "test-value1"),
 					resource.TestCheckResourceAttr(testAPIGatewayServiceResourceKey, "release_limit", "100"),
 					resource.TestCheckResourceAttr(testAPIGatewayServiceResourceKey, "pre_limit", "100"),
 					resource.TestCheckResourceAttr(testAPIGatewayServiceResourceKey, "test_limit", "100"),
@@ -121,6 +125,9 @@ resource "tencentcloud_api_gateway_service" "service" {
   service_desc     = "my nice service"
   net_type         = ["INNER"]
   ip_version       = "IPv4"
+  tags         = {
+    test-key = "test-value"
+  }
   release_limit    = 500
   pre_limit        = 500
   test_limit       = 500
@@ -133,6 +140,9 @@ resource "tencentcloud_api_gateway_service" "service" {
   service_desc     = "your nice service"
   net_type         = ["INNER", "OUTER"]
   ip_version       = "IPv4"
+  tags         = {
+    test-key1 = "test-value1"
+  }
   release_limit    = 100
   pre_limit        = 100
   test_limit       = 100

website/docs/r/api_gateway_service.html.markdown

@@ -15,11 +15,15 @@ Use this resource to create API gateway service.
 
 ```hcl
 resource "tencentcloud_api_gateway_service" "service" {
-  service_name  = "niceservice"
-  protocol      = "http&https"
-  service_desc  = "your nice service"
-  net_type      = ["INNER", "OUTER"]
-  ip_version    = "IPv4"
+  service_name = "niceservice"
+  protocol     = "http&https"
+  service_desc = "your nice service"
+  net_type     = ["INNER", "OUTER"]
+  ip_version   = "IPv4"
+  tags = {
+    test-key1 = "test-value1"
+    test-key2 = "test-value2"
+  }
   release_limit = 500
   pre_limit     = 500
   test_limit    = 500
@@ -38,6 +42,7 @@ The following arguments are supported:
 * `pre_limit` - (Optional, Int) API QPS value. Enter a positive number to limit the API query rate per second `QPS`.
 * `release_limit` - (Optional, Int) API QPS value. Enter a positive number to limit the API query rate per second `QPS`.
 * `service_desc` - (Optional, String) Custom service description.
+* `tags` - (Optional, Map) Tag description list.
 * `test_limit` - (Optional, Int) API QPS value. Enter a positive number to limit the API query rate per second `QPS`.
 
 ## Attributes Reference