From ccd9e46dda72dc55d57205eb5621f342235e7f99 Mon Sep 17 00:00:00 2001 From: Eric Leijonmarck Date: Thu, 13 Jan 2022 14:15:43 +0100 Subject: [PATCH] changed route on the serviceaccounts endpoint (#43989) * changed route on the serviceaccounts endpoint * refactor: change to base url variable * tests fixed --- pkg/services/serviceaccounts/api/api.go | 2 +- pkg/services/serviceaccounts/api/api_test.go | 2 +- public/app/features/serviceaccounts/state/actions.ts | 8 +++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkg/services/serviceaccounts/api/api.go b/pkg/services/serviceaccounts/api/api.go index 29fd6027d38..d4e9f3a7b36 100644 --- a/pkg/services/serviceaccounts/api/api.go +++ b/pkg/services/serviceaccounts/api/api.go @@ -43,7 +43,7 @@ func (api *ServiceAccountsAPI) RegisterAPIEndpoints( return } 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.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)) diff --git a/pkg/services/serviceaccounts/api/api_test.go b/pkg/services/serviceaccounts/api/api_test.go index a1b9bb8e7d0..bfb22ebfa4c 100644 --- a/pkg/services/serviceaccounts/api/api_test.go +++ b/pkg/services/serviceaccounts/api/api_test.go @@ -23,7 +23,7 @@ import ( ) var ( - serviceaccountIDPath = "/api/serviceaccounts/%s" + serviceaccountIDPath = "/api/org/serviceaccounts/%s" ) // test the accesscontrol endpoints diff --git a/public/app/features/serviceaccounts/state/actions.ts b/public/app/features/serviceaccounts/state/actions.ts index 3066bb3af6e..a38440f3562 100644 --- a/public/app/features/serviceaccounts/state/actions.ts +++ b/public/app/features/serviceaccounts/state/actions.ts @@ -3,9 +3,11 @@ import { getBackendSrv } from '@grafana/runtime'; import { OrgServiceAccount as OrgServiceAccount } from 'app/types'; import { serviceAccountsLoaded } from './reducers'; +const BASE_URL = `'/api/org/serviceaccounts'`; + export function loadServiceAccounts(): ThunkResult { return async (dispatch) => { - const serviceAccounts = await getBackendSrv().get('/api/serviceaccounts'); + const serviceAccounts = await getBackendSrv().get(BASE_URL); dispatch(serviceAccountsLoaded(serviceAccounts)); }; } @@ -13,7 +15,7 @@ export function loadServiceAccounts(): ThunkResult { export function updateServiceAccount(serviceAccount: OrgServiceAccount): ThunkResult { return async (dispatch) => { // TODO: implement on backend - await getBackendSrv().patch(`/api/serviceaccounts/${serviceAccount.serviceAccountId}`, { + await getBackendSrv().patch(`${BASE_URL}/${serviceAccount.serviceAccountId}`, { role: serviceAccount.role, }); dispatch(loadServiceAccounts()); @@ -22,7 +24,7 @@ export function updateServiceAccount(serviceAccount: OrgServiceAccount): ThunkRe export function removeServiceAccount(serviceAccountId: number): ThunkResult { return async (dispatch) => { - await getBackendSrv().delete(`/api/serviceaccounts/${serviceAccountId}`); + await getBackendSrv().delete(`${BASE_URL}/${serviceAccountId}`); dispatch(loadServiceAccounts()); }; }