From 63eeac7921687214daabf596c03016ddf28281cd Mon Sep 17 00:00:00 2001 From: rudolfzhao Date: Thu, 16 May 2024 17:23:09 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=84=E6=BA=90ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tencentcloud/acctest/basic.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tencentcloud/acctest/basic.go b/tencentcloud/acctest/basic.go index 71f199a868..f4a9c76bc6 100644 --- a/tencentcloud/acctest/basic.go +++ b/tencentcloud/acctest/basic.go @@ -86,18 +86,18 @@ const ( DefaultDayuBgpIp = "bgpip-00000294" DefaultDayuNet = "net-0000007e" - DefaultGaapProxyId = "link-ljb08m2l" - DefaultGaapProxyId2 = "link-8lpyo88p" - DefaultGaapSecurityPolicyId = "sp-5lqp4l77" - DefaultGaapRealserverDomainId1 = "rs-qs0h6wxp" + DefaultGaapProxyId = "link-m9t4yho9" + DefaultGaapProxyId2 = "link-2rk61jn5" + DefaultGaapSecurityPolicyId = "sp-b0kh9zml" + DefaultGaapRealserverDomainId1 = "rs-620u0ahd" DefaultGaapRealserverDomain1 = "github.com" - DefaultGaapRealserverDomainId2 = "rs-qcygnwpd" + DefaultGaapRealserverDomainId2 = "rs-9vkyi1av" DefaultGaapRealserverDomain2 = "www.github.com" - DefaultGaapRealserverIpId1 = "rs-24e1ol23" + DefaultGaapRealserverIpId1 = "rs-4j6rtzqv" DefaultGaapRealserverIp1 = "119.29.29.35" - DefaultGaapRealserverIpId2 = "rs-70qzt26p" + DefaultGaapRealserverIpId2 = "rs-3mlpbuut" DefaultGaapRealserverIp2 = "1.1.1.5" - DefaultHttpsDomainCertificateId = "cert-crg2aynt" + DefaultHttpsDomainCertificateId = "cert-7su3evtr" DefaultSecurityGroup = "sg-ijato2x1" From af8ff50d13dea0d59a9a880eef78cc86e1ab1516 Mon Sep 17 00:00:00 2001 From: andrewjiang Date: Thu, 23 May 2024 14:26:19 +0800 Subject: [PATCH 2/6] docs: update gaap docs --- website/docs/d/gaap_custom_header.html.markdown | 2 +- website/docs/d/gaap_proxy_detail.html.markdown | 2 +- website/docs/d/gaap_proxy_group_statistics.html.markdown | 2 +- website/docs/d/gaap_proxy_groups.html.markdown | 2 +- website/docs/d/gaap_proxy_statistics.html.markdown | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/website/docs/d/gaap_custom_header.html.markdown b/website/docs/d/gaap_custom_header.html.markdown index cf80b66f8d..50d442c4e3 100644 --- a/website/docs/d/gaap_custom_header.html.markdown +++ b/website/docs/d/gaap_custom_header.html.markdown @@ -15,7 +15,7 @@ Use this data source to query detailed information of gaap custom header ```hcl data "tencentcloud_gaap_custom_header" "custom_header" { - rule_id = "rule-9sdhv655" + rule_id = "rule-hddrxgpd" } ``` diff --git a/website/docs/d/gaap_proxy_detail.html.markdown b/website/docs/d/gaap_proxy_detail.html.markdown index c7e6e3ce68..3fc6e859d6 100644 --- a/website/docs/d/gaap_proxy_detail.html.markdown +++ b/website/docs/d/gaap_proxy_detail.html.markdown @@ -15,7 +15,7 @@ Use this data source to query detailed information of gaap proxy detail ```hcl data "tencentcloud_gaap_proxy_detail" "proxy_detail" { - proxy_id = "link-8lpyo88p" + proxy_id = "link-m9t4yho9" } ``` diff --git a/website/docs/d/gaap_proxy_group_statistics.html.markdown b/website/docs/d/gaap_proxy_group_statistics.html.markdown index e25000dc46..8a4a53c709 100644 --- a/website/docs/d/gaap_proxy_group_statistics.html.markdown +++ b/website/docs/d/gaap_proxy_group_statistics.html.markdown @@ -15,7 +15,7 @@ Use this data source to query detailed information of gaap proxy group statistic ```hcl data "tencentcloud_gaap_proxy_group_statistics" "proxy_group_statistics" { - group_id = "link-8lpyo88p" + group_id = "link-m9t4yho9" start_time = "2023-10-09 00:00:00" end_time = "2023-10-09 23:59:59" metric_names = ["InBandwidth", "OutBandwidth", "InFlow", "OutFlow"] diff --git a/website/docs/d/gaap_proxy_groups.html.markdown b/website/docs/d/gaap_proxy_groups.html.markdown index 2cc9eb0534..1bcae66fae 100644 --- a/website/docs/d/gaap_proxy_groups.html.markdown +++ b/website/docs/d/gaap_proxy_groups.html.markdown @@ -18,7 +18,7 @@ data "tencentcloud_gaap_proxy_groups" "proxy_groups" { project_id = 0 filters { name = "GroupId" - values = ["lg-5anbbou5"] + values = ["lg-8h33uhwd"] } } ``` diff --git a/website/docs/d/gaap_proxy_statistics.html.markdown b/website/docs/d/gaap_proxy_statistics.html.markdown index 626e1a0f05..1641c95c9f 100644 --- a/website/docs/d/gaap_proxy_statistics.html.markdown +++ b/website/docs/d/gaap_proxy_statistics.html.markdown @@ -15,9 +15,9 @@ Use this data source to query detailed information of gaap proxy statistics ```hcl data "tencentcloud_gaap_proxy_statistics" "proxy_statistics" { - proxy_id = "link-8lpyo88p" - start_time = "2023-10-09 00:00:00" - end_time = "2023-10-09 23:59:59" + proxy_id = "link-m9t4yho9" + start_time = "2024-05-20 00:00:00" + end_time = "2024-05-20 23:59:59" metric_names = ["InBandwidth", "OutBandwidth", "InFlow", "OutFlow", "InPackets", "OutPackets", "Concurrent", "HttpQPS", "HttpsQPS", "Latency", "PacketLoss"] granularity = 300 } From fd0bdbf423f943715d51970c6208432b788e4851 Mon Sep 17 00:00:00 2001 From: rudolfzhao Date: Wed, 24 Jul 2024 11:27:29 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=84=E6=BA=90ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../services/gaap/data_source_tc_gaap_custom_header_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tencentcloud/services/gaap/data_source_tc_gaap_custom_header_test.go b/tencentcloud/services/gaap/data_source_tc_gaap_custom_header_test.go index 45d6e76451..4926989f35 100644 --- a/tencentcloud/services/gaap/data_source_tc_gaap_custom_header_test.go +++ b/tencentcloud/services/gaap/data_source_tc_gaap_custom_header_test.go @@ -27,6 +27,6 @@ func TestAccTencentCloudGaapCustomHeaderDataSource_basic(t *testing.T) { const testAccGaapCustomHeaderDataSource = ` data "tencentcloud_gaap_custom_header" "custom_header" { - rule_id = "rule-hddrxgpd" + rule_id = "rule-gl1bm2xh" } ` From 9b0b9a737d2048a10472790e6c3d9e1d3685d048 Mon Sep 17 00:00:00 2001 From: rudolfzhao Date: Tue, 10 Sep 2024 12:14:23 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9C=B0=E5=9F=9F?= =?UTF-8?q?=E4=B8=BA=E5=B0=8F=E5=9C=B0=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ..._source_tc_gaap_check_proxy_create_test.go | 4 +-- .../gaap/resource_tc_gaap_proxy_group_test.go | 4 +-- ...source_tc_gaap_proxy_international_test.go | 4 +-- .../gaap/resource_tc_gaap_proxy_test.go | 36 +++++++++---------- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/tencentcloud/services/gaap/data_source_tc_gaap_check_proxy_create_test.go b/tencentcloud/services/gaap/data_source_tc_gaap_check_proxy_create_test.go index 866ec1a6a4..0f7dd0c4ba 100644 --- a/tencentcloud/services/gaap/data_source_tc_gaap_check_proxy_create_test.go +++ b/tencentcloud/services/gaap/data_source_tc_gaap_check_proxy_create_test.go @@ -27,8 +27,8 @@ func TestAccTencentCloudGaapCheckProxyCreateDataSource_basic(t *testing.T) { const testAccGaapCheckProxyCreateDataSource = ` data "tencentcloud_gaap_check_proxy_create" "check_proxy_create" { - access_region = "Guangzhou" - real_server_region = "Beijing" + access_region = "Thailand" + real_server_region = "Jakarta" bandwidth = 10 concurrent = 2 ip_address_version = "IPv4" diff --git a/tencentcloud/services/gaap/resource_tc_gaap_proxy_group_test.go b/tencentcloud/services/gaap/resource_tc_gaap_proxy_group_test.go index 80116eda4b..cd82bae4cb 100644 --- a/tencentcloud/services/gaap/resource_tc_gaap_proxy_group_test.go +++ b/tencentcloud/services/gaap/resource_tc_gaap_proxy_group_test.go @@ -45,7 +45,7 @@ const testAccGaapProxyGroup = ` resource "tencentcloud_gaap_proxy_group" "proxy_group" { project_id = 0 group_name = "tf-test" - real_server_region = "Beijing" + real_server_region = "Jakarta" ip_address_version = "IPv4" package_type = "Thunder" } @@ -55,7 +55,7 @@ const testAccGaapProxyGroupUpdate = ` resource "tencentcloud_gaap_proxy_group" "proxy_group" { project_id = 0 group_name = "tf-test-update" - real_server_region = "Beijing" + real_server_region = "Jakarta" ip_address_version = "IPv4" package_type = "Thunder" } diff --git a/tencentcloud/services/gaap/resource_tc_gaap_proxy_international_test.go b/tencentcloud/services/gaap/resource_tc_gaap_proxy_international_test.go index 573f90e900..6569c8960a 100644 --- a/tencentcloud/services/gaap/resource_tc_gaap_proxy_international_test.go +++ b/tencentcloud/services/gaap/resource_tc_gaap_proxy_international_test.go @@ -51,8 +51,8 @@ resource tencentcloud_gaap_proxy "foo" { name = "ci-test-gaap-proxy" bandwidth = 10 concurrent = 2 - access_region = "Guangzhou" - realserver_region = "Beijing" + access_region = "Thailand" + realserver_region = "Jakarta" network_type = "normal" } ` diff --git a/tencentcloud/services/gaap/resource_tc_gaap_proxy_test.go b/tencentcloud/services/gaap/resource_tc_gaap_proxy_test.go index f9e55ee7a7..98ed7d3cbc 100644 --- a/tencentcloud/services/gaap/resource_tc_gaap_proxy_test.go +++ b/tencentcloud/services/gaap/resource_tc_gaap_proxy_test.go @@ -31,8 +31,8 @@ func TestAccTencentCloudGaapProxyResource_basic(t *testing.T) { resource.TestCheckResourceAttr("tencentcloud_gaap_proxy.foo", "bandwidth", "10"), resource.TestCheckResourceAttr("tencentcloud_gaap_proxy.foo", "concurrent", "2"), resource.TestCheckResourceAttr("tencentcloud_gaap_proxy.foo", "project_id", "0"), - resource.TestCheckResourceAttr("tencentcloud_gaap_proxy.foo", "access_region", "Guangzhou"), - resource.TestCheckResourceAttr("tencentcloud_gaap_proxy.foo", "realserver_region", "Beijing"), + resource.TestCheckResourceAttr("tencentcloud_gaap_proxy.foo", "access_region", "Thailand"), + resource.TestCheckResourceAttr("tencentcloud_gaap_proxy.foo", "realserver_region", "Jakarta"), resource.TestCheckResourceAttr("tencentcloud_gaap_proxy.foo", "enable", "true"), resource.TestCheckNoResourceAttr("tencentcloud_gaap_proxy.foo", "tags"), resource.TestCheckResourceAttrSet("tencentcloud_gaap_proxy.foo", "create_time"), @@ -69,8 +69,8 @@ func TestAccTencentCloudGaapProxyResource_update(t *testing.T) { resource.TestCheckResourceAttr("tencentcloud_gaap_proxy.foo", "bandwidth", "10"), resource.TestCheckResourceAttr("tencentcloud_gaap_proxy.foo", "concurrent", "2"), resource.TestCheckResourceAttr("tencentcloud_gaap_proxy.foo", "project_id", "0"), - resource.TestCheckResourceAttr("tencentcloud_gaap_proxy.foo", "access_region", "Guangzhou"), - resource.TestCheckResourceAttr("tencentcloud_gaap_proxy.foo", "realserver_region", "Beijing"), + resource.TestCheckResourceAttr("tencentcloud_gaap_proxy.foo", "access_region", "Thailand"), + resource.TestCheckResourceAttr("tencentcloud_gaap_proxy.foo", "realserver_region", "Jakarta"), resource.TestCheckResourceAttr("tencentcloud_gaap_proxy.foo", "enable", "true"), resource.TestCheckNoResourceAttr("tencentcloud_gaap_proxy.foo", "tags"), resource.TestCheckResourceAttrSet("tencentcloud_gaap_proxy.foo", "create_time"), @@ -184,8 +184,8 @@ resource tencentcloud_gaap_proxy "foo" { name = "ci-test-gaap-proxy" bandwidth = 10 concurrent = 2 - access_region = "Guangzhou" - realserver_region = "Beijing" + access_region = "Thailand" + realserver_region = "Jakarta" network_type = "normal" } ` @@ -195,8 +195,8 @@ resource tencentcloud_gaap_proxy "foo" { name = "ci-test-gaap-proxy-update" bandwidth = 10 concurrent = 2 - access_region = "Guangzhou" - realserver_region = "Beijing" + access_region = "Thailand" + realserver_region = "Jakarta" } ` @@ -205,8 +205,8 @@ resource tencentcloud_gaap_proxy "foo" { name = "ci-test-gaap-proxy-new" bandwidth = 10 concurrent = 2 - access_region = "Guangzhou" - realserver_region = "Beijing" + access_region = "Thailand" + realserver_region = "Jakarta" } ` @@ -215,8 +215,8 @@ resource tencentcloud_gaap_proxy "foo" { name = "ci-test-gaap-proxy-new" bandwidth = 20 concurrent = 2 - access_region = "Guangzhou" - realserver_region = "Beijing" + access_region = "Thailand" + realserver_region = "Jakarta" } ` @@ -225,8 +225,8 @@ resource tencentcloud_gaap_proxy "foo" { name = "ci-test-gaap-proxy-new" bandwidth = 20 concurrent = 10 - access_region = "Guangzhou" - realserver_region = "Beijing" + access_region = "Thailand" + realserver_region = "Jakarta" } ` @@ -235,8 +235,8 @@ resource tencentcloud_gaap_proxy "foo" { name = "ci-test-gaap-proxy-new" bandwidth = 20 concurrent = 10 - access_region = "Guangzhou" - realserver_region = "Beijing" + access_region = "Thailand" + realserver_region = "Jakarta" enable = false tags = { @@ -250,8 +250,8 @@ resource tencentcloud_gaap_proxy "foo" { name = "ci-test-gaap-proxy-new" bandwidth = 20 concurrent = 10 - access_region = "Guangzhou" - realserver_region = "Beijing" + access_region = "Thailand" + realserver_region = "Jakarta" enable = false tags = { From 01d18e233bae40018770b64129dea468f747d1a6 Mon Sep 17 00:00:00 2001 From: rudolfzhao Date: Fri, 1 Nov 2024 14:50:23 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=9A=E9=81=93?= =?UTF-8?q?=E5=9C=B0=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ..._source_tc_gaap_check_proxy_create_test.go | 4 +- .../resource_tc_gaap_layer4_listener_test.go | 98 +++++++++++++++++++ .../gaap/resource_tc_gaap_proxy_group_test.go | 4 +- ...source_tc_gaap_proxy_international_test.go | 4 +- .../gaap/resource_tc_gaap_proxy_test.go | 36 +++---- 5 files changed, 122 insertions(+), 24 deletions(-) diff --git a/tencentcloud/services/gaap/data_source_tc_gaap_check_proxy_create_test.go b/tencentcloud/services/gaap/data_source_tc_gaap_check_proxy_create_test.go index 0f7dd0c4ba..7ecc68d0ef 100644 --- a/tencentcloud/services/gaap/data_source_tc_gaap_check_proxy_create_test.go +++ b/tencentcloud/services/gaap/data_source_tc_gaap_check_proxy_create_test.go @@ -27,8 +27,8 @@ func TestAccTencentCloudGaapCheckProxyCreateDataSource_basic(t *testing.T) { const testAccGaapCheckProxyCreateDataSource = ` data "tencentcloud_gaap_check_proxy_create" "check_proxy_create" { - access_region = "Thailand" - real_server_region = "Jakarta" + access_region = "Beijing" + real_server_region = "Guangzhou" bandwidth = 10 concurrent = 2 ip_address_version = "IPv4" diff --git a/tencentcloud/services/gaap/resource_tc_gaap_layer4_listener_test.go b/tencentcloud/services/gaap/resource_tc_gaap_layer4_listener_test.go index b37273ede4..8e01496b97 100644 --- a/tencentcloud/services/gaap/resource_tc_gaap_layer4_listener_test.go +++ b/tencentcloud/services/gaap/resource_tc_gaap_layer4_listener_test.go @@ -735,3 +735,101 @@ resource tencentcloud_gaap_layer4_listener "foo" { } } `, tcacctest.DefaultGaapProxyId, tcacctest.DefaultGaapRealserverIpId1, tcacctest.DefaultGaapRealserverIp1, tcacctest.DefaultGaapRealserverIpId2, tcacctest.DefaultGaapRealserverIp2) + + + +resource tencentcloud_gaap_realserver "rs_domain-1" { + domain = "ah-tencent-zpl.com" + name = "tf_gaap_test_rs_domain-1" +} + +resource tencentcloud_gaap_realserver "rs_ip-1" { + ip = "1.2.53.67" + name = "tf_gaap_test_rs_ip-1" +} + + +resource tencentcloud_gaap_proxy "foo" { + name = "tf-ci-test-gaap-proxy-GZ-SH-1" + bandwidth = 10 + concurrent = 2 + access_region = "Guangzhou" + realserver_region = "Shanghai" +} + +resource tencentcloud_gaap_layer4_listener "udp_l4-1" { + proxy_id = tencentcloud_gaap_proxy.foo.id + protocol = "UDP" + name = "tf-ci-test-gaap-udp-l4-1" + port = 8080 + realserver_type = "DOMAIN" + realserver_bind_set{ + id = tencentcloud_gaap_realserver.rs_domain-1.id + ip = tencentcloud_gaap_realserver.rs_domain-1.domain + port = 456 + } + health_check = true + connect_timeout = 5 + interval = 10 + healthy_threshold = 1 + unhealthy_threshold = 1 + check_type = "PORT" + check_port = "6666" + context_type = "TEXT" + send_context = "111" + recv_context = "222" +} + +resource tencentcloud_gaap_layer4_listener "udp_l4-2" { + proxy_id = tencentcloud_gaap_proxy.foo.id + protocol = "UDP" + name = "tf-ci-test-gaap-udp-l4-2" + port = 8081 + realserver_type = "IP" + realserver_bind_set{ + id = tencentcloud_gaap_realserver.rs_ip-1.id + ip = tencentcloud_gaap_realserver.rs_ip-1.ip + port = 4567 + } + health_check = true + check_type = "PING" + connect_timeout = 5 + interval = 10 + healthy_threshold = 1 + unhealthy_threshold = 1 +} + +resource tencentcloud_gaap_layer4_listener "udp_l4-3" { + proxy_id = tencentcloud_gaap_proxy.foo.id + protocol = "UDP" + name = "tf-ci-test-gaap-udp-l4-3" + port = 8082 + realserver_type = "IP" + health_check = true + check_type = "PING" +} + +resource tencentcloud_gaap_layer4_listener "udp_l4-4" { + proxy_id = tencentcloud_gaap_proxy.foo.id + protocol = "UDP" + name = "tf-ci-test-gaap-udp-l4-4" + port = 8083 + realserver_type = "IP" + health_check = true + check_type = "PORT" + healthy_threshold = 1 + unhealthy_threshold = 1 + check_type = "PORT" + check_port = "6666" + context_type = "TEXT" + send_context = "111" + recv_context = "222" +} + +resource tencentcloud_gaap_layer4_listener "udp_l4-5" { + proxy_id = tencentcloud_gaap_proxy.foo.id + protocol = "UDP" + name = "tf-ci-test-gaap-udp-l4-5" + port = 8084 + realserver_type = "IP" +} \ No newline at end of file diff --git a/tencentcloud/services/gaap/resource_tc_gaap_proxy_group_test.go b/tencentcloud/services/gaap/resource_tc_gaap_proxy_group_test.go index cd82bae4cb..97e98dd922 100644 --- a/tencentcloud/services/gaap/resource_tc_gaap_proxy_group_test.go +++ b/tencentcloud/services/gaap/resource_tc_gaap_proxy_group_test.go @@ -45,7 +45,7 @@ const testAccGaapProxyGroup = ` resource "tencentcloud_gaap_proxy_group" "proxy_group" { project_id = 0 group_name = "tf-test" - real_server_region = "Jakarta" + real_server_region = "Guangzhou" ip_address_version = "IPv4" package_type = "Thunder" } @@ -55,7 +55,7 @@ const testAccGaapProxyGroupUpdate = ` resource "tencentcloud_gaap_proxy_group" "proxy_group" { project_id = 0 group_name = "tf-test-update" - real_server_region = "Jakarta" + real_server_region = "Guangzhou" ip_address_version = "IPv4" package_type = "Thunder" } diff --git a/tencentcloud/services/gaap/resource_tc_gaap_proxy_international_test.go b/tencentcloud/services/gaap/resource_tc_gaap_proxy_international_test.go index 6569c8960a..37a41ef68d 100644 --- a/tencentcloud/services/gaap/resource_tc_gaap_proxy_international_test.go +++ b/tencentcloud/services/gaap/resource_tc_gaap_proxy_international_test.go @@ -51,8 +51,8 @@ resource tencentcloud_gaap_proxy "foo" { name = "ci-test-gaap-proxy" bandwidth = 10 concurrent = 2 - access_region = "Thailand" - realserver_region = "Jakarta" + access_region = "Beijing" + realserver_region = "Guangzhou" network_type = "normal" } ` diff --git a/tencentcloud/services/gaap/resource_tc_gaap_proxy_test.go b/tencentcloud/services/gaap/resource_tc_gaap_proxy_test.go index 98ed7d3cbc..4f267d5f9a 100644 --- a/tencentcloud/services/gaap/resource_tc_gaap_proxy_test.go +++ b/tencentcloud/services/gaap/resource_tc_gaap_proxy_test.go @@ -31,8 +31,8 @@ func TestAccTencentCloudGaapProxyResource_basic(t *testing.T) { resource.TestCheckResourceAttr("tencentcloud_gaap_proxy.foo", "bandwidth", "10"), resource.TestCheckResourceAttr("tencentcloud_gaap_proxy.foo", "concurrent", "2"), resource.TestCheckResourceAttr("tencentcloud_gaap_proxy.foo", "project_id", "0"), - resource.TestCheckResourceAttr("tencentcloud_gaap_proxy.foo", "access_region", "Thailand"), - resource.TestCheckResourceAttr("tencentcloud_gaap_proxy.foo", "realserver_region", "Jakarta"), + resource.TestCheckResourceAttr("tencentcloud_gaap_proxy.foo", "access_region", "Beijing"), + resource.TestCheckResourceAttr("tencentcloud_gaap_proxy.foo", "realserver_region", "Guangzhou"), resource.TestCheckResourceAttr("tencentcloud_gaap_proxy.foo", "enable", "true"), resource.TestCheckNoResourceAttr("tencentcloud_gaap_proxy.foo", "tags"), resource.TestCheckResourceAttrSet("tencentcloud_gaap_proxy.foo", "create_time"), @@ -69,8 +69,8 @@ func TestAccTencentCloudGaapProxyResource_update(t *testing.T) { resource.TestCheckResourceAttr("tencentcloud_gaap_proxy.foo", "bandwidth", "10"), resource.TestCheckResourceAttr("tencentcloud_gaap_proxy.foo", "concurrent", "2"), resource.TestCheckResourceAttr("tencentcloud_gaap_proxy.foo", "project_id", "0"), - resource.TestCheckResourceAttr("tencentcloud_gaap_proxy.foo", "access_region", "Thailand"), - resource.TestCheckResourceAttr("tencentcloud_gaap_proxy.foo", "realserver_region", "Jakarta"), + resource.TestCheckResourceAttr("tencentcloud_gaap_proxy.foo", "access_region", "Beijing"), + resource.TestCheckResourceAttr("tencentcloud_gaap_proxy.foo", "realserver_region", "Guangzhou"), resource.TestCheckResourceAttr("tencentcloud_gaap_proxy.foo", "enable", "true"), resource.TestCheckNoResourceAttr("tencentcloud_gaap_proxy.foo", "tags"), resource.TestCheckResourceAttrSet("tencentcloud_gaap_proxy.foo", "create_time"), @@ -184,8 +184,8 @@ resource tencentcloud_gaap_proxy "foo" { name = "ci-test-gaap-proxy" bandwidth = 10 concurrent = 2 - access_region = "Thailand" - realserver_region = "Jakarta" + access_region = "Beijing" + realserver_region = "Guangzhou" network_type = "normal" } ` @@ -195,8 +195,8 @@ resource tencentcloud_gaap_proxy "foo" { name = "ci-test-gaap-proxy-update" bandwidth = 10 concurrent = 2 - access_region = "Thailand" - realserver_region = "Jakarta" + access_region = "Beijing" + realserver_region = "Guangzhou" } ` @@ -205,8 +205,8 @@ resource tencentcloud_gaap_proxy "foo" { name = "ci-test-gaap-proxy-new" bandwidth = 10 concurrent = 2 - access_region = "Thailand" - realserver_region = "Jakarta" + access_region = "Beijing" + realserver_region = "Guangzhou" } ` @@ -215,8 +215,8 @@ resource tencentcloud_gaap_proxy "foo" { name = "ci-test-gaap-proxy-new" bandwidth = 20 concurrent = 2 - access_region = "Thailand" - realserver_region = "Jakarta" + access_region = "Beijing" + realserver_region = "Guangzhou" } ` @@ -225,8 +225,8 @@ resource tencentcloud_gaap_proxy "foo" { name = "ci-test-gaap-proxy-new" bandwidth = 20 concurrent = 10 - access_region = "Thailand" - realserver_region = "Jakarta" + access_region = "Beijing" + realserver_region = "Guangzhou" } ` @@ -235,8 +235,8 @@ resource tencentcloud_gaap_proxy "foo" { name = "ci-test-gaap-proxy-new" bandwidth = 20 concurrent = 10 - access_region = "Thailand" - realserver_region = "Jakarta" + access_region = "Beijing" + realserver_region = "Guangzhou" enable = false tags = { @@ -250,8 +250,8 @@ resource tencentcloud_gaap_proxy "foo" { name = "ci-test-gaap-proxy-new" bandwidth = 20 concurrent = 10 - access_region = "Thailand" - realserver_region = "Jakarta" + access_region = "Beijing" + realserver_region = "Guangzhou" enable = false tags = { From 89dc999efc084a97ab1a009676c0b3929b0a5094 Mon Sep 17 00:00:00 2001 From: rudolfzhao Date: Fri, 1 Nov 2024 14:53:11 +0800 Subject: [PATCH 6/6] update --- .../resource_tc_gaap_layer4_listener_test.go | 98 ------------------- 1 file changed, 98 deletions(-) diff --git a/tencentcloud/services/gaap/resource_tc_gaap_layer4_listener_test.go b/tencentcloud/services/gaap/resource_tc_gaap_layer4_listener_test.go index 8e01496b97..b37273ede4 100644 --- a/tencentcloud/services/gaap/resource_tc_gaap_layer4_listener_test.go +++ b/tencentcloud/services/gaap/resource_tc_gaap_layer4_listener_test.go @@ -735,101 +735,3 @@ resource tencentcloud_gaap_layer4_listener "foo" { } } `, tcacctest.DefaultGaapProxyId, tcacctest.DefaultGaapRealserverIpId1, tcacctest.DefaultGaapRealserverIp1, tcacctest.DefaultGaapRealserverIpId2, tcacctest.DefaultGaapRealserverIp2) - - - -resource tencentcloud_gaap_realserver "rs_domain-1" { - domain = "ah-tencent-zpl.com" - name = "tf_gaap_test_rs_domain-1" -} - -resource tencentcloud_gaap_realserver "rs_ip-1" { - ip = "1.2.53.67" - name = "tf_gaap_test_rs_ip-1" -} - - -resource tencentcloud_gaap_proxy "foo" { - name = "tf-ci-test-gaap-proxy-GZ-SH-1" - bandwidth = 10 - concurrent = 2 - access_region = "Guangzhou" - realserver_region = "Shanghai" -} - -resource tencentcloud_gaap_layer4_listener "udp_l4-1" { - proxy_id = tencentcloud_gaap_proxy.foo.id - protocol = "UDP" - name = "tf-ci-test-gaap-udp-l4-1" - port = 8080 - realserver_type = "DOMAIN" - realserver_bind_set{ - id = tencentcloud_gaap_realserver.rs_domain-1.id - ip = tencentcloud_gaap_realserver.rs_domain-1.domain - port = 456 - } - health_check = true - connect_timeout = 5 - interval = 10 - healthy_threshold = 1 - unhealthy_threshold = 1 - check_type = "PORT" - check_port = "6666" - context_type = "TEXT" - send_context = "111" - recv_context = "222" -} - -resource tencentcloud_gaap_layer4_listener "udp_l4-2" { - proxy_id = tencentcloud_gaap_proxy.foo.id - protocol = "UDP" - name = "tf-ci-test-gaap-udp-l4-2" - port = 8081 - realserver_type = "IP" - realserver_bind_set{ - id = tencentcloud_gaap_realserver.rs_ip-1.id - ip = tencentcloud_gaap_realserver.rs_ip-1.ip - port = 4567 - } - health_check = true - check_type = "PING" - connect_timeout = 5 - interval = 10 - healthy_threshold = 1 - unhealthy_threshold = 1 -} - -resource tencentcloud_gaap_layer4_listener "udp_l4-3" { - proxy_id = tencentcloud_gaap_proxy.foo.id - protocol = "UDP" - name = "tf-ci-test-gaap-udp-l4-3" - port = 8082 - realserver_type = "IP" - health_check = true - check_type = "PING" -} - -resource tencentcloud_gaap_layer4_listener "udp_l4-4" { - proxy_id = tencentcloud_gaap_proxy.foo.id - protocol = "UDP" - name = "tf-ci-test-gaap-udp-l4-4" - port = 8083 - realserver_type = "IP" - health_check = true - check_type = "PORT" - healthy_threshold = 1 - unhealthy_threshold = 1 - check_type = "PORT" - check_port = "6666" - context_type = "TEXT" - send_context = "111" - recv_context = "222" -} - -resource tencentcloud_gaap_layer4_listener "udp_l4-5" { - proxy_id = tencentcloud_gaap_proxy.foo.id - protocol = "UDP" - name = "tf-ci-test-gaap-udp-l4-5" - port = 8084 - realserver_type = "IP" -} \ No newline at end of file