Node1819plus (#5574)

* update versions of github actions and also removed node18.18 restriction Signed-off-by: Amndeep Singh Mann <[email protected]> * change nvmrc to 18 so that netlify will use the correct node version Signed-off-by: Amndeep Singh Mann <[email protected]> * change dockerfiles to point at latest ubi again Signed-off-by: Amndeep Singh Mann <[email protected]> * use tsx to call out to 3rd party binaries Signed-off-by: Amndeep Singh Mann <[email protected]> * change engines.node to point to latest/greatest 18 Signed-off-by: Amndeep Singh Mann <[email protected]> * forgot to swap out tsx for ts-node in hdf-converters Signed-off-by: Amndeep Singh Mann <[email protected]> --------- Signed-off-by: Amndeep Singh Mann <[email protected]> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
mitre · Feb 27, 2024 · 59fd679 · 59fd679
1 parent f56954c
commit 59fd679
Show file tree

Hide file tree

Showing 23 changed files with 237 additions and 150 deletions.
diff --git a/.github/workflows/auto-approve-and-merge.yml b/.github/workflows/auto-approve-and-merge.yml
@@ -15,7 +15,7 @@ jobs:
       pull-requests: write
       contents: write
     steps:
-      - uses: hmarr/auto-approve-action@v3
+      - uses: hmarr/auto-approve-action@v4
         with:
           github-token: '${{ secrets.GITHUB_TOKEN }}'
       - name: Enable auto-merge for Dependabot PRs

diff --git a/.github/workflows/backend-tests.yml b/.github/workflows/backend-tests.yml
@@ -18,12 +18,12 @@ jobs:
           - 5432:5432
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: "18.18"
+          node-version: "18"
           check-latest: true
           cache: 'yarn'
 

diff --git a/.github/workflows/build-prod.yml b/.github/workflows/build-prod.yml
@@ -19,12 +19,12 @@ jobs:
     env:
       NODE_ENV: production
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: "18.18"
+          node-version: "18"
           check-latest: true
           cache: 'yarn'
 

diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml
@@ -24,18 +24,18 @@ jobs:
       # write permission is required for autolabeler
       # otherwise, read permission is required at least
       pull-requests: write
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       # (Optional) GitHub Enterprise requires GHE_HOST variable set
       #- name: Set GHE_HOST
       #  run: |
       #    echo "GHE_HOST=${GITHUB_SERVER_URL##https:\/\/}" >> $GITHUB_ENV
 
       # Drafts your next Release notes as Pull Requests are merged into "master"
-      - uses: release-drafter/release-drafter@v5
+      - uses: release-drafter/release-drafter@v6
         # (Optional) specify config name to use, relative to .github/. Default: release-drafter.yml
         # with:
         #   config-name: my-config.yml
         #   disable-autolabeler: true
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/e2e-ui-tests.yml b/.github/workflows/e2e-ui-tests.yml
@@ -34,12 +34,12 @@ jobs:
           SPLUNK_PASSWORD: Valid_password!
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: "18.18"
+          node-version: "18"
           check-latest: true
           cache: 'yarn'
 
@@ -61,14 +61,14 @@ jobs:
           NODE_ENV: production # want to install dev deps like cypress but test against the prod build of Heimdall
 
       - name: Cypress run
-        uses: cypress-io/github-action@v5
+        uses: cypress-io/github-action@v6
         with:
           start: yarn start, yarn run cypress-test mock-json, yarn run cypress-test mock-openid
           wait-on: 'http://127.0.0.1:3000, http://127.0.0.1:3001'
 
       - name: Upload test screenshots and videos
         if: failure()
-        uses: actions/upload-artifact@master
+        uses: actions/upload-artifact@v4
         with:
           name: cypress-recording
           path: |

diff --git a/.github/workflows/frontend-tests.yml b/.github/workflows/frontend-tests.yml
@@ -18,12 +18,12 @@ jobs:
           - 5432:5432
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: "18.18"
+          node-version: "18"
           check-latest: true
           cache: 'yarn'
 

diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
@@ -9,12 +9,12 @@ jobs:
     env:
       NODE_ENV: production
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: setup node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: "18.18"
+          node-version: "18"
           check-latest: true
           cache: 'yarn'
 

diff --git a/.github/workflows/hdfconverter-tests.yml b/.github/workflows/hdfconverter-tests.yml
@@ -24,12 +24,12 @@ jobs:
           SPLUNK_PASSWORD: Valid_password!
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: "18.18"
+          node-version: "18"
           check-latest: true
           cache: 'yarn'
 

diff --git a/.github/workflows/inspecjs-tests.yml b/.github/workflows/inspecjs-tests.yml
@@ -11,15 +11,15 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: '2.7'
 
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: "18.18"
+          node-version: "18"
           check-latest: true
           cache: 'yarn'
 

diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
@@ -18,12 +18,12 @@ jobs:
           - 5432:5432
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: "18.18"
+          node-version: "18"
           check-latest: true
           cache: 'yarn'
 

diff --git a/.github/workflows/push-lite-to-docker.yml b/.github/workflows/push-lite-to-docker.yml
@@ -9,17 +9,17 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Checkout the Heimdall Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: Dockerfile.lite

diff --git a/.github/workflows/push-server-to-docker.yml b/.github/workflows/push-server-to-docker.yml
@@ -9,19 +9,19 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Checkout the Heimdall Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           context: .
           push: true

diff --git a/.github/workflows/push-to-npm.yml b/.github/workflows/push-to-npm.yml
@@ -8,12 +8,12 @@ jobs:
   build-deploy:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: setup node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: "18.18"
+          node-version: "18"
           check-latest: true
           registry-url: 'https://registry.npmjs.org'
           cache: 'yarn'
@@ -43,10 +43,11 @@ jobs:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
 
       # Setup .npmrc file to publish to GitHub Packages
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         if: always()
         with:
-          node-version: 18
+          node-version: "18"
+          check-latest: true
           registry-url: 'https://npm.pkg.github.com'
           cache: 'yarn'
 

diff --git a/.github/workflows/release-lite-to-docker.yml b/.github/workflows/release-lite-to-docker.yml
@@ -9,25 +9,25 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Run string replace # remove the v from the version number before using it in the docker tag
-        uses: frabert/replace-string-action@master
+        uses: frabert/replace-string-action@v2
         id: format-tag
         with:
           pattern: 'v'
           string: '${{ github.event.release.tag_name }}'
           replace-with: ''
           flags: 'g'
       - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Checkout the Heimdall Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: Dockerfile.lite

diff --git a/.github/workflows/release-server-to-docker.yml b/.github/workflows/release-server-to-docker.yml
@@ -9,25 +9,25 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Run string replace # remove the v from the version number before using it in the docker tag
-        uses: frabert/replace-string-action@master
+        uses: frabert/replace-string-action@v2
         id: format-tag
         with:
           pattern: 'v'
           string: '${{ github.event.release.tag_name }}'
           replace-with: ''
           flags: 'g'
       - name: Checkout the Heimdall Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           context: .
           push: true

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-18.18
+18
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_CONTAINER=registry.access.redhat.com/ubi8/nodejs-18-minimal:1-91
+ARG BASE_CONTAINER=registry.access.redhat.com/ubi8/nodejs-18-minimal:1
 
 FROM $BASE_CONTAINER as builder
 

diff --git a/Dockerfile.lite b/Dockerfile.lite
@@ -1,4 +1,4 @@
-ARG BUILD_CONTAINER=registry.access.redhat.com/ubi8/nodejs-18-minimal:1-91
+ARG BUILD_CONTAINER=registry.access.redhat.com/ubi8/nodejs-18-minimal:1
 ARG BASE_CONTAINER=nginx:alpine
 
 FROM $BUILD_CONTAINER as builder

diff --git a/apps/backend/package.json b/apps/backend/package.json
@@ -16,14 +16,14 @@
     "lint": "eslint \"{src,migrations,seeders,test}/**/*.ts\" --fix",
     "lint:ci": "eslint \"{src,migrations,seeders,test}/**/*.ts\" --max-warnings 0",
     "sequelize-cli-windows": "node --experimental-loader ts-node/esm node_modules/sequelize-cli/lib/sequelize",
-    "sequelize-cli": "node --experimental-loader ts-node/esm node_modules/.bin/sequelize",
+    "sequelize-cli": "tsx node_modules/.bin/sequelize",
     "start": "node dist/src/main",
     "start:debug": "nest start --debug --watch",
     "start:dev": "nest start --watch",
     "test": "jest --silent",
     "test:ci-cov": "jest --silent --coverage --runInBand",
     "test:cov": "jest --silent --coverage",
-    "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
+    "test:debug": "tsx --inspect-brk node_modules/.bin/jest --runInBand",
     "test:e2e": "jest --runInBand --silent --config test/jest-e2e.json",
     "test:log": "jest",
     "test:watch": "jest --watch"
@@ -106,8 +106,7 @@
     "sequelize-cli": "^6.2.0",
     "sequelize-typescript": "^2.0.0",
     "ts-loader": "^9.1.0",
-    "ts-node": "^10.0.0",
-    "tsconfig-paths": "^4.0.0",
+    "tsx": "^4.7.1",
     "uuid": "^9.0.0",
     "winston": "^3.3.3"
   },

