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: Remove DeclareFixedRoles wrapper on Access control and inject service (#54153)

Browse Source 
* RBAC: Remove DeclareFixedRoles wrapper on Access control and inject service when needed
This commit is contained in:
Karl Persson
2022-08-26 09:59:34 +02:00
committed by GitHub
parent c332bf885c
commit 5a1b9d2283
10 changed files with 33 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/services/serviceaccounts/manager/roles.go
View File

@@ -6,7 +6,7 @@ import (
"github.com/grafana/grafana/pkg/services/serviceaccounts"
)
func RegisterRoles(ac accesscontrol.AccessControl) error {
func RegisterRoles(service accesscontrol.Service) error {
saReader := accesscontrol.RoleRegistration{
Role: accesscontrol.RoleDTO{
Name: "fixed:serviceaccounts:reader",
@@ -69,7 +69,7 @@ func RegisterRoles(ac accesscontrol.AccessControl) error {
Grants: []string{string(org.RoleAdmin)},
}
if err := ac.DeclareFixedRoles(saReader, saCreator, saWriter); err != nil {
if err := service.DeclareFixedRoles(saReader, saCreator, saWriter); err != nil {
return err
}

3
pkg/services/serviceaccounts/manager/service.go
View File

@@ -31,6 +31,7 @@ func ProvideServiceAccountsService(
usageStats usagestats.Service,
serviceAccountsStore serviceaccounts.Store,
permissionService accesscontrol.ServiceAccountPermissionsService,
accesscontrolService accesscontrol.Service,
) (*ServiceAccountsService, error) {
s := &ServiceAccountsService{
store: serviceAccountsStore,
@@ -38,7 +39,7 @@ func ProvideServiceAccountsService(
backgroundLog: log.New("serviceaccounts.background"),
}
if err := RegisterRoles(ac); err != nil {
if err := RegisterRoles(accesscontrolService); err != nil {
s.log.Error("Failed to register roles", "error", err)
}