From d0362ae924340e70e7ed0c532317a6644328d66a Mon Sep 17 00:00:00 2001 From: Yaacov Zamir Date: Wed, 7 Feb 2024 09:58:14 +0200 Subject: [PATCH] Bump node version Signed-off-by: Yaacov Zamir --- .github/workflows/on-pull-request.yaml | 2 +- build/Containerfile | 2 +- packages/mocks/src/definitions/basic/namespaces.mock.ts | 5 +++++ packages/mocks/src/definitions/basic/networks.mock.ts | 5 +++++ packages/mocks/src/definitions/basic/providers.mock.ts | 4 ++++ packages/mocks/src/definitions/basic/storages.mock.ts | 6 ++++++ packages/mocks/src/definitions/basic/vms.mock.ts | 2 ++ 7 files changed, 24 insertions(+), 2 deletions(-) diff --git a/.github/workflows/on-pull-request.yaml b/.github/workflows/on-pull-request.yaml index 4dd5b215c..4cf5eef0b 100644 --- a/.github/workflows/on-pull-request.yaml +++ b/.github/workflows/on-pull-request.yaml @@ -18,7 +18,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v3 with: - node-version: 16 + node-version: 20 - name: Install dependencies run: npm install diff --git a/build/Containerfile b/build/Containerfile index 35f361977..2ddb8f8ab 100644 --- a/build/Containerfile +++ b/build/Containerfile @@ -1,5 +1,5 @@ # Builder container -FROM registry.access.redhat.com/ubi9/nodejs-16 AS build +FROM registry.access.redhat.com/ubi9/nodejs-20 AS build # VERSION default value should match the forklift-console-plugin package version # The VERSION value can be customize during build by using --build-arg: diff --git a/packages/mocks/src/definitions/basic/namespaces.mock.ts b/packages/mocks/src/definitions/basic/namespaces.mock.ts index beaba015d..9657e75e3 100644 --- a/packages/mocks/src/definitions/basic/namespaces.mock.ts +++ b/packages/mocks/src/definitions/basic/namespaces.mock.ts @@ -14,6 +14,7 @@ export const MOCK_OPENSHIFT_NAMESPACES: { [uid in OpenshiftProviderIDs]: OpenShi [OPENSHIFT_HOST_UID]: [ { uid: '11a0375f-f33e-489b-812a-d9a0929388ae', + id: '11a0375f-f33e-489b-812a-d9a0929388ae', version: '12515', namespace: '', name: NAMESPACE_MIGRATION, @@ -23,6 +24,7 @@ export const MOCK_OPENSHIFT_NAMESPACES: { [uid in OpenshiftProviderIDs]: OpenShi }, { uid: '68d88b58-22f4-49ba-8665-74f4256aa617', + id: '68d88b58-22f4-49ba-8665-74f4256aa617', version: '12558', namespace: '', name: NAMESPACE_FORKLIFT, @@ -34,6 +36,7 @@ export const MOCK_OPENSHIFT_NAMESPACES: { [uid in OpenshiftProviderIDs]: OpenShi [OPENSHIFT_01_UID]: [ { uid: '338c69a1-bee1-40a9-af33-e83b0ec3cb99', + id: '338c69a1-bee1-40a9-af33-e83b0ec3cb99', version: '191', namespace: '', name: 'example-namespace-1', @@ -45,6 +48,7 @@ export const MOCK_OPENSHIFT_NAMESPACES: { [uid in OpenshiftProviderIDs]: OpenShi [OPENSHIFT_02_UID]: [ { uid: '287d34b7-763f-4065-ba3a-2b7d6440baf6', + id: '287d34b7-763f-4065-ba3a-2b7d6440baf6', version: '814', namespace: '', name: 'example-namespace-2', @@ -56,6 +60,7 @@ export const MOCK_OPENSHIFT_NAMESPACES: { [uid in OpenshiftProviderIDs]: OpenShi [OPENSHIFT_03_UID]: [ { uid: 'c4f375bb-39dc-4276-913e-0d4c43691d2f', + id: 'c4f375bb-39dc-4276-913e-0d4c43691d2f', version: '51', namespace: '', name: 'example-namespace-3', diff --git a/packages/mocks/src/definitions/basic/networks.mock.ts b/packages/mocks/src/definitions/basic/networks.mock.ts index 9d1f9d416..881d0cf3e 100644 --- a/packages/mocks/src/definitions/basic/networks.mock.ts +++ b/packages/mocks/src/definitions/basic/networks.mock.ts @@ -177,6 +177,7 @@ export const MOCK_OPENSHIFT_NETWORKS: { [OPENSHIFT_HOST_UID]: [ { uid: 'e49f7782-7c59-4343-aac4-59a420201d07', + id: 'e49f7782-7c59-4343-aac4-59a420201d07', version: '13180', namespace: NAMESPACE_FORKLIFT, name: 'example-network-1', @@ -195,6 +196,7 @@ export const MOCK_OPENSHIFT_NETWORKS: { }, { uid: '8b6f4200-cba6-4579-8edd-ea08b7ddd97b', + id: '8b6f4200-cba6-4579-8edd-ea08b7ddd97b', version: '13', namespace: NAMESPACE_MIGRATION, name: 'example-network-2', @@ -215,6 +217,7 @@ export const MOCK_OPENSHIFT_NETWORKS: { [OPENSHIFT_01_UID]: [ { uid: 'foo-network-uid-1', + id: 'foo-network-uid-1', namespace: 'remote-namespace-1', name: 'ocp-network-1', version: '1', @@ -234,6 +237,7 @@ export const MOCK_OPENSHIFT_NETWORKS: { [OPENSHIFT_02_UID]: [ { uid: 'foo-network-uid-2', + id: 'foo-network-uid-2', namespace: 'remote-namespace-2', name: 'ocp-network-2', version: '1', @@ -254,6 +258,7 @@ export const MOCK_OPENSHIFT_NETWORKS: { [OPENSHIFT_03_UID]: [ { uid: 'foo-network-uid-3', + id: 'foo-network-uid-3', namespace: 'remote-namespace-3', version: '1', name: 'ocp-network-3', diff --git a/packages/mocks/src/definitions/basic/providers.mock.ts b/packages/mocks/src/definitions/basic/providers.mock.ts index 8ecf18e7e..80c25797f 100644 --- a/packages/mocks/src/definitions/basic/providers.mock.ts +++ b/packages/mocks/src/definitions/basic/providers.mock.ts @@ -120,6 +120,7 @@ export const vmwareProvider1: VSphereProvider = { datastoreCount: 3, datacenterCount: 0, apiVersion: 'v1beta1', + id: '', }; const vmwareProvider2: VSphereProvider = { @@ -230,6 +231,7 @@ const rhvProvider1: OVirtProvider = { vmCount: 36, networkCount: 15, storageDomainCount: 9, + id: '', }; const rhvProvider1i: OVirtProvider = { @@ -314,6 +316,7 @@ const openstackProvider1: OpenstackProvider = { volumeCount: 5, volumeTypeCount: 2, networkCount: 3, + id: '', }; const openstackProvider2: OpenstackProvider = { @@ -371,6 +374,7 @@ export const openshiftProvider1: OpenshiftProvider = { }, vmCount: 26, networkCount: 8, + id: '', }; const openshiftProvider2: OpenshiftProvider = { diff --git a/packages/mocks/src/definitions/basic/storages.mock.ts b/packages/mocks/src/definitions/basic/storages.mock.ts index 46e02cbbd..829ba196f 100644 --- a/packages/mocks/src/definitions/basic/storages.mock.ts +++ b/packages/mocks/src/definitions/basic/storages.mock.ts @@ -262,6 +262,7 @@ export const MOCK_OPENSHIFT_STORAGE_CLASS: { [OPENSHIFT_HOST_UID]: [ { uid: 'e9a5e83b-235c-4c75-92d1-2fcab54f6919', + id: 'e9a5e83b-235c-4c75-92d1-2fcab54f6919', version: '269', namespace: '', name: 'standard', @@ -282,6 +283,7 @@ export const MOCK_OPENSHIFT_STORAGE_CLASS: { }, { uid: 'uid-1', + id: 'uid-1', version: '1', namespace: '', name: 'large', @@ -298,6 +300,7 @@ export const MOCK_OPENSHIFT_STORAGE_CLASS: { }, { uid: 'uid-2', + id: 'uid-2', version: '1', namespace: '', name: 'small', @@ -316,6 +319,7 @@ export const MOCK_OPENSHIFT_STORAGE_CLASS: { [OPENSHIFT_01_UID]: [ { uid: 'test-1', + id: 'test-1', version: '1', namespace: '', name: 'standard', @@ -337,6 +341,7 @@ export const MOCK_OPENSHIFT_STORAGE_CLASS: { [OPENSHIFT_02_UID]: [ { uid: 'test-2', + id: 'test-2', version: '1', namespace: '', name: 'standard', @@ -358,6 +363,7 @@ export const MOCK_OPENSHIFT_STORAGE_CLASS: { [OPENSHIFT_03_UID]: [ { uid: 'test-3', + id: 'test-3', version: '1', namespace: '', name: 'standard', diff --git a/packages/mocks/src/definitions/basic/vms.mock.ts b/packages/mocks/src/definitions/basic/vms.mock.ts index b64402f1a..8fb058082 100644 --- a/packages/mocks/src/definitions/basic/vms.mock.ts +++ b/packages/mocks/src/definitions/basic/vms.mock.ts @@ -381,6 +381,7 @@ export const MOCK_OPENSHIFT_VMS: { [uid in OpenshiftProviderIDs]: OpenshiftVM[] namespace: NAMESPACE_FORKLIFT, selfLink: `providers/openshift/${OPENSHIFT_HOST_UID}/vms/3dcaf3ec-6b51-4ca0-8345-6d61841731d7`, uid: '3dcaf3ec-6b51-4ca0-8345-6d61841731d7', + id: '3dcaf3ec-6b51-4ca0-8345-6d61841731d7', version: '', object: { kind: 'VirtualMachine', @@ -501,6 +502,7 @@ export const MOCK_OPENSHIFT_VMS: { [uid in OpenshiftProviderIDs]: OpenshiftVM[] namespace: NAMESPACE_FORKLIFT, selfLink: `providers/openshift/${OPENSHIFT_HOST_UID}/vms/029b9890-259e-4ade-b22f-3991c3359062`, uid: '029b9890-259e-4ade-b22f-3991c3359062', + id: '029b9890-259e-4ade-b22f-3991c3359062', version: '', providerType: 'openshift', object: {