Merge pull request #12 from crab21/api_limit_copy

fix: remove remain coding of throttling service/api

Author: ttomzhou

examples/tencentcloud-api-gateway/main.tf

@@ -25,7 +25,7 @@ resource "tencentcloud_api_gateway_api" "api" {
     request_config_method = "POST"
 
     request_parameters {
-    	name          = "email"
+        name          = "email"
         position      = "QUERY"
         type          = "string"
         desc          = "your email please?"
@@ -41,10 +41,10 @@ resource "tencentcloud_api_gateway_api" "api" {
     response_success_example = "<note>success</note>"
     response_fail_example    = "<note>fail</note>"
     response_error_codes {
-    	code           = 10
+        code           = 10
         msg            = "system error"
-       	desc           = "system error code"
-       	converted_code = -10
+        desc           = "system error code"
+        converted_code = -10
         need_convert   = true
     }
 
@@ -90,16 +90,16 @@ resource "tencentcloud_api_gateway_usage_plan_attachment" "attach_service" {
 }
 
 resource "tencentcloud_api_gateway_service_release" "service" {
-  service_id       = tencentcloud_api_gateway_throttling_api.service.service_id
+  service_id       = tencentcloud_api_gateway_service.service.id
   environment_name = "release"
   release_desc     = var.release_desc
 }
 
 resource "tencentcloud_api_gateway_strategy_attachment" "test"{
-   service_id       = tencentcloud_api_gateway_service_release.service.service_id
-   strategy_id      = tencentcloud_api_gateway_ip_strategy.test.strategy_id
-   environment_name = "release"
-   bind_api_id      = tencentcloud_api_gateway_api.api.id
+    service_id       = tencentcloud_api_gateway_service_release.service.service_id
+    strategy_id      = tencentcloud_api_gateway_ip_strategy.test.strategy_id
+    environment_name = "release"
+    bind_api_id      = tencentcloud_api_gateway_api.api.id
 }
 
 data "tencentcloud_api_gateway_api_keys" "name" {
@@ -142,11 +142,11 @@ data "tencentcloud_api_gateway_services" "id" {
 }
 
 data "tencentcloud_api_gateway_throttling_apis" "id" {
-    service_id = tencentcloud_api_gateway_throttling_api.service.service_id
+    service_id = tencentcloud_api_gateway_service.service.id
 }
 
 data "tencentcloud_api_gateway_throttling_apis" "foo" {
-	service_id        = tencentcloud_api_gateway_throttling_api.service.service_id
+	service_id        = tencentcloud_api_gateway_service.service.id
 	environment_names = ["release", "test"]
 }
 

tencentcloud/data_source_tc_api_gateway_throttling_apis.go

@@ -43,22 +43,19 @@ resource "tencentcloud_api_gateway_api" "api" {
        	desc           = "system error code"
        	converted_code = -10
         need_convert   = true
-    }
-}
+	}
 
-resource "tencentcloud_api_gateway_throttling_api" "service" {
-	service_id       = tencentcloud_api_gateway_service.service.id
-	strategy         = "400"
-	environment_name = "test"
-	api_ids          = [tencentcloud_api_gateway_api.api.id]
+	release_limit    = 100
+	pre_limit        = 100
+	test_limit       = 100
 }
 
 data "tencentcloud_api_gateway_throttling_apis" "id" {
-    service_id = tencentcloud_api_gateway_throttling_api.service.service_id
+    service_id = tencentcloud_api_gateway_api.service_id
 }
 
 data "tencentcloud_api_gateway_throttling_apis" "foo" {
-	service_id        = tencentcloud_api_gateway_throttling_api.service.service_id
+	service_id        = tencentcloud_api_gateway_api.service.service_id
 	environment_names = ["release", "test"]
 }
 ```

tencentcloud/data_source_tc_api_gateway_throttling_apis_test.go

@@ -1,13 +1,9 @@
 package tencentcloud
 
 import (
-	"context"
-	"fmt"
-	"strings"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
-	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
 var testAPIGatewaythrottlingApiDataSourceName = "data.tencentcloud_api_gateway_throttling_apis"
@@ -16,12 +12,12 @@ func TestAccTencentAPIGatewayThrottlingApisDataSource(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
 		Providers:    testAccProviders,
-		CheckDestroy: testAccCheckThrottlingAPIDestroy,
+		CheckDestroy: testAccCheckAPIGatewayAPIDestroy,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccTestAccTencentAPIGatewayThrottlingApis(),
 				Check: resource.ComposeAggregateTestCheckFunc(
-					testAccCheckThrottlingAPIExists("tencentcloud_api_gateway_throttling_api.service"),
+					testAccCheckAPIGatewayAPIExists("tencentcloud_api_gateway_api.api"),
 					resource.TestCheckResourceAttrSet(testAPIGatewaythrottlingApiDataSourceName+".id", "list.#"),
 					resource.TestCheckResourceAttrSet(testAPIGatewaythrottlingApiDataSourceName+".id", "list.0.service_id"),
 					resource.TestCheckResourceAttrSet(testAPIGatewaythrottlingApiDataSourceName+".id", "list.0.api_environment_strategies.#"),
@@ -49,87 +45,6 @@ func TestAccTencentAPIGatewayThrottlingApisDataSource(t *testing.T) {
 	})
 }
 
-func testAccCheckThrottlingAPIDestroy(s *terraform.State) error {
-	var (
-		logId             = getLogId(contextNil)
-		ctx               = context.WithValue(context.TODO(), logIdKey, logId)
-		throttlingService = APIGatewayService{client: testAccProvider.Meta().(*TencentCloudClient).apiV3Conn}
-	)
-	for _, rs := range s.RootModule().Resources {
-		if rs.Type != "tencentcloud_api_gateway_throttling_api" {
-			continue
-		}
-
-		serviceId := rs.Primary.Attributes["service_id"]
-		environmentName := rs.Primary.Attributes["environment_name"]
-		apiIds := rs.Primary.Attributes["api_ids"]
-		environmentList, err := throttlingService.DescribeApiEnvironmentStrategyList(ctx, serviceId, []string{environmentName}, "")
-		if err != nil {
-			return err
-		}
-
-		for _, v := range environmentList {
-			if v == nil || !strings.Contains(apiIds, *v.ApiId) {
-				continue
-			}
-			environmentSet := v.EnvironmentStrategySet
-			for _, env := range environmentSet {
-				if env == nil || *env.EnvironmentName != environmentName {
-					continue
-				}
-
-				if *env.Quota == QUOTA || *env.Quota == QUOTA_MAX {
-					continue
-				}
-				return fmt.Errorf("throttling API still not restore: %s", rs.Primary.ID)
-			}
-		}
-	}
-	return nil
-}
-
-func testAccCheckThrottlingAPIExists(n string) resource.TestCheckFunc {
-	return func(s *terraform.State) error {
-		var (
-			logId             = getLogId(contextNil)
-			ctx               = context.WithValue(context.TODO(), logIdKey, logId)
-			throttlingService = APIGatewayService{client: testAccProvider.Meta().(*TencentCloudClient).apiV3Conn}
-		)
-
-		rs, ok := s.RootModule().Resources[n]
-		if !ok {
-			return fmt.Errorf("API Getway throttling API %s is not found", n)
-		}
-		if rs.Primary.ID == "" {
-			return fmt.Errorf("API Getway throttling API id is not set")
-		}
-		serviceId := rs.Primary.Attributes["service_id"]
-		environmentName := rs.Primary.Attributes["environment_name"]
-		apiIds := rs.Primary.Attributes["api_ids"]
-		environmentList, err := throttlingService.DescribeApiEnvironmentStrategyList(ctx, serviceId, []string{environmentName}, "")
-		if err != nil {
-			return err
-		}
-
-		for _, v := range environmentList {
-			if v == nil || !strings.Contains(apiIds, *v.ApiId) {
-				continue
-			}
-			environmentSet := v.EnvironmentStrategySet
-			for _, env := range environmentSet {
-				if env == nil || *env.EnvironmentName != environmentName {
-					continue
-				}
-
-				if *env.Quota == QUOTA {
-					return fmt.Errorf("throttling API still not set value: %s", rs.Primary.ID)
-				}
-			}
-		}
-		return nil
-	}
-}
-
 func testAccTestAccTencentAPIGatewayThrottlingApis() string {
 	return `
 resource "tencentcloud_api_gateway_service" "service" {
@@ -164,29 +79,27 @@ resource "tencentcloud_api_gateway_api" "api" {
     service_config_method    = "POST"
     response_type            = "XML"
     response_success_example = "<note>success</note>"
-    response_fail_example    = "<note>fail</note>"
+	response_fail_example    = "<note>fail</note>"
+	
     response_error_codes {
     	code           = 10
         msg            = "system error"
        	desc           = "system error code"
        	converted_code = -10
         need_convert   = true
-    }
-}
-
-resource "tencentcloud_api_gateway_throttling_api" "service" {
-	service_id       = tencentcloud_api_gateway_service.service.id
-	strategy         = "400"
-	environment_name = "test"
-	api_ids          = [tencentcloud_api_gateway_api.api.id]
+	}
+	
+	release_limit    = 100
+	pre_limit        = 100
+	test_limit       = 100
 }
 
 data "tencentcloud_api_gateway_throttling_apis" "id" {
-    service_id = tencentcloud_api_gateway_throttling_api.service.service_id
+    service_id = tencentcloud_api_gateway_api.api.service_id
 }
 
 data "tencentcloud_api_gateway_throttling_apis" "foo" {
-	service_id        = tencentcloud_api_gateway_throttling_api.service.service_id
+	service_id        = tencentcloud_api_gateway_api.api.service_id
 	environment_names = ["release", "test"]
 }
 `

tencentcloud/data_source_tc_api_gateway_throttling_services.go

@@ -5,21 +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"
-}
-
-resource "tencentcloud_api_gateway_throttling_service" "service" {
-	service_id        = tencentcloud_api_gateway_service.service.id
-	strategy          = "400"
-	environment_names = ["release"]
+  	service_name     = "niceservice"
+  	protocol         = "http&https"
+  	service_desc     = "your nice service"
+  	net_type         = ["INNER", "OUTER"]
+	ip_version       = "IPv4"
+	release_limit    = 100
+	pre_limit        = 100
+	test_limit       = 100
 }
 
 data "tencentcloud_api_gateway_throttling_services" "id" {
-    service_id = tencentcloud_api_gateway_throttling_service.service.service_id
+    service_id = tencentcloud_api_gateway_service.service.id
 }
 ```
 */