chore: node js 18 upgrd (#2519)

kamaksheeAtl · web-flow · commit a640d5ced381 · 2023-10-30T11:37:11.000+11:00
* chore: node js upgrd

* fix: test case failure
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-14.21.1
+18.18.1
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:14.21-alpine3.16 as build
+FROM node:18-alpine3.18 as build
 
 # adding python for node-gyp
 RUN apk add g++ make python3
diff --git a/Dockerfile.prod b/Dockerfile.prod
@@ -1,4 +1,4 @@
-FROM node:14.21-alpine3.16 as build
+FROM node:18-alpine3.18 as build
 
 # adding python for node-gyp
 RUN apk add g++ make python3
@@ -28,7 +28,7 @@ RUN yarn run build:release
 # https://stackoverflow.com/questions/57108751/docker-build-failed-when-copying-in-multi-step-build
 RUN chown root:root -R /app
 
-FROM node:14.21-alpine3.16
+FROM node:18-alpine3.18
 
 # adding to solve vuln
 RUN apk add --update --upgrade busybox
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
 	"description": "GitHub integration for Atlassian Jira",
 	"repository": "https://github.com/atlassian/github-for-jira.git",
 	"engines": {
-		"node": ">= 14.21 <15",
+		"node": ">= 18.18.1",
 		"yarn": "^1.22.0"
 	},
 	"main": "src/main",
@@ -28,7 +28,7 @@
 		"lint:ts": "eslint . --ext .ts,.tsx",
 		"lint:yaml": "yamllint github-for-jira.sd.yml",
 		"pretest": "NODE_ENV=test run-p clean setup db:test",
-		"test": "yarn spa:test && jest --runInBand --forceExit --coverage",
+		"test": "yarn spa:test && jest --forceExit --coverage --runInBand --logHeapUsage --workerIdleMemoryLimit='2GB'",
 		"test:watch": "jest --runInBand --watchAll --coverage=false",
 		"db": "run-s db:create db:migrate",
 		"db:create": "run-p db:create:dev db:create:test",
@@ -95,6 +95,7 @@
 		"helmet": "^3.21.2",
 		"hot-shots": "^8.3.2",
 		"http-proxy": "^1.18.1",
+		"http-proxy-agent": "^7.0.0",
 		"https-proxy-agent": "5.0.0",
 		"ioredis": "^4.16.3",
 		"is-base64": "^1.1.0",
@@ -157,13 +158,14 @@
 		"eslint-import-resolver-typescript": "^2.5.0",
 		"eslint-plugin-import": "^2.25.4",
 		"eslint-plugin-jest": "^27.4.0",
-		"eslint-plugin-jsdoc": "^37.9.3",
+		"eslint-plugin-jsdoc": "^46.8.2",
 		"eslint-plugin-no-only-tests": "^2.6.0",
 		"eslint-plugin-node": "^11.1.0",
 		"eslint-plugin-promise": "^6.0.0",
 		"husky": "^6.0.0",
-		"jest": "^27.5.1",
-		"jest-diff": "^27.5.1",
+		"jest": "^29.7.0",
+		"jest-diff": "^29.7",
+		"jest-environment-jsdom": "^29.7.0",
 		"jest-when": "^3.5.1",
 		"keygrip": "^1.0.2",
 		"nock": "^13.2.4",
@@ -175,7 +177,7 @@
 		"smee-client": "^1.2.2",
 		"sqlite3": "^5.1.5",
 		"supertest": "^6.2.2",
-		"ts-jest": "~27.1.3",
+		"ts-jest": "^29.1.1",
 		"ts-node": "^10.5.0",
 		"ts-node-dev": "^2.0.0",
 		"yaml-lint": "^1.2.4"
@@ -184,7 +186,7 @@
 		"@atlassian/sqs-queue-dlq-service": "^2.1.1"
 	},
 	"volta": {
-		"node": "14.21.1",
+		"node": "18.18.1",
 		"yarn": "1.22.18"
 	}
 }
diff --git a/spa/jest.config.json b/spa/jest.config.json
@@ -4,6 +4,6 @@
 		"^.+\\.tsx?$": "ts-jest"
 	},
 	"setupFilesAfterEnv": [
-		"@testing-library/jest-dom/extend-expect"
+		"./setup.ts"
 	]
 }
