Skip to content

Commit dd59a14

Browse files
julienduchesnejulienduchesne
authored
Add SM URL to tests (#1294)
* Add SM URL to tests Useful when changing the test instance * Remove probe IDs * Remove more IDs
1 parent ac037c4 commit dd59a14

File tree

3 files changed

+20
-19
lines changed

3 files changed

+20
-19
lines changed

‎.github/workflows/acc-tests.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ jobs:
2828
GRAFANA_AUTH=cloud-instance-tests:auth
2929
GRAFANA_ONCALL_ACCESS_TOKEN=cloud-instance-tests:oncall-token
3030
GRAFANA_SM_ACCESS_TOKEN=cloud-instance-tests:sm-token
31+
GRAFANA_SM_URL=cloud-instance-tests:sm-url
3132
GRAFANA_URL=cloud-instance-tests:url
3233
- uses: iFaxity/[email protected]
3334
with:

‎internal/resources/syntheticmonitoring/data_source_probes_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ func TestAccDataSourceProbes(t *testing.T) {
1616
Steps: []resource.TestStep{
1717
{
1818
Config: testutils.TestAccExample(t, "data-sources/grafana_synthetic_monitoring_probes/data-source.tf"),
19-
Check: resource.TestCheckResourceAttr("data.grafana_synthetic_monitoring_probes.main", "probes.Atlanta", "1"),
19+
Check: resource.TestCheckResourceAttrSet("data.grafana_synthetic_monitoring_probes.main", "probes.Atlanta"),
2020
},
2121
{
2222
Config: testutils.TestAccExample(t, "data-sources/grafana_synthetic_monitoring_probes/with-deprecated.tf"),
2323
// We're not checking for deprecated probes here because there may not be any, causing tests to fail.
24-
Check: resource.TestCheckResourceAttr("data.grafana_synthetic_monitoring_probes.main", "probes.Atlanta", "1"),
24+
Check: resource.TestCheckResourceAttrSet("data.grafana_synthetic_monitoring_probes.main", "probes.Atlanta"),
2525
},
2626
},
2727
})

