Skip to content

Commit 84675e4

Browse files
tongyimingtongyiming
authored
Merge pull request #1016 from tencentcloudstack/fix/datasource-gaap-unit-test
Fix/datasource gaap unit test
2 parents 7142923 + 4e4086a commit 84675e4

11 files changed

+70
-125
lines changed

‎tencentcloud/data_source_tc_gaap_domain_error_pages_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ const testAccGaapDomainErrorPagesListenerAndDomain = `
6565
resource tencentcloud_gaap_layer7_listener "foo" {
6666
protocol = "HTTP"
6767
name = "ci-test-gaap-l7-listener"
68-
port = 80
68+
port = %d
6969
proxy_id = "%s"
7070
}
7171
@@ -92,7 +92,7 @@ data tencentcloud_gaap_domain_error_pages "foo" {
9292
listener_id = tencentcloud_gaap_domain_error_page.foo.listener_id
9393
domain = tencentcloud_gaap_domain_error_page.foo.domain
9494
}
95-
`, defaultGaapProxyId)
95+
`, 8081, defaultGaapProxyId2)
9696

9797
var testAccGaapDomainErrorPagesIds = fmt.Sprintf(testAccGaapDomainErrorPagesListenerAndDomain+`
9898
resource tencentcloud_gaap_domain_error_page "foo" {
@@ -121,4 +121,4 @@ data tencentcloud_gaap_domain_error_pages "foo" {
121121
domain = tencentcloud_gaap_domain_error_page.foo.domain
122122
ids = [tencentcloud_gaap_domain_error_page.foo.id]
123123
}
124-
`, defaultGaapProxyId)
124+
`, 8082, defaultGaapProxyId2)

