fix(kms): change iam perm on serviceKeys

ref: MANAGER-15867 Signed-off-by: Vincent BONMARCHAND <[email protected]>
ovh · Nov 15, 2024 · 8486ffa · 8486ffa
1 parent 1ff8122
commit 8486ffa
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 7 deletions.
diff --git a/...es/manager/apps/key-management-service/src/hooks/serviceKey/useServiceKeyActions.spec.tsx b/...es/manager/apps/key-management-service/src/hooks/serviceKey/useServiceKeyActions.spec.tsx
@@ -52,6 +52,12 @@ describe('useServiceKeyActionsList', () => {
     keys: [],
     createdAt: '2023-01-01T00:00:00Z',
     operations: [],
+    iam: {
+      id: '8f8a75b0-3bde-4b8d-a8c0-928basvced',
+      urn:
+        'urn:v1:eu:resource:okms:8f8a75b0-b57d-45fc-8d4f-256664DFE/serviceKey/dqd63-5688-409c-234-125e24538f34',
+      displayName: 'ServiceKeyTest',
+    },
   };
 
   const useCases = [

diff --git a/...ges/manager/apps/key-management-service/src/hooks/serviceKey/useServiceKeyActionsList.tsx b/...ges/manager/apps/key-management-service/src/hooks/serviceKey/useServiceKeyActionsList.tsx
@@ -78,8 +78,11 @@ const useServiceKeyActionsList = (
               `/${okms.id}/${ROUTES_URLS.keys}/${okmsKey?.id}/${ROUTES_URLS.serviceKeyDeactivate}`,
             );
       },
-      iamActions: [kmsIamActions.serviceKeyDeactivate],
-      urn: okms.iam.urn,
+      iamActions: [
+        kmsIamActions.serviceKeyUpdate,
+        kmsIamActions.serviceKeyDeactivate,
+      ],
+      urn: okmsKey?.iam.urn,
     });
   }
   if (
@@ -92,8 +95,11 @@ const useServiceKeyActionsList = (
       color: ODS_THEME_COLOR_INTENT.primary,
       disabled: updateIsPending,
       onClick: () => updateKmsServiceKey({ state: OkmsServiceKeyState.active }),
-      iamActions: [kmsIamActions.serviceKeyActivate],
-      urn: okms.iam.urn,
+      iamActions: [
+        kmsIamActions.serviceKeyUpdate,
+        kmsIamActions.serviceKeyActivate,
+      ],
+      urn: okmsKey?.iam.urn,
     });
   }
   if (
@@ -108,7 +114,7 @@ const useServiceKeyActionsList = (
         okmsKey?.state === OkmsServiceKeyState.active || deleteIsPending,
       onClick: () => deleteKmsServiceKey(),
       iamActions: [kmsIamActions.serviceKeyDelete],
-      urn: okms.iam.urn,
+      urn: okmsKey?.iam.urn,
     });
   }
   return items;

diff --git a/packages/manager/apps/key-management-service/src/mocks/serviceKeys/serviceKeys.mock.ts b/packages/manager/apps/key-management-service/src/mocks/serviceKeys/serviceKeys.mock.ts
@@ -16,5 +16,11 @@ export const serviceKeyMock: OkmsAllServiceKeys[] = [
     state: OkmsServiceKeyState.active,
     type: OkmsKeyTypes.EC,
     curve: 'P-256',
+    iam: {
+      id: '8f8a75b0-3bde-4b8d-a8c0-928basvced',
+      urn:
+        'urn:v1:eu:resource:okms:8f8a75b0-b57d-45fc-8d4f-256664DFE/serviceKey/dqd63-5688-409c-234-125e24538f34',
+      displayName: 'ServiceKeyTest',
+    },
   },
 ];
diff --git a/packages/manager/apps/key-management-service/src/pages/serviceKey/ServiceKey.page.tsx b/packages/manager/apps/key-management-service/src/pages/serviceKey/ServiceKey.page.tsx
@@ -149,7 +149,7 @@ export default function Key() {
                   variant={ODS_BUTTON_VARIANT.stroked}
                   color={ODS_THEME_COLOR_INTENT.primary}
                   onClick={() => navigate(ROUTES_URLS.serviceKeyEditName)}
-                  urn={kms.iam.urn}
+                  urn={serviceKey.data.iam.urn}
                   iamActions={[kmsIamActions.serviceKeyUpdate]}
                 >
                   <OsdsIcon

diff --git a/packages/manager/apps/key-management-service/src/types/okmsServiceKey.type.ts b/packages/manager/apps/key-management-service/src/types/okmsServiceKey.type.ts
@@ -1,4 +1,4 @@
-import { ColumnSort } from '@ovh-ux/manager-react-components';
+import { ColumnSort, IamObject } from '@ovh-ux/manager-react-components';
 
 export type OkmsServiceKeyOptions = {
   sorting: ColumnSort;
@@ -24,6 +24,7 @@ export type OkmsServiceKeyBase = {
   state: OkmsServiceKeyState;
   type: OkmsKeyTypes;
   keys?: any[];
+  iam: IamObject;
 };
 
 /*