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/api/common_test.go
+3 -2
View File
@@ -22,6 +22,7 @@ import (
"github.com/grafana/grafana/pkg/infra/tracing"
"github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/accesscontrol"
"github.com/grafana/grafana/pkg/services/accesscontrol/acimpl"
"github.com/grafana/grafana/pkg/services/accesscontrol/database"
accesscontrolmock "github.com/grafana/grafana/pkg/services/accesscontrol/mock"
"github.com/grafana/grafana/pkg/services/accesscontrol/ossaccesscontrol"
@@ -378,9 +379,9 @@ func setupHTTPServerWithCfgDb(
acService = acmock
} else {
var err error
acService, err = ossaccesscontrol.ProvideService(cfg, database.ProvideService(db), routeRegister)
acService, err = acimpl.ProvideService(cfg, database.ProvideService(db), routeRegister)
require.NoError(t, err)
ac = ossaccesscontrol.ProvideAccessControl(cfg, acService)
ac = acimpl.ProvideAccessControl(cfg, acService)
}
teamPermissionService, err := ossaccesscontrol.ProvideTeamPermissions(cfg, routeRegister, db, ac, license, acService)