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

* 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
+4 -2
View File
@@ -6,6 +6,7 @@ package server
import (
"github.com/google/wire"
sdkhttpclient "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
"github.com/grafana/grafana/pkg/services/auth"
"github.com/grafana/grafana/pkg/services/playlist/playlistimpl"
"github.com/grafana/grafana/pkg/services/store/sanitizer"
@@ -44,6 +45,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/apikey/apikeyimpl"
@@ -335,8 +337,8 @@ var wireBasicSet = wire.NewSet(
secretsMigrations.ProvideSecretMigrationService,
wire.Bind(new(secretsMigrations.SecretMigrationService), new(*secretsMigrations.SecretMigrationServiceImpl)),
userauthimpl.ProvideService,
ossaccesscontrol.ProvideAccessControl,
wire.Bind(new(accesscontrol.AccessControl), new(*ossaccesscontrol.AccessControl)),
acimpl.ProvideAccessControl,
wire.Bind(new(accesscontrol.AccessControl), new(*acimpl.AccessControl)),
)
var wireSet = wire.NewSet(