From 782d6617104db36c0ecc6431cf5c8c886b5e9d4c Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Fri, 19 Nov 2021 09:09:16 -0500 Subject: [PATCH] refactor: fix displayname and description for serviceaccount role (#41946) (#41962) * refactor: fix displayname and description for serviceaccount role * add: ActionWrite, ActionCreate * refactor: update description (cherry picked from commit 253da4a936ce6ca439dad57bc54b1c2428d4a595) Co-authored-by: Eric Leijonmarck --- pkg/services/serviceaccounts/manager/roles.go | 12 ++++++++++-- pkg/services/serviceaccounts/models.go | 3 +++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/pkg/services/serviceaccounts/manager/roles.go b/pkg/services/serviceaccounts/manager/roles.go index ffc4eb4ed53..11f8b23d1cd 100644 --- a/pkg/services/serviceaccounts/manager/roles.go +++ b/pkg/services/serviceaccounts/manager/roles.go @@ -8,11 +8,19 @@ import ( var ( role = accesscontrol.RoleRegistration{ Role: accesscontrol.RoleDTO{ - Version: 2, + Version: 3, Name: "fixed:serviceaccounts:writer", - Description: "", + DisplayName: "Service accounts writer", + Description: "Create, delete, read, or query service accounts.", Group: "Service accounts", Permissions: []accesscontrol.Permission{ + { + Action: serviceaccounts.ActionRead, + Scope: serviceaccounts.ScopeAll, + }, + { + Action: serviceaccounts.ActionCreate, + }, { Action: serviceaccounts.ActionDelete, Scope: serviceaccounts.ScopeAll, diff --git a/pkg/services/serviceaccounts/models.go b/pkg/services/serviceaccounts/models.go index 6a77cd71210..6a5070a2e38 100644 --- a/pkg/services/serviceaccounts/models.go +++ b/pkg/services/serviceaccounts/models.go @@ -8,5 +8,8 @@ var ( ) const ( + ActionRead = "serviceaccounts:read" + ActionWrite = "serviceaccounts:write" + ActionCreate = "serviceaccounts:create" ActionDelete = "serviceaccounts:delete" )