‎internal/resources/syntheticmonitoring/resource_check_test.go‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ func TestAccResourceCheck_dns(t *testing.T) {
3434
resource.TestCheckResourceAttrSet("grafana_synthetic_monitoring_check.dns", "tenant_id"),
3535
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.dns", "job", jobName),
3636
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.dns", "target", "grafana.com"),
37-
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.dns", "probes.0", "1"),
37+
resource.TestCheckResourceAttrSet("grafana_synthetic_monitoring_check.dns", "probes.0"),
3838
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.dns", "labels.foo", "bar"),
3939
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.dns", "settings.0.dns.0.ip_version", "V4"),
4040
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.dns", "settings.0.dns.0.server", "8.8.8.8"),
@@ -50,8 +50,8 @@ func TestAccResourceCheck_dns(t *testing.T) {
5050
resource.TestCheckResourceAttrSet("grafana_synthetic_monitoring_check.dns", "tenant_id"),
5151
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.dns", "job", jobNameUpdated),
5252
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.dns", "target", "grafana.net"),
53-
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.dns", "probes.0", "14"),
54-
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.dns", "probes.1", "19"),
53+
resource.TestCheckResourceAttrSet("grafana_synthetic_monitoring_check.dns", "probes.0"),
54+
resource.TestCheckResourceAttrSet("grafana_synthetic_monitoring_check.dns", "probes.1"),
5555
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.dns", "labels.foo", "baz"),
5656
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.dns", "settings.0.dns.0.ip_version", "Any"),
5757
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.dns", "settings.0.dns.0.server", "8.8.4.4"),
@@ -91,7 +91,7 @@ func TestAccResourceCheck_http(t *testing.T) {
9191
resource.TestCheckResourceAttrSet("grafana_synthetic_monitoring_check.http", "tenant_id"),
9292
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.http", "job", jobName),
9393
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.http", "target", "https://grafana.com"),
94-
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.http", "probes.0", "1"),
94+
resource.TestCheckResourceAttrSet("grafana_synthetic_monitoring_check.http", "probes.0"),
9595
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.http", "labels.foo", "bar"),
9696
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.http", "settings.0.http.0.ip_version", "V4"),
9797
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.http", "settings.0.http.0.method", "GET"),
@@ -105,7 +105,7 @@ func TestAccResourceCheck_http(t *testing.T) {
105105
resource.TestCheckResourceAttrSet("grafana_synthetic_monitoring_check.http", "tenant_id"),
106106
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.http", "job", jobName),
107107
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.http", "target", "https://grafana.org"),
108-
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.http", "probes.0", "15"),
108+
resource.TestCheckResourceAttrSet("grafana_synthetic_monitoring_check.http", "probes.0"),
109109
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.http", "labels.foo", "bar"),
110110
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.http", "settings.0.http.0.ip_version", "V6"),
111111
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.http", "settings.0.http.0.method", "TRACE"),
@@ -157,7 +157,7 @@ func TestAccResourceCheck_ping(t *testing.T) {
157157
resource.TestCheckResourceAttrSet("grafana_synthetic_monitoring_check.ping", "tenant_id"),
158158
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.ping", "job", jobName),
159159
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.ping", "target", "grafana.com"),
160-
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.ping", "probes.0", "1"),
160+
resource.TestCheckResourceAttrSet("grafana_synthetic_monitoring_check.ping", "probes.0"),
161161
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.ping", "labels.foo", "bar"),
162162
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.ping", "settings.0.ping.0.ip_version", "V4"),
163163
),
@@ -169,8 +169,8 @@ func TestAccResourceCheck_ping(t *testing.T) {
169169
resource.TestCheckResourceAttrSet("grafana_synthetic_monitoring_check.ping", "tenant_id"),
170170
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.ping", "job", jobNameUpdated),
171171
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.ping", "target", "grafana.net"),
172-
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.ping", "probes.0", "14"),
173-
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.ping", "probes.1", "19"),
172+
resource.TestCheckResourceAttrSet("grafana_synthetic_monitoring_check.ping", "probes.0"),
173+
resource.TestCheckResourceAttrSet("grafana_synthetic_monitoring_check.ping", "probes.1"),
174174
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.ping", "labels.foo", "baz"),
175175
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.ping", "settings.0.ping.0.ip_version", "Any"),
176176
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.ping", "settings.0.ping.0.payload_size", "20"),
@@ -200,7 +200,7 @@ func TestAccResourceCheck_tcp(t *testing.T) {
200200
resource.TestCheckResourceAttrSet("grafana_synthetic_monitoring_check.tcp", "tenant_id"),
201201
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.tcp", "job", jobName),
202202
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.tcp", "target", "grafana.com:80"),
203-
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.tcp", "probes.0", "1"),
203+
resource.TestCheckResourceAttrSet("grafana_synthetic_monitoring_check.tcp", "probes.0"),
204204
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.tcp", "labels.foo", "bar"),
205205
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.tcp", "settings.0.tcp.0.ip_version", "V4"),
206206
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.tcp", "settings.0.tcp.0.tls", "false"),
@@ -213,8 +213,8 @@ func TestAccResourceCheck_tcp(t *testing.T) {
213213
resource.TestCheckResourceAttrSet("grafana_synthetic_monitoring_check.tcp", "tenant_id"),
214214
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.tcp", "job", jobName),
215215
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.tcp", "target", "grafana.com:443"),
216-
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.tcp", "probes.0", "14"),
217-
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.tcp", "probes.1", "19"),
216+
resource.TestCheckResourceAttrSet("grafana_synthetic_monitoring_check.tcp", "probes.0"),
217+
resource.TestCheckResourceAttrSet("grafana_synthetic_monitoring_check.tcp", "probes.1"),
218218
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.tcp", "labels.foo", "baz"),
219219
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.tcp", "settings.0.tcp.0.ip_version", "V6"),
220220
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.tcp", "settings.0.tcp.0.tls", "true"),
@@ -253,7 +253,7 @@ func TestAccResourceCheck_traceroute(t *testing.T) {
253253
resource.TestCheckResourceAttrSet("grafana_synthetic_monitoring_check.traceroute", "tenant_id"),
254254
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.traceroute", "job", jobName),
255255
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.traceroute", "target", "grafana.com"),
256-
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.traceroute", "probes.0", "1"),
256+
resource.TestCheckResourceAttrSet("grafana_synthetic_monitoring_check.traceroute", "probes.0"),
257257
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.traceroute", "labels.foo", "bar"),
258258
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.traceroute", "settings.0.traceroute.0.max_hops", "64"),
259259
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.traceroute", "settings.0.traceroute.0.max_unknown_hops", "15"),
@@ -267,8 +267,8 @@ func TestAccResourceCheck_traceroute(t *testing.T) {
267267
resource.TestCheckResourceAttrSet("grafana_synthetic_monitoring_check.traceroute", "tenant_id"),
268268
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.traceroute", "job", jobNameUpdated),
269269
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.traceroute", "target", "grafana.net"),
270-
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.traceroute", "probes.0", "14"),
271-
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.traceroute", "probes.1", "19"),
270+
resource.TestCheckResourceAttrSet("grafana_synthetic_monitoring_check.traceroute", "probes.0"),
271+
resource.TestCheckResourceAttrSet("grafana_synthetic_monitoring_check.traceroute", "probes.1"),
272272
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.traceroute", "labels.foo", "baz"),
273273
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.traceroute", "settings.0.traceroute.0.max_hops", "25"),
274274
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.traceroute", "settings.0.traceroute.0.max_unknown_hops", "10"),
@@ -300,7 +300,7 @@ func TestAccResourceCheck_multihttp(t *testing.T) {
300300
resource.TestCheckResourceAttrSet("grafana_synthetic_monitoring_check.multihttp", "tenant_id"),
301301
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.multihttp", "job", jobName),
302302
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.multihttp", "target", "https://www.grafana-dev.com"),
303-
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.multihttp", "probes.0", "12"),
303+
resource.TestCheckResourceAttrSet("grafana_synthetic_monitoring_check.multihttp", "probes.0"),
304304
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.multihttp", "labels.foo", "bar"),
305305
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.multihttp", "settings.0.multihttp.0.entries.0.request.0.method", "GET"),
306306
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.multihttp", "settings.0.multihttp.0.entries.0.request.0.url", "https://www.grafana-dev.com"),
@@ -313,7 +313,7 @@ func TestAccResourceCheck_multihttp(t *testing.T) {
313313
resource.TestCheckResourceAttrSet("grafana_synthetic_monitoring_check.multihttp", "tenant_id"),
314314
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.multihttp", "job", jobNameUpdated),
315315
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.multihttp", "target", "https://www.an-auth-endpoint.com"),
316-
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.multihttp", "probes.0", "12"),
316+
resource.TestCheckResourceAttrSet("grafana_synthetic_monitoring_check.multihttp", "probes.0"),
317317
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.multihttp", "labels.foo", "bar"),
318318
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.multihttp", "settings.0.multihttp.0.entries.0.request.0.method", "POST"),
319319
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.multihttp", "settings.0.multihttp.0.entries.0.request.0.url", "https://www.an-auth-endpoint.com"),
@@ -392,7 +392,7 @@ func TestAccResourceCheck_recreate(t *testing.T) {
392392
resource.TestCheckResourceAttrSet("grafana_synthetic_monitoring_check.http", "tenant_id"),
393393
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.http", "job", jobName),
394394
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.http", "target", "https://grafana.com"),
395-
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.http", "probes.0", "1"),
395+
resource.TestCheckResourceAttrSet("grafana_synthetic_monitoring_check.http", "probes.0"),
396396
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.http", "labels.foo", "bar"),
397397
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.http", "settings.0.http.0.ip_version", "V4"),
398398
resource.TestCheckResourceAttr("grafana_synthetic_monitoring_check.http", "settings.0.http.0.method", "GET"),

0 commit comments

Comments
 (0)