opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-07-31 08:12:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Access Control: revert to using folder store from the scope resolvers (#64132)

Browse Source 
* revert to using folder store from the resolvers

* fixing tests after revert

* api test fixes

---------

Co-authored-by: Kristin Laemmert <mildwonkey@users.noreply.github.com>
This commit is contained in:
Ieva
2023-03-03 15:56:33 +00:00
committed by GitHub
parent dbb72f2c6e
commit a52999a886
12 changed files with 103 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/api/dashboard_test.go
View File

@ -987,7 +987,7 @@ func getDashboardShouldReturn200WithConfig(t *testing.T, sc *scenarioContext, pr
if dashboardService == nil {
dashboardService = service.ProvideDashboardService(
cfg, dashboardStore, nil, features, folderPermissions, dashboardPermissions,
cfg, dashboardStore, folderStore, nil, features, folderPermissions, dashboardPermissions,
ac, folderSvc,
)
}
@ -1000,7 +1000,7 @@ func getDashboardShouldReturn200WithConfig(t *testing.T, sc *scenarioContext, pr
ProvisioningService: provisioningService,
AccessControl: accesscontrolmock.New(),
dashboardProvisioningService: service.ProvideDashboardService(
cfg, dashboardStore, nil, features, folderPermissions, dashboardPermissions,
cfg, dashboardStore, folderStore, nil, features, folderPermissions, dashboardPermissions,
ac, folderSvc,
),
DashboardService: dashboardService,