Put /services/:serviceId under resources permission

Signed-off-by: Dominika Zemanovicova <dzemanov@redhat.com>

.changeset/real-foxes-film.md

@@ -4,5 +4,5 @@
 ---
 
 The `/clusters` endpoint is now protected by the `kubernetes.clusters` permission.
-The `/services` endpoint is now protected by the `kubernetes.services` permission.
+The `/services/:serviceId` endpoint is now protected by the `kubernetes.resources` permission.
 The `/resources` endpoints are now protected by the `kubernetes.resources` permission.

plugins/kubernetes-backend/src/service/KubernetesBuilder.test.ts

@@ -796,7 +796,6 @@ metadata:
       permissions: [
         { type: 'basic', name: 'kubernetes.proxy', attributes: {} },
         { type: 'basic', name: 'kubernetes.resources', attributes: {} },
-        { type: 'basic', name: 'kubernetes.services', attributes: {} },
         { type: 'basic', name: 'kubernetes.clusters', attributes: {} },
       ],
       rules: [],

plugins/kubernetes-backend/src/service/KubernetesBuilder.ts

@@ -20,7 +20,7 @@ import {
   ANNOTATION_KUBERNETES_OIDC_TOKEN_PROVIDER,
   kubernetesClustersPermission,
   kubernetesPermissions,
-  kubernetesServicesPermission,
+  kubernetesResourcesPermission,
 } 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,
-        kubernetesServicesPermission,
+        kubernetesResourcesPermission,
         httpAuth,
         req,
       );

plugins/kubernetes-common/report.api.md

@@ -353,9 +353,6 @@ export interface KubernetesRequestBody {
 // @public
 export const kubernetesResourcesPermission: BasicPermission;
 
-// @public
-export const kubernetesServicesPermission: BasicPermission;
-
 // @public (undocumented)
 export interface LimitRangeFetchResponse {
   // (undocumented)

plugins/kubernetes-common/src/index.ts

@@ -27,7 +27,6 @@ export {
   kubernetesProxyPermission,
   kubernetesClustersPermission,
   kubernetesResourcesPermission,
-  kubernetesServicesPermission,
   kubernetesPermissions,
 } from './permissions';
 export * from './error-detection';

plugins/kubernetes-common/src/permissions.ts

@@ -24,7 +24,7 @@ export const kubernetesProxyPermission = createPermission({
   attributes: {},
 });
 
-/** This permission is used to check access to the /resources endpoints
+/** This permission is used to check access to the /resources and /services/:serviceId endpoints
  * @public
  */
 export const kubernetesResourcesPermission = createPermission({
@@ -32,14 +32,6 @@ export const kubernetesResourcesPermission = createPermission({
   attributes: {},
 });
 
-/** This permission is used to check access to the /services endpoint
- * @public
- */
-export const kubernetesServicesPermission = createPermission({
-  name: 'kubernetes.services',
-  attributes: {},
-});
-
 /** This permission is used to check access to the /clusters endpoint
  * @public
  */
@@ -55,6 +47,5 @@ export const kubernetesClustersPermission = createPermission({
 export const kubernetesPermissions = [
   kubernetesProxyPermission,
   kubernetesResourcesPermission,
-  kubernetesServicesPermission,
   kubernetesClustersPermission,
 ];