Skip to content

Commit dcd4541

Browse files
tongyimingmikatong
andauthored
fix: gaap unit test (#1018)
Co-authored-by: mikatong <mikatong@tencent.com>
1 parent 6d2efed commit dcd4541

File tree

2 files changed

+15
-44
lines changed

2 files changed

+15
-44
lines changed

tencentcloud/data_source_tc_gaap_proxies_test.go

Lines changed: 7 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package tencentcloud
22

33
import (
4+
"fmt"
45
"regexp"
56
"testing"
67

@@ -19,7 +20,7 @@ func TestAccDataSourceTencentCloudGaapProxies_basic(t *testing.T) {
1920
Check: resource.ComposeTestCheckFunc(
2021
testAccCheckTencentCloudDataSourceID("data.tencentcloud_gaap_proxies.foo"),
2122
resource.TestCheckResourceAttrSet("data.tencentcloud_gaap_proxies.foo", "proxies.0.id"),
22-
resource.TestCheckResourceAttr("data.tencentcloud_gaap_proxies.foo", "proxies.0.name", "ci-test-gaap-proxy"),
23+
resource.TestCheckResourceAttrSet("data.tencentcloud_gaap_proxies.foo", "proxies.0.name"),
2324
resource.TestCheckResourceAttrSet("data.tencentcloud_gaap_proxies.foo", "proxies.0.domain"),
2425
resource.TestCheckResourceAttrSet("data.tencentcloud_gaap_proxies.foo", "proxies.0.ip"),
2526
resource.TestCheckResourceAttr("data.tencentcloud_gaap_proxies.foo", "proxies.0.bandwidth", "10"),
@@ -113,58 +114,28 @@ func TestAccDataSourceTencentCloudGaapProxies_filter(t *testing.T) {
113114
})
114115
}
115116

116-
const TestAccDataSourceTencentCloudGaapProxiesBasic = `
117-
resource tencentcloud_gaap_proxy "foo" {
118-
name = "ci-test-gaap-proxy"
119-
bandwidth = 10
120-
concurrent = 2
121-
access_region = "Guangzhou"
122-
realserver_region = "Beijing"
123-
}
124-
117+
var TestAccDataSourceTencentCloudGaapProxiesBasic = fmt.Sprintf(`
125118
data tencentcloud_gaap_proxies "foo" {
126-
ids = [tencentcloud_gaap_proxy.foo.id]
119+
ids = ["%s"]
127120
}
128-
`
121+
`, defaultGaapProxyId)
129122

130123
const TestAccDataSourceTencentCloudGaapProxiesProjectId = `
131-
resource tencentcloud_gaap_proxy "foo" {
132-
name = "ci-test-gaap-proxy"
133-
bandwidth = 10
134-
concurrent = 2
135-
access_region = "Guangzhou"
136-
realserver_region = "Beijing"
137-
}
138-
139124
data tencentcloud_gaap_proxies "projectId" {
140125
project_id = 0
141126
}
142127
`
143128

144129
const TestAccDataSourceTencentCloudGaapProxiesAccessRegion = `
145-
resource tencentcloud_gaap_proxy "foo" {
146-
name = "ci-test-gaap-proxy"
147-
bandwidth = 10
148-
concurrent = 2
149-
access_region = "Guangzhou"
150-
realserver_region = "Beijing"
151-
}
152130
153131
data tencentcloud_gaap_proxies "access" {
154-
access_region = tencentcloud_gaap_proxy.foo.access_region
132+
access_region = "Guangzhou"
155133
}
156134
`
157135

158136
const TestAccDataSourceTencentCloudGaapProxiesRealserverRegion = `
159-
resource tencentcloud_gaap_proxy "foo" {
160-
name = "ci-test-gaap-proxy"
161-
bandwidth = 10
162-
concurrent = 2
163-
access_region = "Guangzhou"
164-
realserver_region = "Beijing"
165-
}
166137
167138
data tencentcloud_gaap_proxies "realserver" {
168-
realserver_region = tencentcloud_gaap_proxy.foo.realserver_region
139+
realserver_region = "Beijing"
169140
}
170141
`

tencentcloud/data_source_tc_gaap_security_rules_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func TestAccDataSourceTencentCloudGaapSecurityRules_multi(t *testing.T) {
4545
resource.TestCheckResourceAttrSet("data.tencentcloud_gaap_security_rules.ruleId", "rules.0.id"),
4646
resource.TestCheckResourceAttr("data.tencentcloud_gaap_security_rules.ruleId", "rules.0.cidr_ip", "1.1.1.1"),
4747
resource.TestCheckResourceAttr("data.tencentcloud_gaap_security_rules.ruleId", "rules.0.name", "ci-test-gaap-s-rule"),
48-
resource.TestCheckResourceAttr("data.tencentcloud_gaap_security_rules.ruleId", "rules.0.port", "80"),
48+
resource.TestCheckResourceAttr("data.tencentcloud_gaap_security_rules.ruleId", "rules.0.port", "8120"),
4949
resource.TestCheckResourceAttr("data.tencentcloud_gaap_security_rules.ruleId", "rules.0.protocol", "TCP"),
5050
resource.TestCheckResourceAttr("data.tencentcloud_gaap_security_rules.ruleId", "rules.0.action", "ACCEPT"),
5151
),
@@ -97,7 +97,7 @@ func TestAccDataSourceTencentCloudGaapSecurityRules_multi(t *testing.T) {
9797
resource.TestCheckResourceAttrSet("data.tencentcloud_gaap_security_rules.port", "rules.0.id"),
9898
resource.TestCheckResourceAttrSet("data.tencentcloud_gaap_security_rules.port", "rules.0.cidr_ip"),
9999
resource.TestCheckResourceAttrSet("data.tencentcloud_gaap_security_rules.port", "rules.0.name"),
100-
resource.TestCheckResourceAttr("data.tencentcloud_gaap_security_rules.port", "rules.0.port", "80"),
100+
resource.TestCheckResourceAttr("data.tencentcloud_gaap_security_rules.port", "rules.0.port", "8120"),
101101
resource.TestCheckResourceAttrSet("data.tencentcloud_gaap_security_rules.port", "rules.0.protocol"),
102102
resource.TestCheckResourceAttrSet("data.tencentcloud_gaap_security_rules.port", "rules.0.action"),
103103
),
@@ -143,7 +143,7 @@ resource tencentcloud_gaap_security_rule "foo" {
143143
cidr_ip = "1.1.1.1"
144144
action = "ACCEPT"
145145
protocol = "TCP"
146-
port = "80"
146+
port = "8120"
147147
}
148148
149149
data tencentcloud_gaap_security_rules "ruleId" {
@@ -159,7 +159,7 @@ resource tencentcloud_gaap_security_rule "foo" {
159159
cidr_ip = "1.1.1.1"
160160
action = "ACCEPT"
161161
protocol = "TCP"
162-
port = "80"
162+
port = "8120"
163163
}
164164
165165
data tencentcloud_gaap_security_rules "action" {
@@ -175,7 +175,7 @@ resource tencentcloud_gaap_security_rule "foo" {
175175
cidr_ip = "1.1.1.1"
176176
action = "ACCEPT"
177177
protocol = "TCP"
178-
port = "80"
178+
port = "8120"
179179
}
180180
181181
data tencentcloud_gaap_security_rules "cidrIp" {
@@ -192,7 +192,7 @@ resource tencentcloud_gaap_security_rule "foo" {
192192
cidr_ip = "1.1.1.1"
193193
action = "ACCEPT"
194194
protocol = "TCP"
195-
port = "80"
195+
port = "8120"
196196
}
197197
198198
data tencentcloud_gaap_security_rules "name" {
@@ -209,7 +209,7 @@ resource tencentcloud_gaap_security_rule "foo" {
209209
cidr_ip = "1.1.1.1"
210210
action = "ACCEPT"
211211
protocol = "TCP"
212-
port = "80"
212+
port = "8120"
213213
}
214214
215215
data tencentcloud_gaap_security_rules "port" {
@@ -226,7 +226,7 @@ resource tencentcloud_gaap_security_rule "foo" {
226226
cidr_ip = "1.1.1.1"
227227
action = "ACCEPT"
228228
protocol = "TCP"
229-
port = "80"
229+
port = "8120"
230230
}
231231
232232
data tencentcloud_gaap_security_rules "protocol" {

0 commit comments

Comments
 (0)