Upgrade CARTS to Node 18 (#139609)

Enterprise-CMCS · Apr 16, 2024 · 7dd680b · 7dd680b
1 parent fd19730
commit 7dd680b
Show file tree

Hide file tree

Showing 17 changed files with 4,199 additions and 3,703 deletions.
diff --git a/.env_example b/.env_example
@@ -10,7 +10,7 @@ fmapTableArn=local_nonsense_if_unset_we_search_CF_for
 uploadsTableName=local-uploads
 uploadsTableArn=local_nonsense_if_unset_we_search_CF_for
 stateTableName=local-state
-stateStatusTableArn=local_nonsense_if_unset_we_search_CF_for
+stateTableArn=local_nonsense_if_unset_we_search_CF_for
 stateStatusTableName=local-state-status
 stateStatusTableArn=local_nonsense_if_unset_we_search_CF_for
 sectionBaseTableName=local-section-base
@@ -27,7 +27,7 @@ API_URL=http://localhost:3030/local
 S3_LOCAL_ENDPOINT=http://localhost:4569
 S3_ATTACHMENTS_BUCKET_NAME=local-uploads
 URL=http://localhost/3000
-docraptorApiKey=YOUR_API_KEY_HERE
+docraptorApiKey=YOUR_API_KEY_HERE #pragma: allowlist secret
 warmupSchedule="60 minutes"
 warmupConcurrency=5
 iamPath=/

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-v16.19.1
+v18.17.0
diff --git a/package.json b/package.json
@@ -22,13 +22,12 @@
   },
   "homepage": "https://github.com/Enterprise-CMCS/macpro-mdct-carts#readme",
   "devDependencies": {
-    "@types/dotenv": "^8.2.0",
     "@types/flat": "^5.0.2",
-    "@types/node": "^14.14.6",
+    "@types/node": "^18.17.0",
     "@types/yargs": "^15.0.10",
     "@typescript-eslint/eslint-plugin": "5.18.0",
     "@typescript-eslint/parser": "5.18.0",
-    "dotenv": "^8.2.0",
+    "dotenv": "^16.4.5",
     "eslint": "8.12.0",
     "eslint-config-airbnb": "^18.2.1",
     "eslint-plugin-cypress": "^2.12.1",
@@ -45,11 +44,10 @@
     "serverless-dotenv-plugin": "^3.0.0",
     "serverless-iam-helper": "github:Enterprise-CMCS/serverless-iam-helper",
     "serverless-idempotency-helper": "github:Enterprise-CMCS/serverless-idempotency-helper",
-    "serverless-offline": "^8.8.0",
+    "serverless-offline": "^12.0.4",
     "serverless-offline-ssm": "^6.2.0",
     "serverless-online": "Enterprise-CMCS/macpro-serverless-online",
     "serverless-plugin-scripts": "^1.0.2",
-    "serverless-plugin-warmup": "^7.1.0",
     "serverless-s3-bucket-helper": "github:Enterprise-CMCS/serverless-s3-bucket-helper#master",
     "serverless-s3-sync": "2.0.0",
     "serverless-stack-termination-protection": "^2.0.0",

diff --git a/services/app-api/handlers/printing/printPdf.ts b/services/app-api/handlers/printing/printPdf.ts
@@ -2,7 +2,6 @@ import handler from "../../libs/handler-lib";
 import * as logger from "../../libs/debug-lib";
 import createDOMPurify from "dompurify";
 import { JSDOM } from "jsdom";
-import { fetch } from "cross-fetch"; // TODO delete this line and uninstall this package, once CARTS is running on Nodejs 18+
 
 const windowEmulator: any = new JSDOM("").window;
 const DOMPurify = createDOMPurify(windowEmulator);

diff --git a/services/app-api/handlers/printing/tests/printPdf.test.ts b/services/app-api/handlers/printing/tests/printPdf.test.ts
@@ -1,28 +1,28 @@
 import { testEvent } from "../../../test-util/testEvents";
 import { APIGatewayProxyEvent } from "../../../types";
 import { print } from "../printPdf";
-import { fetch } from "cross-fetch";
 
 jest.spyOn(console, "error").mockImplementation();
 jest.spyOn(console, "warn").mockImplementation();
+global.fetch = jest.fn().mockImplementationOnce(() => {
+  return new Promise((resolve) => {
+    resolve({
+      status: 200,
+      headers: {
+        get: jest.fn().mockResolvedValue("3"),
+      },
+      arrayBuffer: jest.fn().mockResolvedValue(
+        // An ArrayBuffer containing `%PDF-1.7`
+        new Uint8Array([37, 80, 68, 70, 45, 49, 46, 55]).buffer
+      ),
+    });
+  });
+});
 
 jest.mock("../../../libs/authorization", () => ({
   isAuthorized: jest.fn().mockReturnValue(true),
 }));
 
-jest.mock("cross-fetch", () => ({
-  fetch: jest.fn().mockResolvedValue({
-    status: 200,
-    headers: {
-      get: jest.fn().mockResolvedValue("3"),
-    },
-    arrayBuffer: jest.fn().mockResolvedValue(
-      // An ArrayBuffer containing `%PDF-1.7`
-      new Uint8Array([37, 80, 68, 70, 45, 49, 46, 55]).buffer
-    ),
-  }),
-}));
-
 const html = "<p>abc</p>";
 const base64EncodedHtml = Buffer.from(html).toString("base64");
 

diff --git a/services/app-api/package.json b/services/app-api/package.json
@@ -33,7 +33,6 @@
     "@aws-sdk/lib-dynamodb": "^3.540.0",
     "@aws-sdk/s3-request-presigner": "^3.521.0",
     "aws-jwt-verify": "^3.1.0",
-    "cross-fetch": "^4.0.0",
     "dompurify": "^3.0.10",
     "jsdom": "^22.1.0",
     "jsonpath-plus": "^5.1.0",

diff --git a/services/app-api/serverless.yml b/services/app-api/serverless.yml
@@ -6,9 +6,9 @@ frameworkVersion: "3"
 package:
   individually: true
 
-useDotenv: true
 plugins:
   - serverless-plugin-typescript
+  - serverless-dotenv-plugin
   - serverless-plugin-warmup
   - serverless-associate-waf
   - serverless-offline
@@ -39,6 +39,8 @@ custom:
       - main
       - val
       - production
+  dotenv:
+    path: ../../.env
   accountId: ${AWS::AccountId}
   acsTableName: ${env:acsTableName, cf:database-${self:custom.stage}.AcsTableName}
   acsTableArn: ${env:acsTableArn, cf:database-${self:custom.stage}.AcsTableArn}
@@ -84,7 +86,7 @@ custom:
     prod: aws_iam
 provider:
   name: aws
-  runtime: nodejs16.x
+  runtime: nodejs18.x
   region: us-east-1
   tracing:
     apiGateway: true

diff --git a/services/app-api/yarn.lock b/services/app-api/yarn.lock
@@ -2414,13 +2414,6 @@ convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
   dependencies:
     safe-buffer "~5.1.1"
 
-cross-fetch@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-4.0.0.tgz#f037aef1580bb3a1a35164ea2a848ba81b445983"
-  integrity sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g==
-  dependencies:
-    node-fetch "^2.6.12"
-
 cross-spawn@^7.0.3:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
@@ -3677,13 +3670,6 @@ nise@^5.1.2:
     just-extend "^4.0.2"
     path-to-regexp "^1.7.0"
 
-node-fetch@^2.6.12:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d"
-  integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==
-  dependencies:
-    whatwg-url "^5.0.0"
-
 node-int64@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
@@ -4216,11 +4202,6 @@ tr46@^4.1.1:
   dependencies:
     punycode "^2.3.0"
 
-tr46@~0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
-  integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
-
 ts-jest@^27.1.3:
   version "27.1.3"
   resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-27.1.3.tgz#1f723e7e74027c4da92c0ffbd73287e8af2b2957"
@@ -4344,11 +4325,6 @@ walker@^1.0.7:
   dependencies:
     makeerror "1.0.12"
 
-webidl-conversions@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
-  integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==
-
 webidl-conversions@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff"
@@ -4396,14 +4372,6 @@ whatwg-url@^12.0.0, whatwg-url@^12.0.1:
     tr46 "^4.1.1"
     webidl-conversions "^7.0.0"
 
-whatwg-url@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
-  integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==
-  dependencies:
-    tr46 "~0.0.3"
-    webidl-conversions "^3.0.0"
-
 whatwg-url@^8.0.0, whatwg-url@^8.5.0:
   version "8.7.0"
   resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.7.0.tgz#656a78e510ff8f3937bc0bcbe9f5c0ac35941b77"

diff --git a/services/carts-bigmac-streams/serverless.yml b/services/carts-bigmac-streams/serverless.yml
@@ -44,7 +44,7 @@ custom:
 
 provider:
   name: aws
-  runtime: nodejs16.x
+  runtime: nodejs18.x
   region: us-east-1
   iam:
     role:

diff --git a/services/database/handlers/seed/services/seedRunner.js b/services/database/handlers/seed/services/seedRunner.js
@@ -74,8 +74,11 @@ const buildSeedRunner = () => {
   const endpoint = process.env.DYNAMODB_URL;
   if (endpoint) {
     dynamoConfig.endpoint = endpoint;
-    dynamoConfig.accessKeyId = "LOCALFAKEKEY"; // pragma: allowlist secret
-    dynamoConfig.secretAccessKey = "LOCALFAKESECRET"; // pragma: allowlist secret
+    dynamoConfig.region = "localhost";
+    dynamoConfig.credentials = {
+      accessKeyId: "LOCALFAKEKEY", // pragma: allowlist secret
+      secretAccessKey: "LOCALFAKESECRET", // pragma: allowlist secret
+    };
     dynamoPrefix = "local";
   } else {
     dynamoConfig["region"] = "us-east-1";

diff --git a/services/database/scripts/utils/dynamodb.js b/services/database/scripts/utils/dynamodb.js
@@ -20,8 +20,11 @@ const buildDynamoClient = () => {
   const endpoint = process.env.DYNAMODB_URL;
   if (endpoint) {
     dynamoConfig.endpoint = endpoint;
-    dynamoConfig.accessKeyId = "LOCALFAKEKEY"; // pragma: allowlist secret
-    dynamoConfig.secretAccessKey = "LOCALFAKESECRET"; // pragma: allowlist secret
+    dynamoConfig.region = "localhost";
+    dynamoConfig.credentials = {
+      accessKeyId: "LOCALFAKEKEY", // pragma: allowlist secret
+      secretAccessKey: "LOCALFAKESECRET", // pragma: allowlist secret
+    };
   } else {
     dynamoConfig["region"] = "us-east-1";
   }

diff --git a/services/database/serverless.yml b/services/database/serverless.yml
@@ -81,7 +81,7 @@ custom:
     seed: ${self:custom.seedOptions.${self:custom.stage}, self:custom.seedOptions.default}
 provider:
   name: aws
-  runtime: nodejs16.x
+  runtime: nodejs18.x
   region: us-east-1
   iam:
     role:

diff --git a/services/ui-auth/serverless.yml b/services/ui-auth/serverless.yml
@@ -8,7 +8,7 @@ package:
 
 provider:
   name: aws
-  runtime: nodejs16.x
+  runtime: nodejs18.x
   region: us-east-1
   iam:
     role:

diff --git a/services/ui-src/serverless.yml b/services/ui-src/serverless.yml
@@ -11,7 +11,7 @@ plugins:
 
 provider:
   name: aws
-  runtime: nodejs16.x
+  runtime: nodejs18.x
   region: us-east-1
 
 s3BucketHelper:

diff --git a/services/ui/serverless.yml b/services/ui/serverless.yml
@@ -5,7 +5,7 @@ frameworkVersion: "3"
 
 provider:
   name: aws
-  runtime: nodejs16.x
+  runtime: nodejs18.x
   region: us-east-1
   iam:
     role:

diff --git a/services/uploads/serverless.yml b/services/uploads/serverless.yml
@@ -12,7 +12,7 @@ plugins:
 
 provider:
   name: aws
-  runtime: nodejs16.x
+  runtime: nodejs18.x
   region: us-east-1
   iam:
     role: