fix: bump node dependencies and cleanup (#4020)

- migrate to yarn4 - fix duplicate dependencies in lock file - upgrade all possible upgrade - octokit/rest and octokit/auth-app both break updates see #3966 Tested with deployment of multi runner example
philips-labs · Aug 1, 2024 · 221958b · 221958b
1 parent 08be669
commit 221958b
Show file tree

Hide file tree

Showing 14 changed files with 12,254 additions and 8,354 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -34,9 +34,10 @@ updates:
         update-types: ["version-update:semver-major"]
       - dependency-name: "@middy/core"
         update-types: ["version-update:semver-major"]
-      - dependency-name: "@@octokit/*"
+      - dependency-name: "@octokit/*"
         update-types: ["version-update:semver-major"]
-      - dependency-name: "@@octokit/rest"
+      - dependency-name: "@octokit/rest"
+      - dependency-name: "@octokit/auth-app"
       - dependency-name: "eslint"
         update-types: ["version-update:semver-major"]
     commit-message:

diff --git a/lambdas/.gitignore b/lambdas/.gitignore
@@ -8,4 +8,13 @@ dist/
 !/yarn.lock
 
 
-.nx/cache
+.nx/cache
+.nx/workspace-data
+
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
diff --git a/lambdas/.yarn/releases/yarn-4.3.1.cjs b/lambdas/.yarn/releases/yarn-4.3.1.cjs
diff --git a/lambdas/.yarnrc.yml b/lambdas/.yarnrc.yml
@@ -0,0 +1,3 @@
+nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-4.3.1.cjs
diff --git a/lambdas/functions/ami-housekeeper/package.json b/lambdas/functions/ami-housekeeper/package.json
@@ -16,34 +16,34 @@
     "all": "yarn build && yarn format && yarn lint && yarn test"
   },
   "devDependencies": {
-    "@trivago/prettier-plugin-sort-imports": "^4.2.1",
-    "@types/aws-lambda": "^8.10.137",
+    "@trivago/prettier-plugin-sort-imports": "^4.3.0",
+    "@types/aws-lambda": "^8.10.142",
     "@types/jest": "^29.5.12",
-    "@types/node": "^20.8.9",
-    "@typescript-eslint/eslint-plugin": "^7.16.0",
-    "@typescript-eslint/parser": "^7.9.0",
+    "@types/node": "^22.0.0",
+    "@typescript-eslint/eslint-plugin": "^7.18.0",
+    "@typescript-eslint/parser": "^7.18.0",
     "@vercel/ncc": "^0.38.1",
-    "aws-sdk-client-mock": "^3.0.0",
-    "aws-sdk-client-mock-jest": "^3.0.0",
-    "eslint": "^8.56.0",
-    "eslint-plugin-prettier": "5.1.3",
-    "jest": "^29.5",
-    "jest-mock": "^29.5.0",
-    "jest-mock-extended": "^3.0.6",
-    "nock": "^13.4.0",
-    "prettier": "3.3.2",
-    "ts-jest": "^29.1.0",
-    "ts-node": "^10.9.1",
+    "aws-sdk-client-mock": "^3.1.0",
+    "aws-sdk-client-mock-jest": "^3.1.0",
+    "eslint": "^8.57.0",
+    "eslint-plugin-prettier": "5.2.1",
+    "jest": "^29.7.0",
+    "jest-mock": "^29.7.0",
+    "jest-mock-extended": "^3.0.7",
+    "nock": "^13.5.4",
+    "prettier": "3.3.3",
+    "ts-jest": "^29.2.3",
+    "ts-node": "^10.9.2",
     "ts-node-dev": "^2.0.0"
   },
   "dependencies": {
-    "@aws-sdk/client-ec2": "^3.620.1",
-    "@aws-sdk/client-ssm": "^3.620.1",
-    "@aws-sdk/types": "^3.433.0",
+    "@aws-sdk/client-ec2": "^3.621.0",
+    "@aws-sdk/client-ssm": "^3.621.0",
+    "@aws-sdk/types": "^3.609.0",
     "@terraform-aws-github-runner/aws-powertools-util": "*",
     "@terraform-aws-github-runner/aws-ssm-util": "*",
-    "cron-parser": "^4.8.1",
-    "typescript": "^5.4.5"
+    "cron-parser": "^4.9.0",
+    "typescript": "^5.5.4"
   },
   "nx": {
     "includedScripts": [

diff --git a/lambdas/functions/control-plane/package.json b/lambdas/functions/control-plane/package.json
@@ -16,40 +16,41 @@
     "all": "yarn build && yarn format && yarn lint && yarn test"
   },
   "devDependencies": {
-    "@trivago/prettier-plugin-sort-imports": "^4.2.1",
-    "@types/aws-lambda": "^8.10.137",
+    "@trivago/prettier-plugin-sort-imports": "^4.3.0",
+    "@types/aws-lambda": "^8.10.142",
     "@types/jest": "^29.5.12",
-    "@types/node": "^20.8.9",
-    "@typescript-eslint/eslint-plugin": "^7.16.0",
-    "@typescript-eslint/parser": "^7.9.0",
+    "@types/node": "^22.0.0",
+    "@typescript-eslint/eslint-plugin": "^7.18.0",
+    "@typescript-eslint/parser": "^7.18.0",
     "@vercel/ncc": "^0.38.1",
-    "aws-sdk-client-mock": "^3.0.0",
-    "aws-sdk-client-mock-jest": "^3.0.0",
-    "eslint": "^8.56.0",
-    "eslint-plugin-prettier": "5.1.3",
-    "jest": "^29.5",
-    "jest-mock": "^29.5.0",
-    "jest-mock-extended": "^3.0.6",
+    "aws-sdk-client-mock": "^3.1.0",
+    "aws-sdk-client-mock-jest": "^3.1.0",
+    "eslint": "^8.57.0",
+    "eslint-plugin-prettier": "5.2.1",
+    "jest": "^29.7.0",
+    "jest-mock": "^29.7.0",
+    "jest-mock-extended": "^3.0.7",
     "moment-timezone": "^0.5.45",
-    "nock": "^13.4.0",
-    "prettier": "3.3.2",
-    "ts-jest": "^29.1.0",
-    "ts-node": "^10.9.1",
+    "nock": "^13.5.4",
+    "prettier": "3.3.3",
+    "ts-jest": "^29.2.3",
+    "ts-node": "^10.9.2",
     "ts-node-dev": "^2.0.0"
   },
   "dependencies": {
-    "@aws-sdk/client-ec2": "^3.620.1",
-    "@aws-sdk/types": "^3.433.0",
+    "@aws-sdk/client-ec2": "^3.621.0",
+    "@aws-sdk/types": "^3.609.0",
     "@middy/core": "^4.7.0",
     "@octokit/auth-app": "6.0.3",
-    "@octokit/plugin-throttling": "8.1.3",
+    "@octokit/core": "5.2.0",
+    "@octokit/plugin-throttling": "8.2.0",
     "@octokit/rest": "20.0.2",
     "@octokit/types": "^13.5.0",
     "@terraform-aws-github-runner/aws-powertools-util": "*",
     "@terraform-aws-github-runner/aws-ssm-util": "*",
-    "axios": "^1.6.8",
-    "cron-parser": "^4.8.1",
-    "typescript": "^5.4.5"
+    "axios": "^1.7.2",
+    "cron-parser": "^4.9.0",
+    "typescript": "^5.5.4"
   },
   "nx": {
     "includedScripts": [

diff --git a/lambdas/functions/control-plane/src/gh-auth/gh-auth.ts b/lambdas/functions/control-plane/src/gh-auth/gh-auth.ts
@@ -32,12 +32,12 @@ export async function createOctoClient(token: string, ghesApiUrl = ''): Promise<
   return new CustomOctokit({
     ...ocktokitOptions,
     throttle: {
-      onRateLimit: (retryAfter, options) => {
+      onRateLimit: (options: { method: string; url: string }) => {
         logger.warn(
           `GitHub rate limit: Request quota exhausted for request ${options.method} ${options.url}. Requested `,
         );
       },
-      onSecondaryRateLimit: (retryAfter, options) => {
+      onSecondaryRateLimit: (options: { method: string; url: string }) => {
         logger.warn(`GitHub rate limit: SecondaryRateLimit detected for request ${options.method} ${options.url}`);
       },
     },

diff --git a/lambdas/functions/gh-agent-syncer/package.json b/lambdas/functions/gh-agent-syncer/package.json
@@ -16,33 +16,33 @@
     "all": "yarn build && yarn format && yarn lint && yarn test"
   },
   "devDependencies": {
-    "@octokit/rest": "^20.0.1",
-    "@trivago/prettier-plugin-sort-imports": "^4.2.1",
-    "@types/aws-lambda": "^8.10.137",
+    "@trivago/prettier-plugin-sort-imports": "^4.3.0",
+    "@types/aws-lambda": "^8.10.142",
     "@types/jest": "^29.5.12",
-    "@types/node": "^20.8.9",
-    "@types/request": "^2.48.11",
-    "@typescript-eslint/eslint-plugin": "^7.16.0",
-    "@typescript-eslint/parser": "^7.9.0",
+    "@types/node": "^22.0.0",
+    "@types/request": "^2.48.12",
+    "@typescript-eslint/eslint-plugin": "^7.18.0",
+    "@typescript-eslint/parser": "^7.18.0",
     "@vercel/ncc": "^0.38.1",
-    "aws-sdk-client-mock": "^3.0.0",
-    "aws-sdk-client-mock-jest": "^3.0.0",
-    "eslint": "^8.56.0",
-    "eslint-plugin-prettier": "5.1.3",
-    "jest": "^29.5",
-    "jest-mock": "^29.5.0",
-    "prettier": "3.3.2",
-    "ts-jest": "^29.1.0",
+    "aws-sdk-client-mock": "^3.1.0",
+    "aws-sdk-client-mock-jest": "^3.1.0",
+    "eslint": "^8.57.0",
+    "eslint-plugin-prettier": "5.2.1",
+    "jest": "^29.7.0",
+    "jest-mock": "^29.7.0",
+    "prettier": "3.3.3",
+    "ts-jest": "^29.2.3",
     "ts-node-dev": "^2.0.0",
-    "typescript": "^5.4.5"
+    "typescript": "^5.5.4"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.620.1",
-    "@aws-sdk/lib-storage": "^3.620.1",
-    "@aws-sdk/types": "^3.433.0",
+    "@aws-sdk/client-s3": "^3.621.0",
+    "@aws-sdk/lib-storage": "^3.621.0",
+    "@aws-sdk/types": "^3.609.0",
     "@middy/core": "^4.7.0",
+    "@octokit/rest": "20.0.2",
     "@terraform-aws-github-runner/aws-powertools-util": "*",
-    "axios": "^1.6.8"
+    "axios": "^1.7.2"
   },
   "nx": {
     "includedScripts": [

diff --git a/lambdas/functions/termination-watcher/package.json b/lambdas/functions/termination-watcher/package.json
@@ -14,32 +14,32 @@
     "all": "yarn build && yarn format && yarn lint && yarn test"
   },
   "devDependencies": {
-    "@trivago/prettier-plugin-sort-imports": "^4.2.1",
-    "@types/aws-lambda": "^8.10.137",
-    "@types/jest": "^29.5.6",
-    "@types/node": "^20.8.9",
-    "@typescript-eslint/eslint-plugin": "^7.16.0",
-    "@typescript-eslint/parser": "^7.9.0",
+    "@trivago/prettier-plugin-sort-imports": "^4.3.0",
+    "@types/aws-lambda": "^8.10.142",
+    "@types/jest": "^29.5.12",
+    "@types/node": "^22.0.0",
+    "@typescript-eslint/eslint-plugin": "^7.18.0",
+    "@typescript-eslint/parser": "^7.18.0",
     "@vercel/ncc": "^0.38.1",
-    "aws-sdk-client-mock": "^3.0.0",
-    "aws-sdk-client-mock-jest": "^3.0.0",
-    "eslint": "^8.56.0",
-    "eslint-plugin-prettier": "5.1.3",
-    "jest": "^29.5",
-    "jest-mock": "^29.5.0",
-    "jest-mock-extended": "^3.0.6",
-    "nock": "^13.4.0",
-    "prettier": "3.3.2",
-    "ts-jest": "^29.1.0",
-    "ts-node": "^10.9.1",
+    "aws-sdk-client-mock": "^3.1.0",
+    "aws-sdk-client-mock-jest": "^3.1.0",
+    "eslint": "^8.57.0",
+    "eslint-plugin-prettier": "5.2.1",
+    "jest": "^29.7.0",
+    "jest-mock": "^29.7.0",
+    "jest-mock-extended": "^3.0.7",
+    "nock": "^13.5.4",
+    "prettier": "3.3.3",
+    "ts-jest": "^29.2.3",
+    "ts-node": "^10.9.2",
     "ts-node-dev": "^2.0.0"
   },
   "dependencies": {
-    "@aws-sdk/client-ec2": "^3.620.1",
-    "@aws-sdk/types": "^3.433.0",
+    "@aws-sdk/client-ec2": "^3.621.0",
+    "@aws-sdk/types": "^3.609.0",
     "@middy/core": "^4.7.0",
     "@terraform-aws-github-runner/aws-powertools-util": "*",
-    "typescript": "^5.4.5"
+    "typescript": "^5.5.4"
   },
   "nx": {
     "includedScripts": [

diff --git a/lambdas/functions/webhook/package.json b/lambdas/functions/webhook/package.json
@@ -16,33 +16,32 @@
     "all": "yarn build && yarn format && yarn lint && yarn test"
   },
   "devDependencies": {
-    "@octokit/webhooks-definitions": "^3.67.3",
-    "@trivago/prettier-plugin-sort-imports": "^4.2.1",
-    "@types/aws-lambda": "^8.10.137",
+    "@trivago/prettier-plugin-sort-imports": "^4.3.0",
+    "@types/aws-lambda": "^8.10.142",
     "@types/express": "^4.17.21",
     "@types/jest": "^29.5.12",
-    "@types/node": "^20.8.9",
-    "@typescript-eslint/eslint-plugin": "^7.16.0",
-    "@typescript-eslint/parser": "^7.9.0",
+    "@types/node": "^22.0.0",
+    "@typescript-eslint/eslint-plugin": "^7.18.0",
+    "@typescript-eslint/parser": "^7.18.0",
     "@vercel/ncc": "0.38.1",
     "body-parser": "^1.20.2",
-    "eslint": "^8.56.0",
-    "eslint-plugin-prettier": "5.1.3",
+    "eslint": "^8.57.0",
+    "eslint-plugin-prettier": "5.2.1",
     "express": "^4.19.2",
-    "jest": "^29.5",
-    "jest-mock": "^29.5.0",
-    "nock": "^13.4.0",
-    "prettier": "3.3.2",
-    "ts-jest": "^29.1.0",
+    "jest": "^29.7.0",
+    "jest-mock": "^29.7.0",
+    "nock": "^13.5.4",
+    "prettier": "3.3.3",
+    "ts-jest": "^29.2.3",
     "ts-node-dev": "^2.0.0",
-    "typescript": "^5.4.5"
+    "typescript": "^5.5.4"
   },
   "dependencies": {
-    "@aws-sdk/client-sqs": "^3.620.1",
+    "@aws-sdk/client-sqs": "^3.621.0",
     "@middy/core": "^4.7.0",
-    "@octokit/rest": "^20.0.1",
+    "@octokit/rest": "20.0.2",
     "@octokit/types": "^13.5.0",
-    "@octokit/webhooks": "^12.1.2",
+    "@octokit/webhooks": "^12.2.0",
     "@terraform-aws-github-runner/aws-powertools-util": "*",
     "@terraform-aws-github-runner/aws-ssm-util": "*",
     "aws-lambda": "^1.0.7"

diff --git a/lambdas/libs/aws-powertools-util/package.json b/lambdas/libs/aws-powertools-util/package.json
@@ -14,31 +14,30 @@
     "all": "yarn build && yarn format && yarn lint && yarn test"
   },
   "devDependencies": {
-    "@octokit/webhooks-definitions": "^3.67.3",
-    "@trivago/prettier-plugin-sort-imports": "^4.2.1",
-    "@types/aws-lambda": "^8.10.137",
+    "@trivago/prettier-plugin-sort-imports": "^4.3.0",
+    "@types/aws-lambda": "^8.10.142",
     "@types/express": "^4.17.21",
     "@types/jest": "^29.5.12",
-    "@types/node": "^20.8.9",
-    "@typescript-eslint/eslint-plugin": "^7.16.0",
-    "@typescript-eslint/parser": "^7.9.0",
+    "@types/node": "^22.0.0",
+    "@typescript-eslint/eslint-plugin": "^7.18.0",
+    "@typescript-eslint/parser": "^7.18.0",
     "@vercel/ncc": "0.38.1",
     "body-parser": "^1.20.2",
-    "eslint": "^8.56.0",
-    "eslint-plugin-prettier": "5.1.3",
+    "eslint": "^8.57.0",
+    "eslint-plugin-prettier": "5.2.1",
     "express": "^4.19.2",
-    "jest": "^29.5",
-    "jest-mock": "^29.5.0",
-    "nock": "^13.4.0",
-    "prettier": "3.3.2",
-    "ts-jest": "^29.1.0",
+    "jest": "^29.7.0",
+    "jest-mock": "^29.7.0",
+    "nock": "^13.5.4",
+    "prettier": "3.3.3",
+    "ts-jest": "^29.2.3",
     "ts-node-dev": "^2.0.0",
-    "typescript": "^5.4.5"
+    "typescript": "^5.5.4"
   },
   "dependencies": {
-    "@aws-lambda-powertools/logger": "^1.17.0",
+    "@aws-lambda-powertools/logger": "^1.18.1",
     "@aws-lambda-powertools/metrics": "^1.18.1",
-    "@aws-lambda-powertools/tracer": "^1.14.0",
+    "@aws-lambda-powertools/tracer": "^1.18.1",
     "aws-lambda": "^1.0.7"
   },
   "nx": {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		nodeLinker: node-modules

		yarnPath: .yarn/releases/yarn-4.3.1.cjs