public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AccessControl: Rename builtin role roles to basic roles (#48519)

Browse Source 
* AccessControl: Rename grafana:builtins roles to basic

* AccessControl: rename macro references to basic

Co-authored-by: gamab <gabi.mabs@gmail.com>
This commit is contained in:
Jguer
2022-05-03 13:59:16 +02:00
committed by GitHub
co-authored by gamab
parent 20f62e1841
commit 6a303bb6b8
4 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/accesscontrol/roles.go
+9 -9
View File
@@ -278,11 +278,11 @@ func (m *RegistrationList) Range(f func(registration RoleRegistration) bool) {
}
}
func BuildMacroRoleDefinitions() map[string]*RoleDTO {
func BuildBasicRoleDefinitions() map[string]*RoleDTO {
return map[string]*RoleDTO{
string(models.ROLE_ADMIN): {
Name: "grafana:builtins:admin",
UID: "grafana_builtins_admin",
Name: BasicRolePrefix + "admin",
UID: BasicRoleUIDPrefix + "admin",
OrgID: GlobalOrgID,
Version: 1,
DisplayName: string(models.ROLE_ADMIN),
@@ -292,8 +292,8 @@ func BuildMacroRoleDefinitions() map[string]*RoleDTO {
Hidden: true,
},
string(models.ROLE_EDITOR): {
Name: "grafana:builtins:editor",
UID: "grafana_builtins_editor",
Name: BasicRolePrefix + "editor",
UID: BasicRoleUIDPrefix + "editor",
OrgID: GlobalOrgID,
Version: 1,
DisplayName: string(models.ROLE_EDITOR),
@@ -303,8 +303,8 @@ func BuildMacroRoleDefinitions() map[string]*RoleDTO {
Hidden: true,
},
string(models.ROLE_VIEWER): {
Name: "grafana:builtins:viewer",
UID: "grafana_builtins_viewer",
Name: BasicRolePrefix + "viewer",
UID: BasicRoleUIDPrefix + "viewer",
OrgID: GlobalOrgID,
Version: 1,
DisplayName: string(models.ROLE_VIEWER),
@@ -314,8 +314,8 @@ func BuildMacroRoleDefinitions() map[string]*RoleDTO {
Hidden: true,
},
RoleGrafanaAdmin: {
Name: "grafana:builtins:grafana_admin",
UID: "grafana_builtins_grafana_admin",
Name: BasicRolePrefix + "grafana_admin",
UID: BasicRoleUIDPrefix + "grafana_admin",
OrgID: GlobalOrgID,
Version: 1,
DisplayName: RoleGrafanaAdmin,