‎tencentcloud/data_source_tc_gaap_http_domains_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ var testAccGaapHttpDomainsBasic = fmt.Sprintf(`
3636
resource "tencentcloud_gaap_layer7_listener" "foo" {
3737
protocol = "HTTP"
3838
name = "ci-test-gaap-l7-listener"
39-
port = 80
39+
port = 8201
4040
proxy_id = "%s"
4141
}
4242
@@ -49,4 +49,4 @@ data "tencentcloud_gaap_http_domains" "foo" {
4949
listener_id = tencentcloud_gaap_layer7_listener.foo.id
5050
domain = tencentcloud_gaap_http_domain.foo.domain
5151
}
52-
`, defaultGaapProxyId)
52+
`, defaultGaapProxyId2)

‎tencentcloud/data_source_tc_gaap_http_rules_test.go‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -97,19 +97,15 @@ func TestAccDataSourceTencentCloudGaapHttpRules_forwardHost(t *testing.T) {
9797
})
9898
}
9999

100-
var gaapHttpRulesResources = fmt.Sprintf(`
100+
func gaapHttpRulesResources(port int) string {
101+
return fmt.Sprintf(`
101102
resource "tencentcloud_gaap_layer7_listener" "foo" {
102103
protocol = "HTTP"
103104
name = "ci-test-gaap-l7-listener"
104-
port = 80
105+
port = %d
105106
proxy_id = "%s"
106107
}
107108
108-
resource "tencentcloud_gaap_realserver" "foo" {
109-
ip = "1.1.1.1"
110-
name = "ci-test-gaap-realserver"
111-
}
112-
113109
resource "tencentcloud_gaap_http_domain" "foo" {
114110
listener_id = tencentcloud_gaap_layer7_listener.foo.id
115111
domain = "www.qq.com"
@@ -123,32 +119,33 @@ resource "tencentcloud_gaap_http_rule" "foo" {
123119
health_check = true
124120
125121
realservers {
126-
id = tencentcloud_gaap_realserver.foo.id
127-
ip = tencentcloud_gaap_realserver.foo.ip
122+
id = "%s"
123+
ip = "%s"
128124
port = 80
129125
}
130126
131127
forward_host = "www.qqq.com"
132128
}
133-
`, defaultGaapProxyId)
129+
`, port, defaultGaapProxyId2, defaultGaapRealserverIpId1, defaultGaapRealserverIp1)
130+
}
134131

135-
var TestAccDataSourceTencentCloudGaapHttpRulesDomain = gaapHttpRulesResources + `
132+
var TestAccDataSourceTencentCloudGaapHttpRulesDomain = gaapHttpRulesResources(8090) + `
136133
137134
data tencentcloud_gaap_http_rules "foo" {
138135
listener_id = tencentcloud_gaap_layer7_listener.foo.id
139136
domain = tencentcloud_gaap_http_rule.foo.domain
140137
}
141138
`
142139

143-
var TestAccDataSourceTencentCloudGaapHttpRulesPath = gaapHttpRulesResources + `
140+
var TestAccDataSourceTencentCloudGaapHttpRulesPath = gaapHttpRulesResources(8091) + `
144141
145142
data tencentcloud_gaap_http_rules "foo" {
146143
listener_id = tencentcloud_gaap_layer7_listener.foo.id
147144
path = tencentcloud_gaap_http_rule.foo.path
148145
}
149146
`
150147

151-
var TestAccDataSourceTencentCloudGaapHttpRulesForwardHost = gaapHttpRulesResources + `
148+
var TestAccDataSourceTencentCloudGaapHttpRulesForwardHost = gaapHttpRulesResources(8092) + `
152149
153150
data tencentcloud_gaap_http_rules "foo" {
154151
listener_id = tencentcloud_gaap_layer7_listener.foo.id

‎tencentcloud/data_source_tc_gaap_layer4_listeners_test.go‎

Lines changed: 28 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func TestAccDataSourceTencentCloudGaapLayer4Listeners_basic(t *testing.T) {
2222
resource.TestCheckResourceAttr("data.tencentcloud_gaap_layer4_listeners.foo", "listeners.0.protocol", "TCP"),
2323
resource.TestCheckResourceAttrSet("data.tencentcloud_gaap_layer4_listeners.foo", "listeners.0.id"),
2424
resource.TestCheckResourceAttr("data.tencentcloud_gaap_layer4_listeners.foo", "listeners.0.name", "ci-test-gaap-4-listener"),
25-
resource.TestCheckResourceAttr("data.tencentcloud_gaap_layer4_listeners.foo", "listeners.0.port", "80"),
25+
resource.TestCheckResourceAttr("data.tencentcloud_gaap_layer4_listeners.foo", "listeners.0.port", "8101"),
2626
resource.TestCheckResourceAttr("data.tencentcloud_gaap_layer4_listeners.foo", "listeners.0.realserver_type", "IP"),
2727
resource.TestCheckResourceAttrSet("data.tencentcloud_gaap_layer4_listeners.foo", "listeners.0.status"),
2828
resource.TestCheckResourceAttr("data.tencentcloud_gaap_layer4_listeners.foo", "listeners.0.scheduler", "rr"),
@@ -66,7 +66,7 @@ func TestAccDataSourceTencentCloudGaapLayer4Listeners_tcp(t *testing.T) {
6666
resource.TestCheckResourceAttr("data.tencentcloud_gaap_layer4_listeners.port", "listeners.0.protocol", "TCP"),
6767
resource.TestCheckResourceAttrSet("data.tencentcloud_gaap_layer4_listeners.port", "listeners.0.id"),
6868
resource.TestCheckResourceAttrSet("data.tencentcloud_gaap_layer4_listeners.port", "listeners.0.name"),
69-
resource.TestCheckResourceAttr("data.tencentcloud_gaap_layer4_listeners.port", "listeners.0.port", "80"),
69+
resource.TestCheckResourceAttr("data.tencentcloud_gaap_layer4_listeners.port", "listeners.0.port", "8104"),
7070
resource.TestCheckResourceAttrSet("data.tencentcloud_gaap_layer4_listeners.port", "listeners.0.realserver_type"),
7171
resource.TestCheckResourceAttrSet("data.tencentcloud_gaap_layer4_listeners.port", "listeners.0.status"),
7272
resource.TestCheckResourceAttrSet("data.tencentcloud_gaap_layer4_listeners.port", "listeners.0.scheduler"),
@@ -92,7 +92,7 @@ func TestAccDataSourceTencentCloudGaapLayer4Listeners_UDP(t *testing.T) {
9292
resource.TestCheckResourceAttr("data.tencentcloud_gaap_layer4_listeners.foo", "listeners.0.protocol", "UDP"),
9393
resource.TestCheckResourceAttrSet("data.tencentcloud_gaap_layer4_listeners.foo", "listeners.0.id"),
9494
resource.TestCheckResourceAttr("data.tencentcloud_gaap_layer4_listeners.foo", "listeners.0.name", "ci-test-gaap-4-listener"),
95-
resource.TestCheckResourceAttr("data.tencentcloud_gaap_layer4_listeners.foo", "listeners.0.port", "80"),
95+
resource.TestCheckResourceAttr("data.tencentcloud_gaap_layer4_listeners.foo", "listeners.0.port", "8106"),
9696
resource.TestCheckResourceAttr("data.tencentcloud_gaap_layer4_listeners.foo", "listeners.0.realserver_type", "IP"),
9797
resource.TestCheckResourceAttrSet("data.tencentcloud_gaap_layer4_listeners.foo", "listeners.0.status"),
9898
resource.TestCheckResourceAttr("data.tencentcloud_gaap_layer4_listeners.foo", "listeners.0.scheduler", "rr"),
@@ -123,7 +123,7 @@ func TestAccDataSourceTencentCloudGaapLayer4Listeners_UDP(t *testing.T) {
123123
resource.TestCheckResourceAttr("data.tencentcloud_gaap_layer4_listeners.port", "listeners.0.protocol", "UDP"),
124124
resource.TestCheckResourceAttrSet("data.tencentcloud_gaap_layer4_listeners.port", "listeners.0.id"),
125125
resource.TestCheckResourceAttrSet("data.tencentcloud_gaap_layer4_listeners.port", "listeners.0.name"),
126-
resource.TestCheckResourceAttr("data.tencentcloud_gaap_layer4_listeners.port", "listeners.0.port", "80"),
126+
resource.TestCheckResourceAttr("data.tencentcloud_gaap_layer4_listeners.port", "listeners.0.port", "8106"),
127127
resource.TestCheckResourceAttrSet("data.tencentcloud_gaap_layer4_listeners.port", "listeners.0.realserver_type"),
128128
resource.TestCheckResourceAttrSet("data.tencentcloud_gaap_layer4_listeners.port", "listeners.0.status"),
129129
resource.TestCheckResourceAttrSet("data.tencentcloud_gaap_layer4_listeners.port", "listeners.0.scheduler"),
@@ -135,97 +135,88 @@ func TestAccDataSourceTencentCloudGaapLayer4Listeners_UDP(t *testing.T) {
135135
})
136136
}
137137

138-
var gaapLayer4Listener = fmt.Sprintf(`
139-
resource "tencentcloud_gaap_realserver" "foo" {
140-
ip = "1.1.1.1"
141-
name = "ci-test-gaap-realserver"
142-
}
138+
func gaapLayer4Listener(port int) string {
139+
return fmt.Sprintf(`
143140
144141
resource "tencentcloud_gaap_layer4_listener" "foo" {
145142
protocol = "TCP"
146143
name = "ci-test-gaap-4-listener"
147-
port = 80
144+
port = %d
148145
realserver_type = "IP"
149146
proxy_id = "%s"
150147
health_check = true
151148
interval = 5
152149
connect_timeout = 2
153150
154151
realserver_bind_set {
155-
id = tencentcloud_gaap_realserver.foo.id
156-
ip = tencentcloud_gaap_realserver.foo.ip
152+
id = "%s"
153+
ip = "%s"
157154
port = 80
158155
}
159156
}
160-
`, defaultGaapProxyId)
161-
162-
var gaapLayer4Listener2 = fmt.Sprintf(`
163-
resource tencentcloud_gaap_realserver "bar" {
164-
ip = "119.29.29.29"
165-
name = "ci-test-gaap-realserver2"
157+
`, port, defaultGaapProxyId2, defaultGaapRealserverIpId1, defaultGaapRealserverIp1)
166158
}
167159

160+
func gaapLayer4Listener2(port int) string {
161+
return fmt.Sprintf(`
168162
resource tencentcloud_gaap_layer4_listener "bar" {
169163
protocol = "TCP"
170164
name = "ci-test-gaap-4-listener-bar"
171-
port = 443
165+
port = %d
172166
realserver_type = "IP"
173167
proxy_id = "%s"
174168
health_check = true
175169
interval = 5
176170
connect_timeout = 2
177171
178172
realserver_bind_set {
179-
id = tencentcloud_gaap_realserver.bar.id
180-
ip = tencentcloud_gaap_realserver.bar.ip
173+
id = "%s"
174+
ip = "%s"
181175
port = 80
182176
}
183177
}
184-
`, defaultGaapProxyId)
178+
`, port, defaultGaapProxyId2, defaultGaapRealserverIpId2, defaultGaapRealserverIp2)
179+
}
185180

186-
var TestAccDataSourceTencentCloudGaapLayer4ListenersBasic = gaapLayer4Listener + `
181+
var TestAccDataSourceTencentCloudGaapLayer4ListenersBasic = gaapLayer4Listener(8101) + `
187182
188183
data tencentcloud_gaap_layer4_listeners "foo" {
189184
protocol = "TCP"
190185
listener_id = tencentcloud_gaap_layer4_listener.foo.id
191186
}
192187
`
193188

194-
var TestAccDataSourceTencentCloudGaapLayer4ListenersListenerName = gaapLayer4Listener + gaapLayer4Listener2 + fmt.Sprintf(`
189+
var TestAccDataSourceTencentCloudGaapLayer4ListenersListenerName = gaapLayer4Listener(8102) + gaapLayer4Listener2(8103) + fmt.Sprintf(`
195190
196191
data tencentcloud_gaap_layer4_listeners "name" {
197192
protocol = "TCP"
198193
proxy_id = "%s"
199194
listener_name = tencentcloud_gaap_layer4_listener.foo.name
200195
}
201-
`, defaultGaapProxyId)
196+
`, defaultGaapProxyId2)
202197

203-
var TestAccDataSourceTencentCloudGaapLayer4ListenersPort = gaapLayer4Listener + gaapLayer4Listener2 + fmt.Sprintf(`
198+
var TestAccDataSourceTencentCloudGaapLayer4ListenersPort = gaapLayer4Listener(8104) + gaapLayer4Listener2(8105) + fmt.Sprintf(`
204199
205200
data tencentcloud_gaap_layer4_listeners "port" {
206201
protocol = "TCP"
207202
proxy_id = "%s"
208203
port = tencentcloud_gaap_layer4_listener.foo.port
209204
}
210-
`, defaultGaapProxyId)
205+
`, defaultGaapProxyId2)
211206

212207
var TestAccDataSourceTencentCloudGaapLayer4ListenersUDP = fmt.Sprintf(`
213-
resource tencentcloud_gaap_realserver "foo" {
214-
ip = "1.1.1.1"
215-
name = "ci-test-gaap-realserver"
216-
}
217208
218209
resource tencentcloud_gaap_layer4_listener "foo" {
219210
protocol = "UDP"
220211
name = "ci-test-gaap-4-listener"
221-
port = 80
212+
port = 8106
222213
realserver_type = "IP"
223214
proxy_id = "%s"
224215
health_check = false
225216
226217
realserver_bind_set {
227-
id = tencentcloud_gaap_realserver.foo.id
228-
ip = tencentcloud_gaap_realserver.foo.ip
218+
id = "%s"
219+
ip = "%s"
229220
port = 80
230221
}
231222
}
@@ -235,7 +226,7 @@ data tencentcloud_gaap_layer4_listeners "foo" {
235226
proxy_id = "%s"
236227
listener_id = tencentcloud_gaap_layer4_listener.foo.id
237228
}
238-
`, defaultGaapProxyId, defaultGaapProxyId)
229+
`, defaultGaapProxyId2, defaultGaapRealserverIpId2, defaultGaapRealserverIp2, defaultGaapProxyId2)
239230

240231
var TestAccDataSourceTencentCloudGaapLayer4ListenersUDPName = TestAccDataSourceTencentCloudGaapLayer4ListenersUDP + fmt.Sprintf(`
241232
@@ -244,7 +235,7 @@ data tencentcloud_gaap_layer4_listeners "name" {
244235
proxy_id = "%s"
245236
listener_name = tencentcloud_gaap_layer4_listener.foo.name
246237
}
247-
`, defaultGaapProxyId)
238+
`, defaultGaapProxyId2)
248239

249240
var TestAccDataSourceTencentCloudGaapLayer4ListenersUDPPort = TestAccDataSourceTencentCloudGaapLayer4ListenersUDP + fmt.Sprintf(`
250241
@@ -253,4 +244,4 @@ data tencentcloud_gaap_layer4_listeners "port" {
253244
proxy_id = "%s"
254245
port = tencentcloud_gaap_layer4_listener.foo.port
255246
}
256-
`, defaultGaapProxyId)
247+
`, defaultGaapProxyId2)

‎tencentcloud/data_source_tc_gaap_realservers_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ func TestAccDataSourceTencentCloudGaapRealservers_basic(t *testing.T) {
2121
resource.TestMatchResourceAttr("data.tencentcloud_gaap_realservers.foo", "realservers.#", regexp.MustCompile(`^[1-9]\d*$`)),
2222
resource.TestCheckResourceAttrSet("data.tencentcloud_gaap_realservers.foo", "realservers.0.id"),
2323
resource.TestCheckResourceAttrSet("data.tencentcloud_gaap_realservers.foo", "realservers.0.name"),
24-
resource.TestCheckResourceAttr("data.tencentcloud_gaap_realservers.foo", "realservers.0.ip", "1.1.1.1"),
24+
resource.TestCheckResourceAttr("data.tencentcloud_gaap_realservers.foo", "realservers.0.ip", "1.1.1.10"),
2525
resource.TestCheckResourceAttrSet("data.tencentcloud_gaap_realservers.foo", "realservers.0.project_id"),
2626
),
2727
},
@@ -74,7 +74,7 @@ func TestAccDataSourceTencentCloudGaapRealservers_name(t *testing.T) {
7474

7575
const TestAccDataSourceTencentCloudGaapRealserversBasic = `
7676
resource tencentcloud_gaap_realserver "foo" {
77-
ip = "1.1.1.1"
77+
ip = "1.1.1.10"
7878
name = "ci-test-gaap-realserver"
7979
}
8080

‎tencentcloud/data_source_tc_gaap_security_policies_test.go‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,8 @@ func TestAccDataSourceTencentCloudGaapSecurityPolices_basic(t *testing.T) {
2727
}
2828

2929
var TestAccDataSourceTencentCloudGaapSecurityPolicesBasic = fmt.Sprintf(`
30-
resource tencentcloud_gaap_security_policy "foo" {
31-
proxy_id = "%s"
32-
action = "ACCEPT"
33-
}
3430
3531
data tencentcloud_gaap_security_policies "foo" {
36-
id = tencentcloud_gaap_security_policy.foo.id
32+
id = "%s"
3733
}
38-
`, defaultGaapProxyId)
34+
`, defaultGaapSecurityPolicyId)

0 commit comments

Comments
 (0)