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

RBAC: Move service and evaluator to acimpl package (#54714)

Browse Source 
* RBAC: Move access control evaluator to acimpl package

* RBAC: Move service to acimpl package
This commit is contained in:
Karl Persson
2022-09-05 18:15:47 +02:00
committed by GitHub
parent 73eb1f047a
commit ff35e35ce0
11 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/publicdashboards/api/common_test.go
+3 -3
View File
@@ -16,8 +16,8 @@ import (
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/plugins"
"github.com/grafana/grafana/pkg/services/accesscontrol/acimpl"
"github.com/grafana/grafana/pkg/services/accesscontrol/database"
"github.com/grafana/grafana/pkg/services/accesscontrol/ossaccesscontrol"
"github.com/grafana/grafana/pkg/services/contexthandler/ctxkey"
"github.com/grafana/grafana/pkg/services/datasources"
"github.com/grafana/grafana/pkg/services/featuremgmt"
@@ -55,9 +55,9 @@ func setupTestServer(
}
var err error
acService, err := ossaccesscontrol.ProvideService(cfg, database.ProvideService(db), rr)
acService, err := acimpl.ProvideService(cfg, database.ProvideService(db), rr)
require.NoError(t, err)
ac := ossaccesscontrol.ProvideAccessControl(cfg, acService)
ac := acimpl.ProvideAccessControl(cfg, acService)
// build mux
m := web.New()