IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues 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

5
pkg/cmd/grafana-cli/runner/wire.go
View File

@@ -43,6 +43,7 @@ import (
"github.com/grafana/grafana/pkg/plugins/plugincontext"
"github.com/grafana/grafana/pkg/plugins/repo"
"github.com/grafana/grafana/pkg/services/accesscontrol"
"github.com/grafana/grafana/pkg/services/accesscontrol/acimpl"
"github.com/grafana/grafana/pkg/services/accesscontrol/ossaccesscontrol"
"github.com/grafana/grafana/pkg/services/alerting"
"github.com/grafana/grafana/pkg/services/auth"
@@ -334,8 +335,8 @@ var wireSet = wire.NewSet(
wire.Bind(new(db.DB), new(*sqlstore.SQLStore)),
prefimpl.ProvideService,
opentsdb.ProvideService,
ossaccesscontrol.ProvideAccessControl,
wire.Bind(new(accesscontrol.AccessControl), new(*ossaccesscontrol.AccessControl)),
acimpl.ProvideAccessControl,
wire.Bind(new(accesscontrol.AccessControl), new(*acimpl.AccessControl)),
)
func Initialize(cfg *setting.Cfg) (Runner, error) {

7
pkg/cmd/grafana-cli/runner/wireexts_oss.go
View File

@@ -14,6 +14,7 @@ import (
"github.com/grafana/grafana/pkg/server/backgroundsvcs"
"github.com/grafana/grafana/pkg/server/usagestatssvcs"
"github.com/grafana/grafana/pkg/services/accesscontrol"
"github.com/grafana/grafana/pkg/services/accesscontrol/acimpl"
acdb "github.com/grafana/grafana/pkg/services/accesscontrol/database"
"github.com/grafana/grafana/pkg/services/accesscontrol/ossaccesscontrol"
"github.com/grafana/grafana/pkg/services/auth"
@@ -51,9 +52,9 @@ var wireExtsSet = wire.NewSet(
auth.ProvideUserAuthTokenService,
wire.Bind(new(models.UserTokenService), new(*auth.UserAuthTokenService)),
wire.Bind(new(models.UserTokenBackgroundService), new(*auth.UserAuthTokenService)),
ossaccesscontrol.ProvideService,
wire.Bind(new(accesscontrol.Service), new(*ossaccesscontrol.Service)),
wire.Bind(new(accesscontrol.RoleRegistry), new(*ossaccesscontrol.Service)),
acimpl.ProvideService,
wire.Bind(new(accesscontrol.Service), new(*acimpl.Service)),
wire.Bind(new(accesscontrol.RoleRegistry), new(*acimpl.Service)),
thumbs.ProvideCrawlerAuthSetupService,
wire.Bind(new(thumbs.CrawlerAuthSetupService), new(*thumbs.OSSCrawlerAuthSetupService)),
validations.ProvideValidator,