public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Chore: Make getUserOrgList private to sqlstore (#59654)

Browse Source 
* make getUserOrgList private in sqlstore

* make other identifiers private
This commit is contained in:
Serge Zaitsev
2022-12-01 15:46:42 +01:00
committed by GitHub
parent c6cf774ac5
commit b3284a8330
9 changed files with 25 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/dashboards/database/database_folder_test.go
+5 -5
View File
@@ -42,7 +42,7 @@ func TestIntegrationDashboardFolderDataAccess(t *testing.T) {
dashInRoot = insertTestDashboard(t, dashboardStore, "test dash 67", 1, 0, false, "prod", "webapp")
childDash = insertTestDashboard(t, dashboardStore, "test dash 23", 1, folder.Id, false, "prod", "webapp")
insertTestDashboard(t, dashboardStore, "test dash 45", 1, folder.Id, false, "prod")
currentUser = CreateUser(t, sqlStore, "viewer", "Viewer", false)
currentUser = createUser(t, sqlStore, "viewer", "Viewer", false)
}
t.Run("Given one dashboard folder with two dashboards and one dashboard in the root folder", func(t *testing.T) {
@@ -199,7 +199,7 @@ func TestIntegrationDashboardFolderDataAccess(t *testing.T) {
childDash1 = insertTestDashboard(t, dashboardStore, "child dash 1", 1, folder1.Id, false, "prod")
childDash2 = insertTestDashboard(t, dashboardStore, "child dash 2", 1, folder2.Id, false, "prod")
currentUser = CreateUser(t, sqlStore, "viewer", "Viewer", false)
currentUser = createUser(t, sqlStore, "viewer", "Viewer", false)
}
setup2()
@@ -304,9 +304,9 @@ func TestIntegrationDashboardFolderDataAccess(t *testing.T) {
folder2 = insertTestDashboard(t, dashboardStore, "2 test dash folder", 1, 0, true, "prod")
insertTestDashboard(t, dashboardStore, "folder in another org", 2, 0, true, "prod")
adminUser = CreateUser(t, sqlStore, "admin", "Admin", true)
editorUser = CreateUser(t, sqlStore, "editor", "Editor", false)
viewerUser = CreateUser(t, sqlStore, "viewer", "Viewer", false)
adminUser = createUser(t, sqlStore, "admin", "Admin", true)
editorUser = createUser(t, sqlStore, "editor", "Editor", false)
viewerUser = createUser(t, sqlStore, "viewer", "Viewer", false)
}
setup3()