From 63eeac7921687214daabf596c03016ddf28281cd Mon Sep 17 00:00:00 2001 From: rudolfzhao Date: Thu, 16 May 2024 17:23:09 +0800 Subject: [PATCH 1/8] =?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 e9520e416fffe96f02ce0a1832f1cca038dd3183 Mon Sep 17 00:00:00 2001 From: rudolfzhao Date: Tue, 21 May 2024 20:04:04 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=94=A8=E4=BE=8B=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../services/gaap/data_source_tc_gaap_custom_header.md | 2 +- .../services/gaap/data_source_tc_gaap_custom_header_test.go | 2 +- .../data_source_tc_gaap_domain_error_page_infos_test.go | 2 +- .../gaap/data_source_tc_gaap_listener_real_servers_test.go | 2 +- .../gaap/data_source_tc_gaap_listener_statistics_test.go | 6 +++--- .../gaap/data_source_tc_gaap_proxies_status_test.go | 2 +- .../services/gaap/data_source_tc_gaap_proxy_detail.md | 2 +- .../services/gaap/data_source_tc_gaap_proxy_detail_test.go | 2 +- .../gaap/data_source_tc_gaap_proxy_group_statistics.md | 2 +- .../gaap/data_source_tc_gaap_proxy_group_statistics_test.go | 4 ++-- .../services/gaap/data_source_tc_gaap_proxy_groups.md | 2 +- .../services/gaap/data_source_tc_gaap_proxy_groups_test.go | 4 ++-- .../services/gaap/data_source_tc_gaap_proxy_statistics.md | 6 +++--- .../gaap/data_source_tc_gaap_proxy_statistics_test.go | 6 +++--- .../gaap/data_source_tc_gaap_rule_real_servers_test.go | 2 +- 15 files changed, 23 insertions(+), 23 deletions(-) diff --git a/tencentcloud/services/gaap/data_source_tc_gaap_custom_header.md b/tencentcloud/services/gaap/data_source_tc_gaap_custom_header.md index 082ee67579..1dfa984993 100644 --- a/tencentcloud/services/gaap/data_source_tc_gaap_custom_header.md +++ b/tencentcloud/services/gaap/data_source_tc_gaap_custom_header.md @@ -4,6 +4,6 @@ Example Usage ```hcl data "tencentcloud_gaap_custom_header" "custom_header" { - rule_id = "rule-9sdhv655" + rule_id = "rule-hddrxgpd" } ``` \ No newline at end of file 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 4860a9ab65..45d6e76451 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-9sdhv655" + rule_id = "rule-hddrxgpd" } ` diff --git a/tencentcloud/services/gaap/data_source_tc_gaap_domain_error_page_infos_test.go b/tencentcloud/services/gaap/data_source_tc_gaap_domain_error_page_infos_test.go index 549218b1db..bd6cd7d9a0 100644 --- a/tencentcloud/services/gaap/data_source_tc_gaap_domain_error_page_infos_test.go +++ b/tencentcloud/services/gaap/data_source_tc_gaap_domain_error_page_infos_test.go @@ -27,6 +27,6 @@ func TestAccTencentCloudGaapDomainErrorPageInfosDataSource_basic(t *testing.T) { const testAccGaapDomainErrorPageInfosDataSource = ` data "tencentcloud_gaap_domain_error_page_infos" "domain_error_page_infos" { - error_page_ids = ["errorPage-mh4k07v5"] + error_page_ids = ["errorPage-ogeq0we1"] } ` diff --git a/tencentcloud/services/gaap/data_source_tc_gaap_listener_real_servers_test.go b/tencentcloud/services/gaap/data_source_tc_gaap_listener_real_servers_test.go index b9bc7acf02..3f990011e7 100644 --- a/tencentcloud/services/gaap/data_source_tc_gaap_listener_real_servers_test.go +++ b/tencentcloud/services/gaap/data_source_tc_gaap_listener_real_servers_test.go @@ -28,6 +28,6 @@ func TestAccTencentCloudGaapListenerRealServersDataSource_basic(t *testing.T) { const testAccGaapListenerRealServersDataSource = ` data "tencentcloud_gaap_listener_real_servers" "listener_real_servers" { - listener_id = "listener-4yrzte61" + listener_id = "listener-2zfpeb8f" } ` diff --git a/tencentcloud/services/gaap/data_source_tc_gaap_listener_statistics_test.go b/tencentcloud/services/gaap/data_source_tc_gaap_listener_statistics_test.go index b93c8cdcb7..5f4427ccd8 100644 --- a/tencentcloud/services/gaap/data_source_tc_gaap_listener_statistics_test.go +++ b/tencentcloud/services/gaap/data_source_tc_gaap_listener_statistics_test.go @@ -27,9 +27,9 @@ func TestAccTencentCloudGaapListenerStatisticsDataSource_basic(t *testing.T) { const testAccGaapListenerStatisticsDataSource = ` data "tencentcloud_gaap_listener_statistics" "listener_statistics" { - listener_id = "listener-2s3lghkv" - start_time = "2023-10-19 00:00:00" - end_time = "2023-10-19 23:59:59" + listener_id = "listener-5xjxv77h" + start_time = "2024-05-20 00:00:00" + end_time = "2024-05-20 23:59:59" metric_names = ["InBandwidth", "OutBandwidth", "InPackets", "OutPackets", "Concurrent"] granularity = 300 } diff --git a/tencentcloud/services/gaap/data_source_tc_gaap_proxies_status_test.go b/tencentcloud/services/gaap/data_source_tc_gaap_proxies_status_test.go index 2fa8bd2ce5..6c006a1261 100644 --- a/tencentcloud/services/gaap/data_source_tc_gaap_proxies_status_test.go +++ b/tencentcloud/services/gaap/data_source_tc_gaap_proxies_status_test.go @@ -27,6 +27,6 @@ func TestAccTencentCloudGaapProxiesStatusDataSource_basic(t *testing.T) { const testAccGaapProxiesStatusDataSource = ` data "tencentcloud_gaap_proxies_status" "proxies_status" { - proxy_ids = ["link-8lpyo88p"] + proxy_ids = ["link-m9t4yho9"] } ` diff --git a/tencentcloud/services/gaap/data_source_tc_gaap_proxy_detail.md b/tencentcloud/services/gaap/data_source_tc_gaap_proxy_detail.md index c074e5b579..943a6c54ad 100644 --- a/tencentcloud/services/gaap/data_source_tc_gaap_proxy_detail.md +++ b/tencentcloud/services/gaap/data_source_tc_gaap_proxy_detail.md @@ -4,6 +4,6 @@ Example Usage ```hcl data "tencentcloud_gaap_proxy_detail" "proxy_detail" { - proxy_id = "link-8lpyo88p" + proxy_id = "link-m9t4yho9" } ``` \ No newline at end of file diff --git a/tencentcloud/services/gaap/data_source_tc_gaap_proxy_detail_test.go b/tencentcloud/services/gaap/data_source_tc_gaap_proxy_detail_test.go index e9c27f0b34..28b19519cc 100644 --- a/tencentcloud/services/gaap/data_source_tc_gaap_proxy_detail_test.go +++ b/tencentcloud/services/gaap/data_source_tc_gaap_proxy_detail_test.go @@ -27,6 +27,6 @@ func TestAccTencentCloudGaapProxyDetailDataSource_basic(t *testing.T) { const testAccGaapProxyDetailDataSource = ` data "tencentcloud_gaap_proxy_detail" "proxy_detail" { - proxy_id = "link-8lpyo88p" + proxy_id = "link-m9t4yho9" } ` diff --git a/tencentcloud/services/gaap/data_source_tc_gaap_proxy_group_statistics.md b/tencentcloud/services/gaap/data_source_tc_gaap_proxy_group_statistics.md index f605917dd6..a36335ccb6 100644 --- a/tencentcloud/services/gaap/data_source_tc_gaap_proxy_group_statistics.md +++ b/tencentcloud/services/gaap/data_source_tc_gaap_proxy_group_statistics.md @@ -4,7 +4,7 @@ Example Usage ```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/tencentcloud/services/gaap/data_source_tc_gaap_proxy_group_statistics_test.go b/tencentcloud/services/gaap/data_source_tc_gaap_proxy_group_statistics_test.go index 8df03bb13a..6987befb89 100644 --- a/tencentcloud/services/gaap/data_source_tc_gaap_proxy_group_statistics_test.go +++ b/tencentcloud/services/gaap/data_source_tc_gaap_proxy_group_statistics_test.go @@ -28,8 +28,8 @@ func TestAccTencentCloudGaapProxyGroupStatisticsDataSource_basic(t *testing.T) { const testAccGaapProxyGroupStatisticsDataSource = ` data "tencentcloud_gaap_proxy_group_statistics" "proxy_group_statistics" { group_id = "link-8lpyo88p" - start_time = "2023-10-09 00:00:00" - end_time = "2023-10-09 23:59:59" + start_time = "2024-05-20 00:00:00" + end_time = "2024-05-20 23:59:59" metric_names = ["InBandwidth", "OutBandwidth", "InFlow", "OutFlow"] granularity = 300 } diff --git a/tencentcloud/services/gaap/data_source_tc_gaap_proxy_groups.md b/tencentcloud/services/gaap/data_source_tc_gaap_proxy_groups.md index accdbf65b3..9373ef20d6 100644 --- a/tencentcloud/services/gaap/data_source_tc_gaap_proxy_groups.md +++ b/tencentcloud/services/gaap/data_source_tc_gaap_proxy_groups.md @@ -7,7 +7,7 @@ data "tencentcloud_gaap_proxy_groups" "proxy_groups" { project_id = 0 filters { name = "GroupId" - values = ["lg-5anbbou5"] + values = ["lg-8h33uhwd"] } } ``` \ No newline at end of file diff --git a/tencentcloud/services/gaap/data_source_tc_gaap_proxy_groups_test.go b/tencentcloud/services/gaap/data_source_tc_gaap_proxy_groups_test.go index 9fda9d1b2b..b256103ab6 100644 --- a/tencentcloud/services/gaap/data_source_tc_gaap_proxy_groups_test.go +++ b/tencentcloud/services/gaap/data_source_tc_gaap_proxy_groups_test.go @@ -18,7 +18,7 @@ func TestAccTencentCloudGaapProxyGroupsDataSource_basic(t *testing.T) { Config: testAccGaapProxyGroupsDataSource, Check: resource.ComposeTestCheckFunc( tcacctest.AccCheckTencentCloudDataSourceID("data.tencentcloud_gaap_proxy_groups.proxy_groups"), - resource.TestCheckResourceAttr("data.tencentcloud_gaap_proxy_groups.proxy_groups", "proxy_group_list.0.group_id", "lg-5anbbou5"), + resource.TestCheckResourceAttr("data.tencentcloud_gaap_proxy_groups.proxy_groups", "proxy_group_list.0.group_id", "lg-8h33uhwd"), ), }, }, @@ -30,7 +30,7 @@ data "tencentcloud_gaap_proxy_groups" "proxy_groups" { project_id = 0 filters { name = "GroupId" - values = ["lg-5anbbou5"] + values = ["lg-8h33uhwd"] } } ` diff --git a/tencentcloud/services/gaap/data_source_tc_gaap_proxy_statistics.md b/tencentcloud/services/gaap/data_source_tc_gaap_proxy_statistics.md index d4a3b74110..7f76ba62bc 100644 --- a/tencentcloud/services/gaap/data_source_tc_gaap_proxy_statistics.md +++ b/tencentcloud/services/gaap/data_source_tc_gaap_proxy_statistics.md @@ -4,9 +4,9 @@ Example Usage ```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 = "2023-05-20 23:59:59" metric_names = ["InBandwidth", "OutBandwidth", "InFlow", "OutFlow", "InPackets", "OutPackets", "Concurrent", "HttpQPS", "HttpsQPS", "Latency", "PacketLoss"] granularity = 300 } diff --git a/tencentcloud/services/gaap/data_source_tc_gaap_proxy_statistics_test.go b/tencentcloud/services/gaap/data_source_tc_gaap_proxy_statistics_test.go index 4197ff10af..cc4fd9822e 100644 --- a/tencentcloud/services/gaap/data_source_tc_gaap_proxy_statistics_test.go +++ b/tencentcloud/services/gaap/data_source_tc_gaap_proxy_statistics_test.go @@ -27,9 +27,9 @@ func TestAccTencentCloudGaapProxyStatisticsDataSource_basic(t *testing.T) { const testAccGaapProxyStatisticsDataSource = ` 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 } diff --git a/tencentcloud/services/gaap/data_source_tc_gaap_rule_real_servers_test.go b/tencentcloud/services/gaap/data_source_tc_gaap_rule_real_servers_test.go index 7cccbd95b4..7e6b2aa4dc 100644 --- a/tencentcloud/services/gaap/data_source_tc_gaap_rule_real_servers_test.go +++ b/tencentcloud/services/gaap/data_source_tc_gaap_rule_real_servers_test.go @@ -28,6 +28,6 @@ func TestAccTencentCloudGaapRuleRealServersDataSource_basic(t *testing.T) { const testAccGaapRuleRealServersDataSource = ` data "tencentcloud_gaap_rule_real_servers" "rule_real_servers" { - rule_id = "rule-9sdhv655" + rule_id = "rule-hddrxgpd" } ` From 4e05731018986369e179621a48529c7719dcda6f Mon Sep 17 00:00:00 2001 From: rudolfzhao Date: Tue, 21 May 2024 20:08:35 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=94=A8=E4=BE=8B=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../services/gaap/data_source_tc_gaap_proxy_statistics.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tencentcloud/services/gaap/data_source_tc_gaap_proxy_statistics.md b/tencentcloud/services/gaap/data_source_tc_gaap_proxy_statistics.md index 7f76ba62bc..354b137cf8 100644 --- a/tencentcloud/services/gaap/data_source_tc_gaap_proxy_statistics.md +++ b/tencentcloud/services/gaap/data_source_tc_gaap_proxy_statistics.md @@ -6,7 +6,7 @@ Example Usage data "tencentcloud_gaap_proxy_statistics" "proxy_statistics" { proxy_id = "link-m9t4yho9" start_time = "2024-05-20 00:00:00" - end_time = "2023-05-20 23:59:59" + end_time = "2024-05-20 23:59:59" metric_names = ["InBandwidth", "OutBandwidth", "InFlow", "OutFlow", "InPackets", "OutPackets", "Concurrent", "HttpQPS", "HttpsQPS", "Latency", "PacketLoss"] granularity = 300 } From f5e961ad398b03a00bcbacb6dda7dad0aacb4199 Mon Sep 17 00:00:00 2001 From: rudolfzhao Date: Wed, 22 May 2024 15:25:42 +0800 Subject: [PATCH 4/8] =?UTF-8?q?[]=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=94=A8=E4=BE=8B=E8=B5=84=E6=BA=90=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...rce_tc_gaap_proxy_group_statistics_test.go | 2 +- ...data_source_tc_gaap_real_servers_status.md | 2 +- ...source_tc_gaap_real_servers_status_test.go | 2 +- .../data_source_tc_gaap_realservers_test.go | 10 +++--- .../resource_tc_gaap_custom_header_test.go | 8 ++--- ...resource_tc_gaap_global_domain_dns_test.go | 14 ++++---- .../gaap/resource_tc_gaap_http_domain_test.go | 35 +++++++++++++++---- .../resource_tc_gaap_layer7_listener_test.go | 7 ++++ .../resource_tc_gaap_security_policy_test.go | 6 ++-- 9 files changed, 57 insertions(+), 29 deletions(-) diff --git a/tencentcloud/services/gaap/data_source_tc_gaap_proxy_group_statistics_test.go b/tencentcloud/services/gaap/data_source_tc_gaap_proxy_group_statistics_test.go index 6987befb89..013d53cd60 100644 --- a/tencentcloud/services/gaap/data_source_tc_gaap_proxy_group_statistics_test.go +++ b/tencentcloud/services/gaap/data_source_tc_gaap_proxy_group_statistics_test.go @@ -27,7 +27,7 @@ func TestAccTencentCloudGaapProxyGroupStatisticsDataSource_basic(t *testing.T) { const testAccGaapProxyGroupStatisticsDataSource = ` data "tencentcloud_gaap_proxy_group_statistics" "proxy_group_statistics" { - group_id = "link-8lpyo88p" + group_id = "link-2rk61jn5" start_time = "2024-05-20 00:00:00" end_time = "2024-05-20 23:59:59" metric_names = ["InBandwidth", "OutBandwidth", "InFlow", "OutFlow"] diff --git a/tencentcloud/services/gaap/data_source_tc_gaap_real_servers_status.md b/tencentcloud/services/gaap/data_source_tc_gaap_real_servers_status.md index 5daf504086..61c624d2c4 100644 --- a/tencentcloud/services/gaap/data_source_tc_gaap_real_servers_status.md +++ b/tencentcloud/services/gaap/data_source_tc_gaap_real_servers_status.md @@ -4,6 +4,6 @@ Example Usage ```hcl data "tencentcloud_gaap_real_servers_status" "real_servers_status" { - real_server_ids = ["rs-qcygnwpd"] + real_server_ids = ["rs-3mlpbuut"] } ``` \ No newline at end of file diff --git a/tencentcloud/services/gaap/data_source_tc_gaap_real_servers_status_test.go b/tencentcloud/services/gaap/data_source_tc_gaap_real_servers_status_test.go index b28c2e7344..364b0efc3b 100644 --- a/tencentcloud/services/gaap/data_source_tc_gaap_real_servers_status_test.go +++ b/tencentcloud/services/gaap/data_source_tc_gaap_real_servers_status_test.go @@ -27,6 +27,6 @@ func TestAccTencentCloudGaapRealServersStatusDataSource_basic(t *testing.T) { const testAccGaapRealServersStatusDataSource = ` data "tencentcloud_gaap_real_servers_status" "real_servers_status" { - real_server_ids = ["rs-qcygnwpd"] + real_server_ids = ["rs-3mlpbuut"] } ` diff --git a/tencentcloud/services/gaap/data_source_tc_gaap_realservers_test.go b/tencentcloud/services/gaap/data_source_tc_gaap_realservers_test.go index db3318383a..aaecfcbd40 100644 --- a/tencentcloud/services/gaap/data_source_tc_gaap_realservers_test.go +++ b/tencentcloud/services/gaap/data_source_tc_gaap_realservers_test.go @@ -23,7 +23,7 @@ func TestAccDataSourceTencentCloudGaapRealservers_basic(t *testing.T) { resource.TestMatchResourceAttr("data.tencentcloud_gaap_realservers.foo", "realservers.#", regexp.MustCompile(`^[1-9]\d*$`)), resource.TestCheckResourceAttrSet("data.tencentcloud_gaap_realservers.foo", "realservers.0.id"), resource.TestCheckResourceAttrSet("data.tencentcloud_gaap_realservers.foo", "realservers.0.name"), - resource.TestCheckResourceAttr("data.tencentcloud_gaap_realservers.foo", "realservers.0.ip", "1.1.1.10"), + resource.TestCheckResourceAttr("data.tencentcloud_gaap_realservers.foo", "realservers.0.ip", "1.1.11.19"), resource.TestCheckResourceAttrSet("data.tencentcloud_gaap_realservers.foo", "realservers.0.project_id"), ), }, @@ -45,7 +45,7 @@ func TestAccDataSourceTencentCloudGaapRealservers_domain(t *testing.T) { resource.TestMatchResourceAttr("data.tencentcloud_gaap_realservers.foo", "realservers.#", regexp.MustCompile(`^[1-9]\d*$`)), resource.TestCheckResourceAttrSet("data.tencentcloud_gaap_realservers.foo", "realservers.0.id"), resource.TestCheckResourceAttrSet("data.tencentcloud_gaap_realservers.foo", "realservers.0.name"), - resource.TestCheckResourceAttr("data.tencentcloud_gaap_realservers.foo", "realservers.0.domain", "www.qq.com"), + resource.TestCheckResourceAttr("data.tencentcloud_gaap_realservers.foo", "realservers.0.domain", "www.qq343.com"), resource.TestCheckResourceAttrSet("data.tencentcloud_gaap_realservers.foo", "realservers.0.project_id"), ), }, @@ -76,7 +76,7 @@ func TestAccDataSourceTencentCloudGaapRealservers_name(t *testing.T) { const TestAccDataSourceTencentCloudGaapRealserversBasic = ` resource tencentcloud_gaap_realserver "foo" { - ip = "1.1.1.10" + ip = "1.1.11.19" name = "ci-test-gaap-realserver" } @@ -87,7 +87,7 @@ data tencentcloud_gaap_realservers "foo" { const TestAccDataSourceTencentCloudGaapRealserversDomain = ` resource tencentcloud_gaap_realserver "foo" { - domain = "www.qq.com" + domain = "www.qq343.com" name = "ci-test-gaap-realserver" } @@ -98,7 +98,7 @@ data tencentcloud_gaap_realservers "foo" { const TestAccDataSourceTencentCloudGaapRealserversName = ` resource tencentcloud_gaap_realserver "foo" { - domain = "www.tencent.com" + domain = "www.tencent343.com" name = "ci-test-gaap-realserver" } diff --git a/tencentcloud/services/gaap/resource_tc_gaap_custom_header_test.go b/tencentcloud/services/gaap/resource_tc_gaap_custom_header_test.go index eb83e8cd47..5dd8163966 100644 --- a/tencentcloud/services/gaap/resource_tc_gaap_custom_header_test.go +++ b/tencentcloud/services/gaap/resource_tc_gaap_custom_header_test.go @@ -18,7 +18,7 @@ func TestAccTencentCloudGaapCustomHeaderResource_basic(t *testing.T) { Config: testAccGaapCustomHeader, Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet("tencentcloud_gaap_custom_header.custom_header", "id"), - resource.TestCheckResourceAttr("tencentcloud_gaap_custom_header.custom_header", "rule_id", "rule-pgnqsaf3"), + resource.TestCheckResourceAttr("tencentcloud_gaap_custom_header.custom_header", "rule_id", "rule-hddrxgpd"), resource.TestCheckResourceAttr("tencentcloud_gaap_custom_header.custom_header", "headers.#", "2"), ), }, @@ -26,7 +26,7 @@ func TestAccTencentCloudGaapCustomHeaderResource_basic(t *testing.T) { Config: testAccGaapCustomHeaderUpdate, Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet("tencentcloud_gaap_custom_header.custom_header", "id"), - resource.TestCheckResourceAttr("tencentcloud_gaap_custom_header.custom_header", "rule_id", "rule-pgnqsaf3"), + resource.TestCheckResourceAttr("tencentcloud_gaap_custom_header.custom_header", "rule_id", "rule-hddrxgpd"), resource.TestCheckResourceAttr("tencentcloud_gaap_custom_header.custom_header", "headers.#", "1"), ), }, @@ -41,7 +41,7 @@ func TestAccTencentCloudGaapCustomHeaderResource_basic(t *testing.T) { const testAccGaapCustomHeader = ` resource "tencentcloud_gaap_custom_header" "custom_header" { - rule_id = "rule-pgnqsaf3" + rule_id = "rule-hddrxgpd" headers { header_name = "HeaderName1" header_value = "HeaderValue1" @@ -55,7 +55,7 @@ resource "tencentcloud_gaap_custom_header" "custom_header" { const testAccGaapCustomHeaderUpdate = ` resource "tencentcloud_gaap_custom_header" "custom_header" { - rule_id = "rule-pgnqsaf3" + rule_id = "rule-hddrxgpd" headers { header_name = "HeaderName1" header_value = "HeaderValue1" diff --git a/tencentcloud/services/gaap/resource_tc_gaap_global_domain_dns_test.go b/tencentcloud/services/gaap/resource_tc_gaap_global_domain_dns_test.go index a171d0609f..7a266fe0f4 100644 --- a/tencentcloud/services/gaap/resource_tc_gaap_global_domain_dns_test.go +++ b/tencentcloud/services/gaap/resource_tc_gaap_global_domain_dns_test.go @@ -18,8 +18,8 @@ func TestAccTencentCloudGaapGlobalDomainDnsResource_basic(t *testing.T) { Config: testAccGaapGlobalDomainDns, Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet("tencentcloud_gaap_global_domain_dns.global_domain_dns", "id"), - resource.TestCheckResourceAttr("tencentcloud_gaap_global_domain_dns.global_domain_dns", "domain_id", "dm-du60lmhj"), - resource.TestCheckResourceAttr("tencentcloud_gaap_global_domain_dns.global_domain_dns", "proxy_id_list.0", "link-m9p9fae3"), + resource.TestCheckResourceAttr("tencentcloud_gaap_global_domain_dns.global_domain_dns", "domain_id", "dm-br5seuhh"), + resource.TestCheckResourceAttr("tencentcloud_gaap_global_domain_dns.global_domain_dns", "proxy_id_list.0", "link-m9t4yho9"), resource.TestCheckResourceAttr("tencentcloud_gaap_global_domain_dns.global_domain_dns", "nation_country_inner_codes.0", "101001"), ), }, @@ -27,7 +27,7 @@ func TestAccTencentCloudGaapGlobalDomainDnsResource_basic(t *testing.T) { Config: testAccGaapGlobalDomainDnsUpdate, Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet("tencentcloud_gaap_global_domain_dns.global_domain_dns", "id"), - resource.TestCheckResourceAttr("tencentcloud_gaap_global_domain_dns.global_domain_dns", "domain_id", "dm-du60lmhj"), + resource.TestCheckResourceAttr("tencentcloud_gaap_global_domain_dns.global_domain_dns", "domain_id", "dm-br5seuhh"), resource.TestCheckResourceAttr("tencentcloud_gaap_global_domain_dns.global_domain_dns", "proxy_id_list.#", "2"), resource.TestCheckResourceAttr("tencentcloud_gaap_global_domain_dns.global_domain_dns", "nation_country_inner_codes.0", "101002"), ), @@ -43,16 +43,16 @@ func TestAccTencentCloudGaapGlobalDomainDnsResource_basic(t *testing.T) { const testAccGaapGlobalDomainDns = ` resource "tencentcloud_gaap_global_domain_dns" "global_domain_dns" { - domain_id = "dm-du60lmhj" - proxy_id_list = ["link-m9p9fae3"] + domain_id = "dm-br5seuhh" + proxy_id_list = ["link-m9t4yho9"] nation_country_inner_codes = ["101001"] } ` const testAccGaapGlobalDomainDnsUpdate = ` resource "tencentcloud_gaap_global_domain_dns" "global_domain_dns" { - domain_id = "dm-du60lmhj" - proxy_id_list = ["link-m9p9fae3", "link-8lpyo88p"] + domain_id = "dm-br5seuhh" + proxy_id_list = ["link-m9t4yho9", "link-2rk61jn5"] nation_country_inner_codes = ["101002"] } ` diff --git a/tencentcloud/services/gaap/resource_tc_gaap_http_domain_test.go b/tencentcloud/services/gaap/resource_tc_gaap_http_domain_test.go index db974055aa..b4b5716abf 100644 --- a/tencentcloud/services/gaap/resource_tc_gaap_http_domain_test.go +++ b/tencentcloud/services/gaap/resource_tc_gaap_http_domain_test.go @@ -76,13 +76,13 @@ func TestAccTencentCloudGaapHttpDomainResource_https_basic(t *testing.T) { resource.TestCheckResourceAttr("tencentcloud_gaap_http_domain.foo", "gaap_auth", "false"), ), }, - { - Config: testAccGaapHttpDomainHttpsUpdateDomain, - Check: resource.ComposeTestCheckFunc( - testAccCheckGaapHttpDomainExists("tencentcloud_gaap_http_domain.foo", id), - resource.TestCheckResourceAttr("tencentcloud_gaap_http_domain.foo", "domain", "zhyu-9.elementtest.org"), - ), - }, + //{ + // Config: testAccGaapHttpDomainHttpsUpdateDomain, + // Check: resource.ComposeTestCheckFunc( + // testAccCheckGaapHttpDomainExists("tencentcloud_gaap_http_domain.foo", id), + // resource.TestCheckResourceAttr("tencentcloud_gaap_http_domain.foo", "domain", "zhyu-9.elementtest.org"), + // ), + //}, { ResourceName: "tencentcloud_gaap_http_domain.foo", ImportState: true, @@ -556,6 +556,12 @@ resource tencentcloud_gaap_certificate "bar" { key = %s } +resource tencentcloud_gaap_certificate "client1" { + type = "CLIENT" + content = %s + key = %s +} + resource tencentcloud_gaap_certificate "client2" { type = "CLIENT" content = %s @@ -586,6 +592,7 @@ resource tencentcloud_gaap_http_domain "foo" { } `, "< Date: Thu, 23 May 2024 11:35:22 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9DefaultHttpsDomainCertifi?= =?UTF-8?q?cateId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tencentcloud/acctest/basic.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tencentcloud/acctest/basic.go b/tencentcloud/acctest/basic.go index d9a8eb7cc4..ab8f6d6472 100644 --- a/tencentcloud/acctest/basic.go +++ b/tencentcloud/acctest/basic.go @@ -88,7 +88,7 @@ const ( DefaultGaapProxyId = "link-m9t4yho9" DefaultGaapProxyId2 = "link-2rk61jn5" - DefaultGaapSecurityPolicyId = "sp-b0kh9zml" + DefaultGaapSecurityPolicyId = "sp-6djzh5hz" DefaultGaapRealserverDomainId1 = "rs-620u0ahd" DefaultGaapRealserverDomain1 = "github.com" DefaultGaapRealserverDomainId2 = "rs-9vkyi1av" @@ -97,7 +97,7 @@ const ( DefaultGaapRealserverIp1 = "119.29.29.35" DefaultGaapRealserverIpId2 = "rs-3mlpbuut" DefaultGaapRealserverIp2 = "1.1.1.5" - DefaultHttpsDomainCertificateId = "cert-7su3evtr" + DefaultHttpsDomainCertificateId = "cert-6sub5wbf" DefaultSecurityGroup = "sg-05f7wnhn" From af8ff50d13dea0d59a9a880eef78cc86e1ab1516 Mon Sep 17 00:00:00 2001 From: andrewjiang Date: Thu, 23 May 2024 14:26:19 +0800 Subject: [PATCH 6/8] 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 078ac01af1a2c40a106ea85feaea4cd0f0dbd7ca Mon Sep 17 00:00:00 2001 From: rudolfzhao Date: Thu, 23 May 2024 16:28:48 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E6=9B=B4=E6=96=B0=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_proxy_groups.md | 2 +- .../services/gaap/data_source_tc_gaap_proxy_groups_test.go | 4 ++-- 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 +++--- website/docs/d/gaap_real_servers_status.html.markdown | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tencentcloud/services/gaap/data_source_tc_gaap_proxy_groups.md b/tencentcloud/services/gaap/data_source_tc_gaap_proxy_groups.md index 9373ef20d6..7ed8657708 100644 --- a/tencentcloud/services/gaap/data_source_tc_gaap_proxy_groups.md +++ b/tencentcloud/services/gaap/data_source_tc_gaap_proxy_groups.md @@ -7,7 +7,7 @@ data "tencentcloud_gaap_proxy_groups" "proxy_groups" { project_id = 0 filters { name = "GroupId" - values = ["lg-8h33uhwd"] + values = ["lg-2foz7wjh"] } } ``` \ No newline at end of file diff --git a/tencentcloud/services/gaap/data_source_tc_gaap_proxy_groups_test.go b/tencentcloud/services/gaap/data_source_tc_gaap_proxy_groups_test.go index b256103ab6..fa0f8602bd 100644 --- a/tencentcloud/services/gaap/data_source_tc_gaap_proxy_groups_test.go +++ b/tencentcloud/services/gaap/data_source_tc_gaap_proxy_groups_test.go @@ -18,7 +18,7 @@ func TestAccTencentCloudGaapProxyGroupsDataSource_basic(t *testing.T) { Config: testAccGaapProxyGroupsDataSource, Check: resource.ComposeTestCheckFunc( tcacctest.AccCheckTencentCloudDataSourceID("data.tencentcloud_gaap_proxy_groups.proxy_groups"), - resource.TestCheckResourceAttr("data.tencentcloud_gaap_proxy_groups.proxy_groups", "proxy_group_list.0.group_id", "lg-8h33uhwd"), + resource.TestCheckResourceAttr("data.tencentcloud_gaap_proxy_groups.proxy_groups", "proxy_group_list.0.group_id", "lg-2foz7wjh"), ), }, }, @@ -30,7 +30,7 @@ data "tencentcloud_gaap_proxy_groups" "proxy_groups" { project_id = 0 filters { name = "GroupId" - values = ["lg-8h33uhwd"] + values = ["lg-2foz7wjh"] } } ` 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..ce529e233e 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-2foz7wjh"] } } ``` 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 } diff --git a/website/docs/d/gaap_real_servers_status.html.markdown b/website/docs/d/gaap_real_servers_status.html.markdown index 77055e1c47..8b1ac82a8d 100644 --- a/website/docs/d/gaap_real_servers_status.html.markdown +++ b/website/docs/d/gaap_real_servers_status.html.markdown @@ -15,7 +15,7 @@ Use this data source to query detailed information of gaap real servers status ```hcl data "tencentcloud_gaap_real_servers_status" "real_servers_status" { - real_server_ids = ["rs-qcygnwpd"] + real_server_ids = ["rs-3mlpbuut"] } ``` From 336a16fd84f33af95fb6db94a5963d72c9ac517f Mon Sep 17 00:00:00 2001 From: rudolfzhao Date: Wed, 26 Jun 2024 11:19:02 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9DefaultHttpsDomainCertifi?= =?UTF-8?q?cateId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tencentcloud/acctest/basic.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tencentcloud/acctest/basic.go b/tencentcloud/acctest/basic.go index ab8f6d6472..c6eee6b96d 100644 --- a/tencentcloud/acctest/basic.go +++ b/tencentcloud/acctest/basic.go @@ -97,7 +97,7 @@ const ( DefaultGaapRealserverIp1 = "119.29.29.35" DefaultGaapRealserverIpId2 = "rs-3mlpbuut" DefaultGaapRealserverIp2 = "1.1.1.5" - DefaultHttpsDomainCertificateId = "cert-6sub5wbf" + DefaultHttpsDomainCertificateId = "cert-3muob2in" DefaultSecurityGroup = "sg-05f7wnhn"