diff --git a/spa/package.json b/spa/package.json
@@ -48,7 +48,7 @@
     "simplebar-react": "^3.2.4"
   },
   "devDependencies": {
-    "@testing-library/jest-dom": "^5.16.5",
+    "@testing-library/jest-dom": "^6.1.4",
     "@testing-library/react": "^14.0.0",
     "@testing-library/user-event": "^14.4.3",
     "@types/jest": "^29.5.2",
diff --git a/spa/setup.ts b/spa/setup.ts
@@ -0,0 +1 @@
+import "@testing-library/jest-dom";
diff --git a/spa/yarn.lock b/spa/yarn.lock
@@ -7,10 +7,10 @@
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf"
   integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==
 
-"@adobe/css-tools@^4.0.1":
-  version "4.2.0"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@adobe/css-tools/-/css-tools-4.2.0.tgz#e1a84fca468f4b337816fcb7f0964beb620ba855"
-  integrity sha512-E09FiIft46CmH5Qnjb0wsW54/YQd69LsxeKUOWawmws1XWvyFGURnAChH0mlr7YPFR1ofwvUQfcL0J3lMxXqPA==
+"@adobe/css-tools@^4.3.1":
+  version "4.3.1"
+  resolved "https://packages.atlassian.com/api/npm/npm-remote/@adobe/css-tools/-/css-tools-4.3.1.tgz#abfccb8ca78075a2b6187345c26243c1a0842f28"
+  integrity sha512-/62yikz7NLScCGAAST5SHdnjaDJQBDq0M2muyRTpf2VQhw6StBg2ALiu73zSJQ4fMVLA+0uBhBHAle7Wg+2kSg==
 
 "@alloc/quick-lru@^5.2.0":
   version "5.2.0"
@@ -2878,14 +2878,13 @@
     lz-string "^1.5.0"
     pretty-format "^27.0.2"
 
-"@testing-library/jest-dom@^5.16.5":
-  version "5.16.5"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@testing-library/jest-dom/-/jest-dom-5.16.5.tgz#3912846af19a29b2dbf32a6ae9c31ef52580074e"
-  integrity sha512-N5ixQ2qKpi5OLYfwQmUb/5mSV9LneAcaUfp32pn4yCnpb8r/Yz0pXFPck21dIicKmi+ta5WRAknkZCfA8refMA==
+"@testing-library/jest-dom@^6.1.4":
+  version "6.1.4"
+  resolved "https://packages.atlassian.com/api/npm/npm-remote/@testing-library/jest-dom/-/jest-dom-6.1.4.tgz#cf0835c33bc5ef00befb9e672b1e3e6a710e30e3"
+  integrity sha512-wpoYrCYwSZ5/AxcrjLxJmCU6I5QAJXslEeSiMQqaWmP2Kzpd1LvF/qxmAIW2qposULGWq2gw30GgVNFLSc2Jnw==
   dependencies:
-    "@adobe/css-tools" "^4.0.1"
+    "@adobe/css-tools" "^4.3.1"
     "@babel/runtime" "^7.9.2"
-    "@types/testing-library__jest-dom" "^5.9.1"
     aria-query "^5.0.0"
     chalk "^3.0.0"
     css.escape "^1.5.1"
@@ -3092,7 +3091,7 @@
   dependencies:
     "@types/istanbul-lib-report" "*"
 
-"@types/jest@*", "@types/jest@^29.5.2":
+"@types/jest@^29.5.2":
   version "29.5.2"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@types/jest/-/jest-29.5.2.tgz#86b4afc86e3a8f3005b297ed8a72494f89e6395b"
   integrity sha512-mSoZVJF5YzGVCk+FsDxzDuH7s+SCkzrgKZzf0Z0T2WudhBUPoF6ktoTPC4R0ZoCPCV5xUvuU6ias5NvxcBcMMg==
@@ -3284,13 +3283,6 @@
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c"
   integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==
 
-"@types/testing-library__jest-dom@^5.9.1":
-  version "5.14.6"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.14.6.tgz#4887f6e1af11215428ab02777873bcede98a53b0"
-  integrity sha512-FkHXCb+ikSoUP4Y4rOslzTdX5sqYwMxfefKh1GmZ8ce1GOkEHntSp6b5cGadmNfp5e4BMEWOMx+WSKd5/MqlDA==
-  dependencies:
-    "@types/jest" "*"
-
 "@types/tough-cookie@*":
   version "4.0.2"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@types/tough-cookie/-/tough-cookie-4.0.2.tgz#6286b4c7228d58ab7866d19716f3696e03a09397"
diff --git a/src/config/feature-flags.test.ts b/src/config/feature-flags.test.ts
@@ -1,5 +1,5 @@
 import LaunchDarkly, { LDClient } from "launchdarkly-node-server-sdk";
-import { mocked } from "ts-jest/utils";
+import { mocked } from "jest-mock";
 
 jest.mock("launchdarkly-node-server-sdk");
 
diff --git a/src/github/client/token-cache.test.ts b/src/github/client/token-cache.test.ts
@@ -3,7 +3,7 @@ import { AuthToken, TEN_MINUTES } from "./auth-token";
 import { AppTokenHolder } from "./app-token-holder";
 import { getInstallationId } from "./installation-id";
 import { keyLocator } from "./key-locator";
-import { mocked } from "ts-jest/utils";
+import { mocked } from "jest-mock";
 import { Subscription } from "~/src/models/subscription";
 import { envVars } from "config/env";
 import fs from "fs";
diff --git a/src/middleware/github-webhook-middleware.test.ts b/src/middleware/github-webhook-middleware.test.ts
@@ -1,4 +1,4 @@
-import { mocked } from "ts-jest/utils";
+import { mocked } from "jest-mock";
 import { Installation } from "models/installation";
 import { Subscription } from "models/subscription";
 import { GithubWebhookMiddleware } from "./github-webhook-middleware";
diff --git a/src/models/reposyncstate.test.ts b/src/models/reposyncstate.test.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { Subscription } from "./subscription";
 import { RepoSyncState } from "./reposyncstate";
-import { mocked } from "ts-jest/utils";
+import { mocked } from "jest-mock";
 import { booleanFlag } from "config/feature-flags";
 
 jest.mock("config/feature-flags");
diff --git a/src/routes/api/api-replay-failed-entities-from-data-depot.test.ts b/src/routes/api/api-replay-failed-entities-from-data-depot.test.ts
@@ -8,7 +8,7 @@ import { Installation } from "~/src/models/installation";
 import { createHashWithSharedSecret } from "~/src/util/encryption";
 import { RepoSyncState } from "~/src/models/reposyncstate";
 import {  booleanFlag } from "../../config/feature-flags";
-import { mocked } from "ts-jest/utils";
+import { mocked } from "jest-mock";
 
 
 jest.mock("config/feature-flags");
diff --git a/src/routes/api/api-resync-failed-tasks.test.ts b/src/routes/api/api-resync-failed-tasks.test.ts
@@ -1,5 +1,5 @@
 import express, { Application, NextFunction, Request, Response } from "express";
-import { mocked } from "ts-jest/utils";
+import { mocked } from "jest-mock";
 import { booleanFlag } from "~/src/config/feature-flags";
 import { getLogger } from "~/src/config/logger";
 import { ApiRouter } from "./api-router";
diff --git a/src/routes/github/branch/github-branch-get.test.ts b/src/routes/github/branch/github-branch-get.test.ts
@@ -1,7 +1,7 @@
 
 import { getLogger } from "config/logger";
 import { GithubBranchGet } from "routes/github/branch/github-branch-get";
-import { mocked } from "ts-jest/utils";
+import { mocked } from "jest-mock";
 import { Subscription } from "models/subscription";
 
 jest.mock("models/subscription");
diff --git a/src/routes/github/create-branch/github-branches-get.test.ts b/src/routes/github/create-branch/github-branches-get.test.ts
@@ -2,7 +2,7 @@
 import { getLogger } from "config/logger";
 import { GithubBranchesGet } from "~/src/routes/github/create-branch/github-branches-get";
 import { Subscription } from "models/subscription";
-import { mocked } from "ts-jest/utils";
+import { mocked } from "jest-mock";
 
 jest.mock("models/subscription");
 
diff --git a/src/routes/github/create-branch/github-create-branch-post.test.ts b/src/routes/github/create-branch/github-create-branch-post.test.ts
@@ -3,7 +3,7 @@ import { Installation } from "models/installation";
 import { Subscription } from "models/subscription";
 import { GithubCreateBranchPost } from "./github-create-branch-post";
 import { getLogger } from "config/logger";
-import { mocked } from "ts-jest/utils";
+import { mocked } from "jest-mock";
 
 jest.mock("models/subscription");
 
diff --git a/src/routes/jira/events/jira-events-install-post.test.ts b/src/routes/jira/events/jira-events-install-post.test.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { JiraEventsInstallPost } from "./jira-events-install-post";
-import { mocked } from "ts-jest/utils";
+import { mocked } from "jest-mock";
 import { Installation } from "models/installation";
 
 jest.mock("models/installation");
diff --git a/src/routes/jira/jira-delete.test.ts b/src/routes/jira/jira-delete.test.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { Installation } from "models/installation";
 import { Subscription } from "models/subscription";
-import { mocked } from "ts-jest/utils";
+import { mocked } from "jest-mock";
 import { JiraDelete } from "./jira-delete";
 import { getLogger } from "config/logger";
 import { when } from "jest-when";
diff --git a/src/transforms/transform-code-scanning-alert.test.ts b/src/transforms/transform-code-scanning-alert.test.ts
@@ -320,12 +320,12 @@ describe("code_scanning_alert transform", () => {
 				jiraHost
 			);
 			expect(result?.vulnerabilities[0].identifiers).toMatchInlineSnapshot(`
-			Array [
-			  Object {
+			[
+			  {
 			    "displayName": "CWE-79",
 			    "url": "https://cwe.mitre.org/cgi-bin/jumpmenu.cgi?id=79",
 			  },
-			  Object {
+			  {
 			    "displayName": "CWE-116",
 			    "url": "https://cwe.mitre.org/cgi-bin/jumpmenu.cgi?id=116",
 			  },
diff --git a/src/util/jira-utils.test.ts b/src/util/jira-utils.test.ts
@@ -6,7 +6,7 @@ import {
 	isGitHubCloudApp,
 	jiraIssueKeyParser
 } from "./jira-utils";
-import { mocked } from "ts-jest/utils";
+import { mocked } from "jest-mock";
 import { GitHubServerApp } from "models/github-server-app";
 
 jest.mock("models/github-server-app");
diff --git a/test/snapshots/jira/client/jira-client.test.ts.snap b/test/snapshots/jira/client/jira-client.test.ts.snap
@@ -1,28 +1,28 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Test getting a jira client Installation exists 1`] = `
-Object {
+{
   "baseURL": "https://test-atlassian-instance.atlassian.net",
-  "deployment": Object {
+  "deployment": {
     "submit": [Function],
   },
-  "devinfo": Object {
-    "branch": Object {
+  "devinfo": {
+    "branch": {
       "delete": [Function],
     },
-    "installation": Object {
+    "installation": {
       "delete": [Function],
     },
-    "pullRequest": Object {
+    "pullRequest": {
       "delete": [Function],
     },
-    "repository": Object {
+    "repository": {
       "delete": [Function],
       "update": [Function],
     },
   },
-  "issues": Object {
-    "comments": Object {
+  "issues": {
+    "comments": {
       "addForIssue": [Function],
       "deleteForIssue": [Function],
       "list": [Function],
@@ -31,21 +31,21 @@ Object {
     "get": [Function],
     "getAll": [Function],
     "parse": [Function],
-    "transitions": Object {
+    "transitions": {
       "getForIssue": [Function],
       "updateForIssue": [Function],
     },
-    "worklogs": Object {
+    "worklogs": {
       "addForIssue": [Function],
     },
   },
-  "remoteLink": Object {
+  "remoteLink": {
     "submit": [Function],
   },
-  "security": Object {
+  "security": {
     "submitVulnerabilities": [Function],
   },
-  "workflow": Object {
+  "workflow": {
     "submit": [Function],
   },
 }
diff --git a/test/snapshots/routes/api/api-router.test.ts.snap b/test/snapshots/routes/api/api-router.test.ts.snap
diff --git a/test/snapshots/routes/github/subscription/github-subscription-delete.test.ts.snap b/test/snapshots/routes/github/subscription/github-subscription-delete.test.ts.snap
diff --git a/test/snapshots/routes/jira/atlassian-connect/jira-atlassian-connect-get.test.ts.snap b/test/snapshots/routes/jira/atlassian-connect/jira-atlassian-connect-get.test.ts.snap
diff --git a/test/snapshots/routes/maintenance/maintenance-router.test.ts.snap b/test/snapshots/routes/maintenance/maintenance-router.test.ts.snap
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM node:14.21-alpine3.16 as build`
	`1`	`+FROM node:18-alpine3.18 as build`
`2`	`2`
`3`	`3`	`# adding python for node-gyp`
`4`	`4`	`RUN apk add g++ make python3`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@`
`4`	`4`	`"^.+\\.tsx?$": "ts-jest"`
`5`	`5`	`},`
`6`	`6`	`"setupFilesAfterEnv": [`
`7`		`- "@testing-library/jest-dom/extend-expect"`
	`7`	`+ "./setup.ts"`
`8`	`8`	`]`
`9`	`9`	`}`