Skip to content

Commit 5710f49

Browse files
Fix failing cloud instance test in 9.3.2
It's no longer possible to get users from the API in Grafana Cloud with 9.3.2 This test was kinda weird in any case, we were using the fixed ID of the `admin` user, which was probably ID #3 simply as an artifact of our Grafana Cloud process when launching instances So I just removed the `user_id` permission from our test. It's not easy to run this test in a docker Grafana instance because it requires a Grafana Enterprise license
1 parent 4ccd3ab commit 5710f49

File tree

3 files changed

+1
-17
lines changed

3 files changed

+1
-17
lines changed

docs/resources/data_source_permission.md

-8
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,6 @@ resource "grafana_data_source_permission" "fooPermissions" {
3838
team_id = grafana_team.team.id
3939
permission = "Query"
4040
}
41-
permissions {
42-
user_id = 3 // 3 is the admin user in cloud. It can't be queried
43-
permission = "Edit"
44-
}
45-
permissions {
46-
built_in_role = "Viewer"
47-
permission = "Query"
48-
}
4941
}
5042
```
5143

examples/resources/grafana_data_source_permission/resource.tf

-8
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,4 @@ resource "grafana_data_source_permission" "fooPermissions" {
2323
team_id = grafana_team.team.id
2424
permission = "Query"
2525
}
26-
permissions {
27-
user_id = 3 // 3 is the admin user in cloud. It can't be queried
28-
permission = "Edit"
29-
}
30-
permissions {
31-
built_in_role = "Viewer"
32-
permission = "Query"
33-
}
3426
}

grafana/resource_datasource_permission_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ func TestAccDatasourcePermission_basic(t *testing.T) {
2121
Config: testAccExample(t, "resources/grafana_data_source_permission/resource.tf"),
2222
Check: resource.ComposeAggregateTestCheckFunc(
2323
testAccDatasourcePermissionsCheckExists("grafana_data_source_permission.fooPermissions", &datasourceID),
24-
resource.TestCheckResourceAttr("grafana_data_source_permission.fooPermissions", "permissions.#", "3"),
24+
resource.TestCheckResourceAttr("grafana_data_source_permission.fooPermissions", "permissions.#", "1"),
2525
),
2626
},
2727
{

0 commit comments

Comments
 (0)