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:
+1
-1
@@ -1,4 +1,4 @@
|
||||
package ossaccesscontrol
|
||||
package acimpl
|
||||
|
||||
import (
|
||||
"context"
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package ossaccesscontrol
|
||||
package acimpl
|
||||
|
||||
import (
|
||||
"context"
|
||||
+3
-2
@@ -1,4 +1,4 @@
|
||||
package ossaccesscontrol
|
||||
package acimpl
|
||||
|
||||
import (
|
||||
"context"
|
||||
@@ -8,6 +8,7 @@ import (
|
||||
"github.com/grafana/grafana/pkg/infra/metrics"
|
||||
"github.com/grafana/grafana/pkg/services/accesscontrol"
|
||||
"github.com/grafana/grafana/pkg/services/accesscontrol/api"
|
||||
"github.com/grafana/grafana/pkg/services/accesscontrol/ossaccesscontrol"
|
||||
"github.com/grafana/grafana/pkg/services/user"
|
||||
"github.com/grafana/grafana/pkg/setting"
|
||||
"github.com/prometheus/client_golang/prometheus"
|
||||
@@ -58,7 +59,7 @@ func (s *Service) GetUsageStats(_ context.Context) map[string]interface{} {
|
||||
}
|
||||
|
||||
var actionsToFetch = append(
|
||||
TeamAdminActions, append(DashboardAdminActions, FolderAdminActions...)...,
|
||||
ossaccesscontrol.TeamAdminActions, append(ossaccesscontrol.DashboardAdminActions, ossaccesscontrol.FolderAdminActions...)...,
|
||||
)
|
||||
|
||||
// GetUserPermissions returns user permissions based on built-in roles
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package ossaccesscontrol
|
||||
package acimpl
|
||||
|
||||
import (
|
||||
"context"
|
||||
@@ -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()
|
||||
|
||||
Reference in New Issue
Block a user