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

ServiceAccounts: Add access control metadata to service accounts (#45096)

Browse Source 
* add role to DTO

* add access control metadata
This commit is contained in:
J Guerreiro
2022-02-08 19:19:22 +00:00
committed by GitHub
parent e3dd5cdc51
commit 2cf421dfe3
3 changed files with 48 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/services/serviceaccounts/database/database.go
View File

@@ -143,10 +143,11 @@ func (s *ServiceAccountsStoreImpl) ListServiceAccounts(ctx context.Context, orgI
if serviceAccountID > 0 {
query.UserID = serviceAccountID
}
err := s.sqlStore.GetOrgUsers(ctx, &query)
if err != nil {
if err := s.sqlStore.GetOrgUsers(ctx, &query); err != nil {
return nil, err
}
saDTOs := make([]*serviceaccounts.ServiceAccountDTO, len(query.Result))
for i, user := range query.Result {
saDTOs[i] = &serviceaccounts.ServiceAccountDTO{
@@ -154,6 +155,7 @@ func (s *ServiceAccountsStoreImpl) ListServiceAccounts(ctx context.Context, orgI
OrgId: user.OrgId,
Name: user.Name,
Login: user.Login,
Role: user.Role,
}
tokens, err := s.ListTokens(ctx, user.OrgId, user.UserId)
if err != nil {
@@ -161,7 +163,8 @@ func (s *ServiceAccountsStoreImpl) ListServiceAccounts(ctx context.Context, orgI
}
saDTOs[i].Tokens = int64(len(tokens))
}
return saDTOs, err
return saDTOs, nil
}
// RetrieveServiceAccountByID returns a service account by its ID