diff --git a/.changeset/real-foxes-film.md b/.changeset/real-foxes-film.md index 750db7e175..5fabbacd9e 100644 --- a/.changeset/real-foxes-film.md +++ b/.changeset/real-foxes-film.md @@ -3,6 +3,6 @@ '@backstage/plugin-kubernetes-common': minor --- -The `/clusters` endpoint is now protected by the `kubernetes.cluster` permission. -The `/services` endpoint is now protected by the `kubernetes.service` permission. -The `/resources` endpoints are now protected by the `kubernetes.resource` permission. +The `/clusters` endpoint is now protected by the `kubernetes.clusters` permission. +The `/services` endpoint is now protected by the `kubernetes.services` permission. +The `/resources` endpoints are now protected by the `kubernetes.resources` permission. diff --git a/plugins/kubernetes-backend/src/routes/resourcesRoutes.ts b/plugins/kubernetes-backend/src/routes/resourcesRoutes.ts index ab3c7d8e06..6e737a1e4f 100644 --- a/plugins/kubernetes-backend/src/routes/resourcesRoutes.ts +++ b/plugins/kubernetes-backend/src/routes/resourcesRoutes.ts @@ -25,7 +25,7 @@ import { KubernetesObjectsProvider } from '@backstage/plugin-kubernetes-node'; import { AuthService, HttpAuthService } from '@backstage/backend-plugin-api'; import { PermissionEvaluator } from '@backstage/plugin-permission-common'; import { requirePermission } from '../auth/requirePermission'; -import { kubernetesResourcePermission } from '@backstage/plugin-kubernetes-common'; +import { kubernetesResourcesPermission } from '@backstage/plugin-kubernetes-common'; export const addResourceRoutesToRouter = ( router: express.Router, @@ -68,7 +68,7 @@ export const addResourceRoutesToRouter = ( router.post('/resources/workloads/query', async (req, res) => { await requirePermission( permissionApi, - kubernetesResourcePermission, + kubernetesResourcesPermission, httpAuth, req, ); @@ -86,7 +86,7 @@ export const addResourceRoutesToRouter = ( router.post('/resources/custom/query', async (req, res) => { await requirePermission( permissionApi, - kubernetesResourcePermission, + kubernetesResourcesPermission, httpAuth, req, ); diff --git a/plugins/kubernetes-backend/src/service/KubernetesBuilder.test.ts b/plugins/kubernetes-backend/src/service/KubernetesBuilder.test.ts index 84de5d5575..145c9e6a06 100644 --- a/plugins/kubernetes-backend/src/service/KubernetesBuilder.test.ts +++ b/plugins/kubernetes-backend/src/service/KubernetesBuilder.test.ts @@ -795,9 +795,9 @@ metadata: expect(response.body).toMatchObject({ permissions: [ { type: 'basic', name: 'kubernetes.proxy', attributes: {} }, - { type: 'basic', name: 'kubernetes.resource', attributes: {} }, - { type: 'basic', name: 'kubernetes.service', attributes: {} }, - { type: 'basic', name: 'kubernetes.cluster', attributes: {} }, + { type: 'basic', name: 'kubernetes.resources', attributes: {} }, + { type: 'basic', name: 'kubernetes.services', attributes: {} }, + { type: 'basic', name: 'kubernetes.clusters', attributes: {} }, ], rules: [], }); diff --git a/plugins/kubernetes-backend/src/service/KubernetesBuilder.ts b/plugins/kubernetes-backend/src/service/KubernetesBuilder.ts index ed864dcf60..a8b1deaa9c 100644 --- a/plugins/kubernetes-backend/src/service/KubernetesBuilder.ts +++ b/plugins/kubernetes-backend/src/service/KubernetesBuilder.ts @@ -18,9 +18,9 @@ import { Config } from '@backstage/config'; import { ANNOTATION_KUBERNETES_AUTH_PROVIDER, ANNOTATION_KUBERNETES_OIDC_TOKEN_PROVIDER, - kubernetesClusterPermission, + kubernetesClustersPermission, kubernetesPermissions, - kubernetesServicePermission, + kubernetesServicesPermission, } from '@backstage/plugin-kubernetes-common'; import { PermissionEvaluator } from '@backstage/plugin-permission-common'; import { createPermissionIntegrationRouter } from '@backstage/plugin-permission-node'; @@ -398,7 +398,7 @@ export class KubernetesBuilder { router.post('/services/:serviceId', async (req, res) => { await requirePermission( permissionApi, - kubernetesServicePermission, + kubernetesServicesPermission, httpAuth, req, ); @@ -424,7 +424,7 @@ export class KubernetesBuilder { router.get('/clusters', async (req, res) => { await requirePermission( permissionApi, - kubernetesClusterPermission, + kubernetesClustersPermission, httpAuth, req, ); diff --git a/plugins/kubernetes-common/report.api.md b/plugins/kubernetes-common/report.api.md index bc953c9781..079169d8ab 100644 --- a/plugins/kubernetes-common/report.api.md +++ b/plugins/kubernetes-common/report.api.md @@ -318,7 +318,7 @@ export interface JobsFetchResponse { } // @public -export const kubernetesClusterPermission: BasicPermission; +export const kubernetesClustersPermission: BasicPermission; // @public (undocumented) export type KubernetesErrorTypes = @@ -351,10 +351,10 @@ export interface KubernetesRequestBody { } // @public -export const kubernetesResourcePermission: BasicPermission; +export const kubernetesResourcesPermission: BasicPermission; // @public -export const kubernetesServicePermission: BasicPermission; +export const kubernetesServicesPermission: BasicPermission; // @public (undocumented) export interface LimitRangeFetchResponse { diff --git a/plugins/kubernetes-common/src/index.ts b/plugins/kubernetes-common/src/index.ts index 43a0500a9c..d6e97dc8e6 100644 --- a/plugins/kubernetes-common/src/index.ts +++ b/plugins/kubernetes-common/src/index.ts @@ -25,9 +25,9 @@ export * from './catalog-entity-constants'; export * from './certificate-authority-constants'; export { kubernetesProxyPermission, - kubernetesClusterPermission, - kubernetesResourcePermission, - kubernetesServicePermission, + kubernetesClustersPermission, + kubernetesResourcesPermission, + kubernetesServicesPermission, kubernetesPermissions, } from './permissions'; export * from './error-detection'; diff --git a/plugins/kubernetes-common/src/permissions.ts b/plugins/kubernetes-common/src/permissions.ts index c96c183af6..7c7a087dc5 100644 --- a/plugins/kubernetes-common/src/permissions.ts +++ b/plugins/kubernetes-common/src/permissions.ts @@ -27,24 +27,24 @@ export const kubernetesProxyPermission = createPermission({ /** This permission is used to check access to the /resources endpoints * @public */ -export const kubernetesResourcePermission = createPermission({ - name: 'kubernetes.resource', +export const kubernetesResourcesPermission = createPermission({ + name: 'kubernetes.resources', attributes: {}, }); /** This permission is used to check access to the /services endpoint * @public */ -export const kubernetesServicePermission = createPermission({ - name: 'kubernetes.service', +export const kubernetesServicesPermission = createPermission({ + name: 'kubernetes.services', attributes: {}, }); /** This permission is used to check access to the /clusters endpoint * @public */ -export const kubernetesClusterPermission = createPermission({ - name: 'kubernetes.cluster', +export const kubernetesClustersPermission = createPermission({ + name: 'kubernetes.clusters', attributes: {}, }); @@ -54,7 +54,7 @@ export const kubernetesClusterPermission = createPermission({ */ export const kubernetesPermissions = [ kubernetesProxyPermission, - kubernetesResourcePermission, - kubernetesServicePermission, - kubernetesClusterPermission, + kubernetesResourcesPermission, + kubernetesServicesPermission, + kubernetesClustersPermission, ];