diff --git a/apps/frontend/package.json b/apps/frontend/package.json
@@ -127,7 +127,7 @@
     "vue-jest": "^3.0.7"
   },
   "engines": {
-    "node": "~18.18.0"
+    "node": "^18.19.0"
   },
   "branch": "/blob/master/",
   "changelog": "/releases",

diff --git a/libs/hdf-converters/package.json b/libs/hdf-converters/package.json
@@ -21,8 +21,8 @@
     "lint": "eslint \"**/*.ts\" --fix",
     "lint:ci": "eslint \"**/*.ts\" --max-warnings 0",
     "test": "jest",
-    "csv2json": "ts-node data/converters/csv2json.ts",
-    "xml2json": "ts-node data/converters/xml2json.ts"
+    "csv2json": "tsx data/converters/csv2json.ts",
+    "xml2json": "tsx data/converters/xml2json.ts"
   },
   "dependencies": {
     "@aws-sdk/client-config-service": "^3.95.0",
@@ -62,7 +62,7 @@
     "jest": "^27.0.6",
     "quicktype": "^15.0.260",
     "ts-jest": "^29.1.0",
-    "ts-node": "^10.0.0",
+    "tsx": "^4.7.1",
     "typedoc": "^0.25.0"
   },
   "jest": {

diff --git a/package.json b/package.json
@@ -43,7 +43,7 @@
     "vue-template-compiler": "^2.7.16"
   },
   "engines": {
-    "node": "~18.18.0"
+    "node": "^18.19.0"
   },
   "version": "0.0.0"
 }