Skip to content

Commit 221958b

Browse files
npalmnpalm
authored
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
1 parent 08be669 commit 221958b

File tree

14 files changed

+12254
-8354
lines changed

14 files changed

+12254
-8354
lines changed

‎.github/dependabot.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,10 @@ updates:
3434
update-types: ["version-update:semver-major"]
3535
- dependency-name: "@middy/core"
3636
update-types: ["version-update:semver-major"]
37-
- dependency-name: "@@octokit/*"
37+
- dependency-name: "@octokit/*"
3838
update-types: ["version-update:semver-major"]
39-
- dependency-name: "@@octokit/rest"
39+
- dependency-name: "@octokit/rest"
40+
- dependency-name: "@octokit/auth-app"
4041
- dependency-name: "eslint"
4142
update-types: ["version-update:semver-major"]
4243
commit-message:

‎lambdas/.gitignore‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,13 @@ dist/
88
!/yarn.lock
99

1010

11-
.nx/cache
11+
.nx/cache
12+
.nx/workspace-data
13+
14+
.pnp.*
15+
.yarn/*
16+
!.yarn/patches
17+
!.yarn/plugins
18+
!.yarn/releases
19+
!.yarn/sdks
20+
!.yarn/versions

‎lambdas/.yarn/releases/yarn-4.3.1.cjs‎

Lines changed: 894 additions & 0 deletions
Large diffs are not rendered by default.

‎lambdas/.yarnrc.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
nodeLinker: node-modules
2+
3+
yarnPath: .yarn/releases/yarn-4.3.1.cjs

‎lambdas/functions/ami-housekeeper/package.json‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -16,34 +16,34 @@
1616
"all": "yarn build && yarn format && yarn lint && yarn test"
1717
},
1818
"devDependencies": {
19-
"@trivago/prettier-plugin-sort-imports": "^4.2.1",
20-
"@types/aws-lambda": "^8.10.137",
19+
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
20+
"@types/aws-lambda": "^8.10.142",
2121
"@types/jest": "^29.5.12",
22-
"@types/node": "^20.8.9",
23-
"@typescript-eslint/eslint-plugin": "^7.16.0",
24-
"@typescript-eslint/parser": "^7.9.0",
22+
"@types/node": "^22.0.0",
23+
"@typescript-eslint/eslint-plugin": "^7.18.0",
24+
"@typescript-eslint/parser": "^7.18.0",
2525
"@vercel/ncc": "^0.38.1",
26-
"aws-sdk-client-mock": "^3.0.0",
27-
"aws-sdk-client-mock-jest": "^3.0.0",
28-
"eslint": "^8.56.0",
29-
"eslint-plugin-prettier": "5.1.3",
30-
"jest": "^29.5",
31-
"jest-mock": "^29.5.0",
32-
"jest-mock-extended": "^3.0.6",
33-
"nock": "^13.4.0",
34-
"prettier": "3.3.2",
35-
"ts-jest": "^29.1.0",
36-
"ts-node": "^10.9.1",
26+
"aws-sdk-client-mock": "^3.1.0",
27+
"aws-sdk-client-mock-jest": "^3.1.0",
28+
"eslint": "^8.57.0",
29+
"eslint-plugin-prettier": "5.2.1",
30+
"jest": "^29.7.0",
31+
"jest-mock": "^29.7.0",
32+
"jest-mock-extended": "^3.0.7",
33+
"nock": "^13.5.4",
34+
"prettier": "3.3.3",
35+
"ts-jest": "^29.2.3",
36+
"ts-node": "^10.9.2",
3737
"ts-node-dev": "^2.0.0"
3838
},
3939
"dependencies": {
40-
"@aws-sdk/client-ec2": "^3.620.1",
41-
"@aws-sdk/client-ssm": "^3.620.1",
42-
"@aws-sdk/types": "^3.433.0",
40+
"@aws-sdk/client-ec2": "^3.621.0",
41+
"@aws-sdk/client-ssm": "^3.621.0",
42+
"@aws-sdk/types": "^3.609.0",
4343
"@terraform-aws-github-runner/aws-powertools-util": "*",
4444
"@terraform-aws-github-runner/aws-ssm-util": "*",
45-
"cron-parser": "^4.8.1",
46-
"typescript": "^5.4.5"
45+
"cron-parser": "^4.9.0",
46+
"typescript": "^5.5.4"
4747
},
4848
"nx": {
4949
"includedScripts": [

‎lambdas/functions/control-plane/package.json‎

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -16,40 +16,41 @@
1616
"all": "yarn build && yarn format && yarn lint && yarn test"
1717
},
1818
"devDependencies": {
19-
"@trivago/prettier-plugin-sort-imports": "^4.2.1",
20-
"@types/aws-lambda": "^8.10.137",
19+
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
20+
"@types/aws-lambda": "^8.10.142",
2121
"@types/jest": "^29.5.12",
22-
"@types/node": "^20.8.9",
23-
"@typescript-eslint/eslint-plugin": "^7.16.0",
24-
"@typescript-eslint/parser": "^7.9.0",
22+
"@types/node": "^22.0.0",
23+
"@typescript-eslint/eslint-plugin": "^7.18.0",
24+
"@typescript-eslint/parser": "^7.18.0",
2525
"@vercel/ncc": "^0.38.1",
26-
"aws-sdk-client-mock": "^3.0.0",
27-
"aws-sdk-client-mock-jest": "^3.0.0",
28-
"eslint": "^8.56.0",
29-
"eslint-plugin-prettier": "5.1.3",
30-
"jest": "^29.5",
31-
"jest-mock": "^29.5.0",
32-
"jest-mock-extended": "^3.0.6",
26+
"aws-sdk-client-mock": "^3.1.0",
27+
"aws-sdk-client-mock-jest": "^3.1.0",
28+
"eslint": "^8.57.0",
29+
"eslint-plugin-prettier": "5.2.1",
30+
"jest": "^29.7.0",
31+
"jest-mock": "^29.7.0",
32+
"jest-mock-extended": "^3.0.7",
3333
"moment-timezone": "^0.5.45",
34-
"nock": "^13.4.0",
35-
"prettier": "3.3.2",
36-
"ts-jest": "^29.1.0",
37-
"ts-node": "^10.9.1",
34+
"nock": "^13.5.4",
35+
"prettier": "3.3.3",
36+
"ts-jest": "^29.2.3",
37+
"ts-node": "^10.9.2",
3838
"ts-node-dev": "^2.0.0"
3939
},
4040
"dependencies": {
41-
"@aws-sdk/client-ec2": "^3.620.1",
42-
"@aws-sdk/types": "^3.433.0",
41+
"@aws-sdk/client-ec2": "^3.621.0",
42+
"@aws-sdk/types": "^3.609.0",
4343
"@middy/core": "^4.7.0",
4444
"@octokit/auth-app": "6.0.3",
45-
"@octokit/plugin-throttling": "8.1.3",
45+
"@octokit/core": "5.2.0",
46+
"@octokit/plugin-throttling": "8.2.0",
4647
"@octokit/rest": "20.0.2",
4748
"@octokit/types": "^13.5.0",
4849
"@terraform-aws-github-runner/aws-powertools-util": "*",
4950
"@terraform-aws-github-runner/aws-ssm-util": "*",
50-
"axios": "^1.6.8",
51-
"cron-parser": "^4.8.1",
52-
"typescript": "^5.4.5"
51+
"axios": "^1.7.2",
52+
"cron-parser": "^4.9.0",
53+
"typescript": "^5.5.4"
5354
},
5455
"nx": {
5556
"includedScripts": [

‎lambdas/functions/control-plane/src/gh-auth/gh-auth.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ export async function createOctoClient(token: string, ghesApiUrl = ''): Promise<
3232
return new CustomOctokit({
3333
...ocktokitOptions,
3434
throttle: {
35-
onRateLimit: (retryAfter, options) => {
35+
onRateLimit: (options: { method: string; url: string }) => {
3636
logger.warn(
3737
`GitHub rate limit: Request quota exhausted for request ${options.method} ${options.url}. Requested `,
3838
);
3939
},
40-
onSecondaryRateLimit: (retryAfter, options) => {
40+
onSecondaryRateLimit: (options: { method: string; url: string }) => {
4141
logger.warn(`GitHub rate limit: SecondaryRateLimit detected for request ${options.method} ${options.url}`);
4242
},
4343
},

‎lambdas/functions/gh-agent-syncer/package.json‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,33 +16,33 @@
1616
"all": "yarn build && yarn format && yarn lint && yarn test"
1717
},
1818
"devDependencies": {
19-
"@octokit/rest": "^20.0.1",
20-
"@trivago/prettier-plugin-sort-imports": "^4.2.1",
21-
"@types/aws-lambda": "^8.10.137",
19+
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
20+
"@types/aws-lambda": "^8.10.142",
2221
"@types/jest": "^29.5.12",
23-
"@types/node": "^20.8.9",
24-
"@types/request": "^2.48.11",
25-
"@typescript-eslint/eslint-plugin": "^7.16.0",
26-
"@typescript-eslint/parser": "^7.9.0",
22+
"@types/node": "^22.0.0",
23+
"@types/request": "^2.48.12",
24+
"@typescript-eslint/eslint-plugin": "^7.18.0",
25+
"@typescript-eslint/parser": "^7.18.0",
2726
"@vercel/ncc": "^0.38.1",
28-
"aws-sdk-client-mock": "^3.0.0",
29-
"aws-sdk-client-mock-jest": "^3.0.0",
30-
"eslint": "^8.56.0",
31-
"eslint-plugin-prettier": "5.1.3",
32-
"jest": "^29.5",
33-
"jest-mock": "^29.5.0",
34-
"prettier": "3.3.2",
35-
"ts-jest": "^29.1.0",
27+
"aws-sdk-client-mock": "^3.1.0",
28+
"aws-sdk-client-mock-jest": "^3.1.0",
29+
"eslint": "^8.57.0",
30+
"eslint-plugin-prettier": "5.2.1",
31+
"jest": "^29.7.0",
32+
"jest-mock": "^29.7.0",
33+
"prettier": "3.3.3",
34+
"ts-jest": "^29.2.3",
3635
"ts-node-dev": "^2.0.0",
37-
"typescript": "^5.4.5"
36+
"typescript": "^5.5.4"
3837
},
3938
"dependencies": {
40-
"@aws-sdk/client-s3": "^3.620.1",
41-
"@aws-sdk/lib-storage": "^3.620.1",
42-
"@aws-sdk/types": "^3.433.0",
39+
"@aws-sdk/client-s3": "^3.621.0",
40+
"@aws-sdk/lib-storage": "^3.621.0",
41+
"@aws-sdk/types": "^3.609.0",
4342
"@middy/core": "^4.7.0",
43+
"@octokit/rest": "20.0.2",
4444
"@terraform-aws-github-runner/aws-powertools-util": "*",
45-
"axios": "^1.6.8"
45+
"axios": "^1.7.2"
4646
},
4747
"nx": {
4848
"includedScripts": [

‎lambdas/functions/termination-watcher/package.json‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,32 +14,32 @@
1414
"all": "yarn build && yarn format && yarn lint && yarn test"
1515
},
1616
"devDependencies": {
17-
"@trivago/prettier-plugin-sort-imports": "^4.2.1",
18-
"@types/aws-lambda": "^8.10.137",
19-
"@types/jest": "^29.5.6",
20-
"@types/node": "^20.8.9",
21-
"@typescript-eslint/eslint-plugin": "^7.16.0",
22-
"@typescript-eslint/parser": "^7.9.0",
17+
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
18+
"@types/aws-lambda": "^8.10.142",
19+
"@types/jest": "^29.5.12",
20+
"@types/node": "^22.0.0",
21+
"@typescript-eslint/eslint-plugin": "^7.18.0",
22+
"@typescript-eslint/parser": "^7.18.0",
2323
"@vercel/ncc": "^0.38.1",
24-
"aws-sdk-client-mock": "^3.0.0",
25-
"aws-sdk-client-mock-jest": "^3.0.0",
26-
"eslint": "^8.56.0",
27-
"eslint-plugin-prettier": "5.1.3",
28-
"jest": "^29.5",
29-
"jest-mock": "^29.5.0",
30-
"jest-mock-extended": "^3.0.6",
31-
"nock": "^13.4.0",
32-
"prettier": "3.3.2",
33-
"ts-jest": "^29.1.0",
34-
"ts-node": "^10.9.1",
24+
"aws-sdk-client-mock": "^3.1.0",
25+
"aws-sdk-client-mock-jest": "^3.1.0",
26+
"eslint": "^8.57.0",
27+
"eslint-plugin-prettier": "5.2.1",
28+
"jest": "^29.7.0",
29+
"jest-mock": "^29.7.0",
30+
"jest-mock-extended": "^3.0.7",
31+
"nock": "^13.5.4",
32+
"prettier": "3.3.3",
33+
"ts-jest": "^29.2.3",
34+
"ts-node": "^10.9.2",
3535
"ts-node-dev": "^2.0.0"
3636
},
3737
"dependencies": {
38-
"@aws-sdk/client-ec2": "^3.620.1",
39-
"@aws-sdk/types": "^3.433.0",
38+
"@aws-sdk/client-ec2": "^3.621.0",
39+
"@aws-sdk/types": "^3.609.0",
4040
"@middy/core": "^4.7.0",
4141
"@terraform-aws-github-runner/aws-powertools-util": "*",
42-
"typescript": "^5.4.5"
42+
"typescript": "^5.5.4"
4343
},
4444
"nx": {
4545
"includedScripts": [

‎lambdas/functions/webhook/package.json‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,33 +16,32 @@
1616
"all": "yarn build && yarn format && yarn lint && yarn test"
1717
},
1818
"devDependencies": {
19-
"@octokit/webhooks-definitions": "^3.67.3",
20-
"@trivago/prettier-plugin-sort-imports": "^4.2.1",
21-
"@types/aws-lambda": "^8.10.137",
19+
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
20+
"@types/aws-lambda": "^8.10.142",
2221
"@types/express": "^4.17.21",
2322
"@types/jest": "^29.5.12",
24-
"@types/node": "^20.8.9",
25-
"@typescript-eslint/eslint-plugin": "^7.16.0",
26-
"@typescript-eslint/parser": "^7.9.0",
23+
"@types/node": "^22.0.0",
24+
"@typescript-eslint/eslint-plugin": "^7.18.0",
25+
"@typescript-eslint/parser": "^7.18.0",
2726
"@vercel/ncc": "0.38.1",
2827
"body-parser": "^1.20.2",
29-
"eslint": "^8.56.0",
30-
"eslint-plugin-prettier": "5.1.3",
28+
"eslint": "^8.57.0",
29+
"eslint-plugin-prettier": "5.2.1",
3130
"express": "^4.19.2",
32-
"jest": "^29.5",
33-
"jest-mock": "^29.5.0",
34-
"nock": "^13.4.0",
35-
"prettier": "3.3.2",
36-
"ts-jest": "^29.1.0",
31+
"jest": "^29.7.0",
32+
"jest-mock": "^29.7.0",
33+
"nock": "^13.5.4",
34+
"prettier": "3.3.3",
35+
"ts-jest": "^29.2.3",
3736
"ts-node-dev": "^2.0.0",
38-
"typescript": "^5.4.5"
37+
"typescript": "^5.5.4"
3938
},
4039
"dependencies": {
41-
"@aws-sdk/client-sqs": "^3.620.1",
40+
"@aws-sdk/client-sqs": "^3.621.0",
4241
"@middy/core": "^4.7.0",
43-
"@octokit/rest": "^20.0.1",
42+
"@octokit/rest": "20.0.2",
4443
"@octokit/types": "^13.5.0",
45-
"@octokit/webhooks": "^12.1.2",
44+
"@octokit/webhooks": "^12.2.0",
4645
"@terraform-aws-github-runner/aws-powertools-util": "*",
4746
"@terraform-aws-github-runner/aws-ssm-util": "*",
4847
"aws-lambda": "^1.0.7"

0 commit comments

Comments
 (0)