Feat/gaap proxy net type (#1783)

* gaap proxy support param network_type

* update gaap proxy doc

* update unit test

* update

* add changelog

* update

---------

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

Author: tongyiming

.changelog/1783.txt

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

tencentcloud/extension_gaap.go

@@ -35,6 +35,10 @@ const (
 
 	GAAP_SERVER_NAME_INDICATION_SWITCH_ON  = "ON"
 	GAAP_SERVER_NAME_INDICATION_SWITCH_OFF = "OFF"
+
+	NETWORK_TYPE_NORMAL = "normal"
+	NETWORK_TYPE_CN2    = "cn2"
+	NETWORK_TYPE_TRIPLE = "triple"
 )
 
 var (
@@ -53,4 +57,6 @@ var (
 		3: "REALSERVER",
 		4: "PROXY",
 	}
+
+	PROXY_NETWORK_TYPE = []string{NETWORK_TYPE_NORMAL, NETWORK_TYPE_CN2, NETWORK_TYPE_TRIPLE}
 )

tencentcloud/resource_tc_gaap_domain_error_page_test.go

@@ -154,8 +154,8 @@ func TestAccTencentCloudGaapDomainErrorPage_full(t *testing.T) {
 					resource.TestCheckTypeSetElemAttr("tencentcloud_gaap_domain_error_page.foo", "error_codes.*", "406"),
 					resource.TestCheckTypeSetElemAttr("tencentcloud_gaap_domain_error_page.foo", "error_codes.*", "504"),
 					resource.TestCheckResourceAttr("tencentcloud_gaap_domain_error_page.foo", "body", "bad request"),
-					resource.TestCheckResourceAttr("tencentcloud_gaap_domain_error_page.foo", "clear_headers.*", "Content-Length"),
-					resource.TestCheckResourceAttr("tencentcloud_gaap_domain_error_page.foo", "clear_headers.*", "X-TEST"),
+					resource.TestCheckTypeSetElemAttr("tencentcloud_gaap_domain_error_page.foo", "clear_headers.*", "Content-Length"),
+					resource.TestCheckTypeSetElemAttr("tencentcloud_gaap_domain_error_page.foo", "clear_headers.*", "X-TEST"),
 					resource.TestCheckResourceAttr("tencentcloud_gaap_domain_error_page.foo", "set_headers.X-TEST", "test"),
 				),
 			},

tencentcloud/resource_tc_gaap_proxy.go

@@ -98,6 +98,14 @@ func resourceTencentCloudGaapProxy() *schema.Resource {
 				Optional:    true,
 				Description: "Tags of the GAAP proxy. Tags that do not exist are not created automatically.",
 			},
+			"network_type": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ForceNew:     true,
+				ValidateFunc: validateAllowedStringValue(PROXY_NETWORK_TYPE),
+				Description:  "Network type. `normal`: regular BGP, `cn2`: boutique BGP, `triple`: triple play.",
+			},
 
 			// computed
 			"create_time": {
@@ -148,6 +156,7 @@ func resourceTencentCloudGaapProxyCreate(d *schema.ResourceData, m interface{})
 	logId := getLogId(contextNil)
 	ctx := context.WithValue(context.TODO(), logIdKey, logId)
 
+	params := make(map[string]interface{})
 	name := d.Get("name").(string)
 	projectId := d.Get("project_id").(int)
 	bandwidth := d.Get("bandwidth").(int)
@@ -157,9 +166,13 @@ func resourceTencentCloudGaapProxyCreate(d *schema.ResourceData, m interface{})
 	enable := d.Get("enable").(bool)
 	tags := helper.GetTags(d, "tags")
 
+	if v, ok := d.GetOk("network_type"); ok {
+		params["network_type"] = v.(string)
+	}
+
 	service := GaapService{client: m.(*TencentCloudClient).apiV3Conn}
 
-	id, err := service.CreateProxy(ctx, name, accessRegion, realserverRegion, bandwidth, concurrent, projectId, tags)
+	id, err := service.CreateProxy(ctx, name, accessRegion, realserverRegion, bandwidth, concurrent, projectId, tags, params)
 	if err != nil {
 		return err
 	}
@@ -285,6 +298,9 @@ func resourceTencentCloudGaapProxyRead(d *schema.ResourceData, m interface{}) er
 	}
 	_ = d.Set("forward_ip", proxy.ForwardIP)
 
+	if proxy.NetworkType != nil {
+		_ = d.Set("network_type", proxy.NetworkType)
+	}
 	return nil
 }
 

tencentcloud/resource_tc_gaap_proxy_test.go

@@ -182,6 +182,7 @@ resource tencentcloud_gaap_proxy "foo" {
   concurrent        = 2
   access_region     = "Guangzhou"
   realserver_region = "Beijing"
+  network_type = "normal"
 }
 `
 

tencentcloud/service_tencentcloud_gaap.go

@@ -313,6 +313,7 @@ func (me *GaapService) CreateProxy(
 	name, accessRegion, realserverRegion string,
 	bandwidth, concurrent, projectId int,
 	tags map[string]string,
+	params map[string]interface{},
 ) (id string, err error) {
 	logId := getLogId(ctx)
 	client := me.client.UseGaapClient()
@@ -330,6 +331,9 @@ func (me *GaapService) CreateProxy(
 			TagValue: helper.String(v),
 		})
 	}
+	if v, ok := params["network_type"]; ok {
+		createRequest.NetworkType = helper.String(v.(string))
+	}
 
 	if err := resource.Retry(2*writeRetryTimeout, func() *resource.RetryError {
 		ratelimit.Check(createRequest.GetAction())

website/docs/r/gaap_proxy.html.markdown

@@ -37,6 +37,7 @@ The following arguments are supported:
 * `name` - (Required, String) Name of the GAAP proxy, the maximum length is 30.
 * `realserver_region` - (Required, String, ForceNew) Region of the GAAP realserver. Valid value: `NorthChina`, `EastChina`, `SouthChina`, `SouthwestChina`, `Hongkong`, `SL_TAIWAN`, `SoutheastAsia`, `Korea`, `SL_India`, `SL_Australia`, `Europe`, `SL_UK`, `SL_SouthAmerica`, `NorthAmerica`, `SL_MiddleUSA`, `Canada`, `SL_VIET`, `WestIndia`, `Thailand`, `Virginia`, `Russia`, `Japan` and `SL_Indonesia`.
 * `enable` - (Optional, Bool) Indicates whether GAAP proxy is enabled, default value is `true`.
+* `network_type` - (Optional, String, ForceNew) Network type. `normal`: regular BGP, `cn2`: boutique BGP, `triple`: triple play.
 * `project_id` - (Optional, Int) ID of the project within the GAAP proxy, `0` means is default project.
 * `tags` - (Optional, Map) Tags of the GAAP proxy. Tags that do not exist are not created automatically.