diff --git a/tencentcloud/data_source_tc_gaap_proxies_test.go b/tencentcloud/data_source_tc_gaap_proxies_test.go index 48ddec4ecc..31b8553b42 100644 --- a/tencentcloud/data_source_tc_gaap_proxies_test.go +++ b/tencentcloud/data_source_tc_gaap_proxies_test.go @@ -1,6 +1,7 @@ package tencentcloud import ( + "fmt" "regexp" "testing" @@ -19,7 +20,7 @@ func TestAccDataSourceTencentCloudGaapProxies_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckTencentCloudDataSourceID("data.tencentcloud_gaap_proxies.foo"), resource.TestCheckResourceAttrSet("data.tencentcloud_gaap_proxies.foo", "proxies.0.id"), - resource.TestCheckResourceAttr("data.tencentcloud_gaap_proxies.foo", "proxies.0.name", "ci-test-gaap-proxy"), + resource.TestCheckResourceAttrSet("data.tencentcloud_gaap_proxies.foo", "proxies.0.name"), resource.TestCheckResourceAttrSet("data.tencentcloud_gaap_proxies.foo", "proxies.0.domain"), resource.TestCheckResourceAttrSet("data.tencentcloud_gaap_proxies.foo", "proxies.0.ip"), resource.TestCheckResourceAttr("data.tencentcloud_gaap_proxies.foo", "proxies.0.bandwidth", "10"), @@ -113,58 +114,28 @@ func TestAccDataSourceTencentCloudGaapProxies_filter(t *testing.T) { }) } -const TestAccDataSourceTencentCloudGaapProxiesBasic = ` -resource tencentcloud_gaap_proxy "foo" { - name = "ci-test-gaap-proxy" - bandwidth = 10 - concurrent = 2 - access_region = "Guangzhou" - realserver_region = "Beijing" -} - +var TestAccDataSourceTencentCloudGaapProxiesBasic = fmt.Sprintf(` data tencentcloud_gaap_proxies "foo" { - ids = [tencentcloud_gaap_proxy.foo.id] + ids = ["%s"] } -` +`, defaultGaapProxyId) const TestAccDataSourceTencentCloudGaapProxiesProjectId = ` -resource tencentcloud_gaap_proxy "foo" { - name = "ci-test-gaap-proxy" - bandwidth = 10 - concurrent = 2 - access_region = "Guangzhou" - realserver_region = "Beijing" -} - data tencentcloud_gaap_proxies "projectId" { project_id = 0 } ` const TestAccDataSourceTencentCloudGaapProxiesAccessRegion = ` -resource tencentcloud_gaap_proxy "foo" { - name = "ci-test-gaap-proxy" - bandwidth = 10 - concurrent = 2 - access_region = "Guangzhou" - realserver_region = "Beijing" -} data tencentcloud_gaap_proxies "access" { - access_region = tencentcloud_gaap_proxy.foo.access_region + access_region = "Guangzhou" } ` const TestAccDataSourceTencentCloudGaapProxiesRealserverRegion = ` -resource tencentcloud_gaap_proxy "foo" { - name = "ci-test-gaap-proxy" - bandwidth = 10 - concurrent = 2 - access_region = "Guangzhou" - realserver_region = "Beijing" -} data tencentcloud_gaap_proxies "realserver" { - realserver_region = tencentcloud_gaap_proxy.foo.realserver_region + realserver_region = "Beijing" } ` diff --git a/tencentcloud/data_source_tc_gaap_security_rules_test.go b/tencentcloud/data_source_tc_gaap_security_rules_test.go index 36eaf70a14..9566010988 100644 --- a/tencentcloud/data_source_tc_gaap_security_rules_test.go +++ b/tencentcloud/data_source_tc_gaap_security_rules_test.go @@ -45,7 +45,7 @@ func TestAccDataSourceTencentCloudGaapSecurityRules_multi(t *testing.T) { resource.TestCheckResourceAttrSet("data.tencentcloud_gaap_security_rules.ruleId", "rules.0.id"), resource.TestCheckResourceAttr("data.tencentcloud_gaap_security_rules.ruleId", "rules.0.cidr_ip", "1.1.1.1"), resource.TestCheckResourceAttr("data.tencentcloud_gaap_security_rules.ruleId", "rules.0.name", "ci-test-gaap-s-rule"), - resource.TestCheckResourceAttr("data.tencentcloud_gaap_security_rules.ruleId", "rules.0.port", "80"), + resource.TestCheckResourceAttr("data.tencentcloud_gaap_security_rules.ruleId", "rules.0.port", "8120"), resource.TestCheckResourceAttr("data.tencentcloud_gaap_security_rules.ruleId", "rules.0.protocol", "TCP"), resource.TestCheckResourceAttr("data.tencentcloud_gaap_security_rules.ruleId", "rules.0.action", "ACCEPT"), ), @@ -97,7 +97,7 @@ func TestAccDataSourceTencentCloudGaapSecurityRules_multi(t *testing.T) { resource.TestCheckResourceAttrSet("data.tencentcloud_gaap_security_rules.port", "rules.0.id"), resource.TestCheckResourceAttrSet("data.tencentcloud_gaap_security_rules.port", "rules.0.cidr_ip"), resource.TestCheckResourceAttrSet("data.tencentcloud_gaap_security_rules.port", "rules.0.name"), - resource.TestCheckResourceAttr("data.tencentcloud_gaap_security_rules.port", "rules.0.port", "80"), + resource.TestCheckResourceAttr("data.tencentcloud_gaap_security_rules.port", "rules.0.port", "8120"), resource.TestCheckResourceAttrSet("data.tencentcloud_gaap_security_rules.port", "rules.0.protocol"), resource.TestCheckResourceAttrSet("data.tencentcloud_gaap_security_rules.port", "rules.0.action"), ), @@ -143,7 +143,7 @@ resource tencentcloud_gaap_security_rule "foo" { cidr_ip = "1.1.1.1" action = "ACCEPT" protocol = "TCP" - port = "80" + port = "8120" } data tencentcloud_gaap_security_rules "ruleId" { @@ -159,7 +159,7 @@ resource tencentcloud_gaap_security_rule "foo" { cidr_ip = "1.1.1.1" action = "ACCEPT" protocol = "TCP" - port = "80" + port = "8120" } data tencentcloud_gaap_security_rules "action" { @@ -175,7 +175,7 @@ resource tencentcloud_gaap_security_rule "foo" { cidr_ip = "1.1.1.1" action = "ACCEPT" protocol = "TCP" - port = "80" + port = "8120" } data tencentcloud_gaap_security_rules "cidrIp" { @@ -192,7 +192,7 @@ resource tencentcloud_gaap_security_rule "foo" { cidr_ip = "1.1.1.1" action = "ACCEPT" protocol = "TCP" - port = "80" + port = "8120" } data tencentcloud_gaap_security_rules "name" { @@ -209,7 +209,7 @@ resource tencentcloud_gaap_security_rule "foo" { cidr_ip = "1.1.1.1" action = "ACCEPT" protocol = "TCP" - port = "80" + port = "8120" } data tencentcloud_gaap_security_rules "port" { @@ -226,7 +226,7 @@ resource tencentcloud_gaap_security_rule "foo" { cidr_ip = "1.1.1.1" action = "ACCEPT" protocol = "TCP" - port = "80" + port = "8120" } data tencentcloud_gaap_security_rules "protocol" {