From 5db75e7b1b07c8b010c3bed08a0b7c732fb207cd Mon Sep 17 00:00:00 2001
From: Ed Olivares <34591886+eudoroolivares2016@users.noreply.github.com>
Date: Thu, 5 Dec 2024 07:59:27 -0800
Subject: [PATCH] GQL-95: Updates Node to version 22 (#150)

* GQL-95: Running npm audit fix

* GQL-95: Newline on nvmrc

* GQL-95: Editing maintainers list to support address

* GQL-95: Update test ci test rules to make it easier to update node next time around
---
 .github/workflows/ci.yml      | 12 +++++++++---
 .nvmrc                        |  2 +-
 babel.config.json             |  2 +-
 bin/deploy-bamboo.sh          |  2 +-
 package-lock.json             | 14 ++++++++------
 package.json                  | 16 ++--------------
 serverless-infrastructure.yml |  2 +-
 serverless.yml                |  2 +-
 8 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2cbb912f1..0343e6ffe 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
         matrix:
-          node-version: ['lts/hydrogen']
+          node-version: ['lts/jod']
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
@@ -40,7 +40,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
         matrix:
-          node-version: ['lts/hydrogen']
+          node-version: ['lts/jod']
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
@@ -69,6 +69,12 @@ jobs:
       uses: codecov/codecov-action@v4
       env:
         CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+  tests-passed:
+    needs: ['jest', 'python-test']
+    runs-on: ubuntu-latest
+    steps:
+    - name: All Tests Have Passed
+      run: 'echo true'
 
   python-test:
     runs-on: ubuntu-latest
@@ -90,7 +96,7 @@ jobs:
         working-directory: ./src/earthdataVarinfo
   deploy:
     if: success() && github.ref == 'refs/heads/main' # only run on main success
-    needs: [jest, python-test] # only run after jest and python-test jobs complete
+    needs: [tests-passed] # only run after all test jobs complete
     runs-on: ubuntu-latest
     steps:
     - name: Checkout code
diff --git a/.nvmrc b/.nvmrc
index a77793ecc..deed13c01 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-lts/hydrogen
+lts/jod
diff --git a/babel.config.json b/babel.config.json
index 1acaf0f25..937f3efcf 100644
--- a/babel.config.json
+++ b/babel.config.json
@@ -3,7 +3,7 @@
     [
       "@babel/preset-env", {
         "targets": {
-          "node": "18",
+          "node": "22",
           "esmodules": true
         }
       }
diff --git a/bin/deploy-bamboo.sh b/bin/deploy-bamboo.sh
index 2a6729cfb..69c17a298 100755
--- a/bin/deploy-bamboo.sh
+++ b/bin/deploy-bamboo.sh
@@ -12,7 +12,7 @@ node_modules
 EOF
 
 cat <<EOF > Dockerfile
-FROM node:18.16-bullseye
+FROM node:22
 COPY . /build
 WORKDIR /build
 RUN npm ci --omit=dev
diff --git a/package-lock.json b/package-lock.json
index 026197a56..65b998d8a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7882,9 +7882,10 @@
       }
     },
     "node_modules/child-process-ext/node_modules/cross-spawn": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+      "version": "6.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.6.tgz",
+      "integrity": "sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw==",
+      "license": "MIT",
       "dependencies": {
         "nice-try": "^1.0.4",
         "path-key": "^2.0.1",
@@ -8320,9 +8321,10 @@
       }
     },
     "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+      "license": "MIT",
       "dependencies": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",
diff --git a/package.json b/package.json
index cc571ac21..7e28df6e1 100644
--- a/package.json
+++ b/package.json
@@ -9,20 +9,8 @@
   },
   "maintainers": [
     {
-      "name": "Ryan Abbott",
-      "email": "ryan@element84.com"
-    },
-    {
-      "name": "Matthew Crouch",
-      "email": "matthew@element84.com"
-    },
-    {
-      "name": "Trevor Lang",
-      "email": "trevor@element84.com"
-    },
-    {
-      "name": "Mark Schmele",
-      "email": "mark.h.schmele@nasa.gov"
+      "name": "Earthdata Search",
+      "email": "support@earthdata.nasa.gov"
     }
   ],
   "scripts": {
diff --git a/serverless-infrastructure.yml b/serverless-infrastructure.yml
index e41b1c169..a0507a126 100644
--- a/serverless-infrastructure.yml
+++ b/serverless-infrastructure.yml
@@ -2,7 +2,7 @@ service: graphql-infrastructure
 
 provider:
   name: aws
-  runtime: nodejs18.x
+  runtime: nodejs22.x
   region: us-east-1
   stage: ${opt:stage, 'dev'}
   vpc:
diff --git a/serverless.yml b/serverless.yml
index deb916c90..6027b718c 100644
--- a/serverless.yml
+++ b/serverless.yml
@@ -2,7 +2,7 @@ service: graphql
 
 provider:
   name: aws
-  runtime: nodejs18.x
+  runtime: nodejs22.x
   region: us-east-1
   stage: ${opt:stage, 'development'}
   endpointType: PRIVATE