public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions 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
pkg/api/accesscontrol.go
+2 -2
View File
@@ -43,7 +43,7 @@ var (
// that HTTPServer needs
func (hs *HTTPServer) declareFixedRoles() error {
// Declare plugins roles
if err := plugins.DeclareRBACRoles(hs.AccessControl); err != nil {
if err := plugins.DeclareRBACRoles(hs.accesscontrolService); err != nil {
return err
}
@@ -419,7 +419,7 @@ func (hs *HTTPServer) declareFixedRoles() error {
Grants: []string{"Admin"},
}
return hs.AccessControl.DeclareFixedRoles(
return hs.accesscontrolService.DeclareFixedRoles(
provisioningWriterRole, datasourcesReaderRole, builtInDatasourceReader, datasourcesWriterRole,
datasourcesIdReaderRole, orgReaderRole, orgWriterRole,
orgMaintainerRole, teamsCreatorRole, teamsWriterRole, datasourcesExplorerRole,