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

changed route on the serviceaccounts endpoint (#43989)

Browse Source 
* changed route on the serviceaccounts endpoint

* refactor: change to base url variable

* tests fixed
This commit is contained in:
Eric Leijonmarck 2022-01-13 14:15:43 +01:00 committed by GitHub
parent 14b92b75c7
commit ccd9e46dda
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/services/serviceaccounts/api/api.go
View File

@ -43,7 +43,7 @@ func (api *ServiceAccountsAPI) RegisterAPIEndpoints(
return return
} }
auth := acmiddleware.Middleware(api.accesscontrol) auth := acmiddleware.Middleware(api.accesscontrol)
api.RouterRegister.Group("/api/serviceaccounts", func(serviceAccountsRoute routing.RouteRegister) { api.RouterRegister.Group("/api/org/serviceaccounts", func(serviceAccountsRoute routing.RouteRegister) {
serviceAccountsRoute.Get("/", auth(middleware.ReqOrgAdmin, accesscontrol.EvalPermission(serviceaccounts.ActionRead, serviceaccounts.ScopeAll)), routing.Wrap(api.ListServiceAccounts)) serviceAccountsRoute.Get("/", auth(middleware.ReqOrgAdmin, accesscontrol.EvalPermission(serviceaccounts.ActionRead, serviceaccounts.ScopeAll)), routing.Wrap(api.ListServiceAccounts))
serviceAccountsRoute.Delete("/:serviceAccountId", auth(middleware.ReqOrgAdmin, accesscontrol.EvalPermission(serviceaccounts.ActionDelete, serviceaccounts.ScopeID)), routing.Wrap(api.DeleteServiceAccount)) serviceAccountsRoute.Delete("/:serviceAccountId", auth(middleware.ReqOrgAdmin, accesscontrol.EvalPermission(serviceaccounts.ActionDelete, serviceaccounts.ScopeID)), routing.Wrap(api.DeleteServiceAccount))
serviceAccountsRoute.Get("/upgrade", auth(middleware.ReqOrgAdmin, accesscontrol.EvalPermission(serviceaccounts.ActionCreate, serviceaccounts.ScopeID)), routing.Wrap(api.UpgradeServiceAccounts)) serviceAccountsRoute.Get("/upgrade", auth(middleware.ReqOrgAdmin, accesscontrol.EvalPermission(serviceaccounts.ActionCreate, serviceaccounts.ScopeID)), routing.Wrap(api.UpgradeServiceAccounts))

2
pkg/services/serviceaccounts/api/api_test.go
View File

@ -23,7 +23,7 @@ import (
) )
var ( var (
serviceaccountIDPath = "/api/serviceaccounts/%s" serviceaccountIDPath = "/api/org/serviceaccounts/%s"
) )
// test the accesscontrol endpoints // test the accesscontrol endpoints

8
public/app/features/serviceaccounts/state/actions.ts
View File

@ -3,9 +3,11 @@ import { getBackendSrv } from '@grafana/runtime';
import { OrgServiceAccount as OrgServiceAccount } from 'app/types'; import { OrgServiceAccount as OrgServiceAccount } from 'app/types';
import { serviceAccountsLoaded } from './reducers'; import { serviceAccountsLoaded } from './reducers';
const BASE_URL = `'/api/org/serviceaccounts'`;
export function loadServiceAccounts(): ThunkResult<void> { export function loadServiceAccounts(): ThunkResult<void> {
return async (dispatch) => { return async (dispatch) => {
const serviceAccounts = await getBackendSrv().get('/api/serviceaccounts'); const serviceAccounts = await getBackendSrv().get(BASE_URL);
dispatch(serviceAccountsLoaded(serviceAccounts)); dispatch(serviceAccountsLoaded(serviceAccounts));
}; };
} }
@ -13,7 +15,7 @@ export function loadServiceAccounts(): ThunkResult<void> {
export function updateServiceAccount(serviceAccount: OrgServiceAccount): ThunkResult<void> { export function updateServiceAccount(serviceAccount: OrgServiceAccount): ThunkResult<void> {
return async (dispatch) => { return async (dispatch) => {
// TODO: implement on backend // TODO: implement on backend
await getBackendSrv().patch(`/api/serviceaccounts/${serviceAccount.serviceAccountId}`, { await getBackendSrv().patch(`${BASE_URL}/${serviceAccount.serviceAccountId}`, {
role: serviceAccount.role, role: serviceAccount.role,
}); });
dispatch(loadServiceAccounts()); dispatch(loadServiceAccounts());
@ -22,7 +24,7 @@ export function updateServiceAccount(serviceAccount: OrgServiceAccount): ThunkRe
export function removeServiceAccount(serviceAccountId: number): ThunkResult<void> { export function removeServiceAccount(serviceAccountId: number): ThunkResult<void> {
return async (dispatch) => { return async (dispatch) => {
await getBackendSrv().delete(`/api/serviceaccounts/${serviceAccountId}`); await getBackendSrv().delete(`${BASE_URL}/${serviceAccountId}`);
dispatch(loadServiceAccounts()); dispatch(loadServiceAccounts());
}; };
} }