From c0b83a8c58b923720ffa218e8dfb0352c242a309 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 5 Mar 2025 08:08:15 +0000 Subject: [PATCH 1/3] fix(lambda): bump cron-parser from 4.9.0 to 5.0.4 in /lambdas Bumps [cron-parser](https://github.com/harrisiirak/cron-parser) from 4.9.0 to 5.0.4. - [Release notes](https://github.com/harrisiirak/cron-parser/releases) - [Commits](https://github.com/harrisiirak/cron-parser/compare/4.9.0...v5.0.4) --- updated-dependencies: - dependency-name: cron-parser dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../functions/ami-housekeeper/package.json | 2 +- lambdas/functions/control-plane/package.json | 2 +- lambdas/yarn.lock | 38 +++++++++++++------ 3 files changed, 29 insertions(+), 13 deletions(-) diff --git a/lambdas/functions/ami-housekeeper/package.json b/lambdas/functions/ami-housekeeper/package.json index 342f74307e..ed43ef6c9e 100644 --- a/lambdas/functions/ami-housekeeper/package.json +++ b/lambdas/functions/ami-housekeeper/package.json @@ -28,7 +28,7 @@ "@aws-github-runner/aws-ssm-util": "*", "@aws-sdk/client-ec2": "^3.767.0", "@aws-sdk/client-ssm": "^3.759.0", - "cron-parser": "^4.9.0" + "cron-parser": "^5.0.4" }, "nx": { "includedScripts": [ diff --git a/lambdas/functions/control-plane/package.json b/lambdas/functions/control-plane/package.json index 1f3b188acf..863c7bdbea 100644 --- a/lambdas/functions/control-plane/package.json +++ b/lambdas/functions/control-plane/package.json @@ -40,7 +40,7 @@ "@octokit/core": "6.1.4", "@octokit/plugin-throttling": "9.4.0", "@octokit/rest": "21.1.1", - "cron-parser": "^4.9.0" + "cron-parser": "^5.0.4" }, "nx": { "includedScripts": [ diff --git a/lambdas/yarn.lock b/lambdas/yarn.lock index e1228f7fdd..568fe108ac 100644 --- a/lambdas/yarn.lock +++ b/lambdas/yarn.lock @@ -120,7 +120,18 @@ __metadata: "@vercel/ncc": "npm:^0.38.3" aws-sdk-client-mock: "npm:^4.1.0" aws-sdk-client-mock-jest: "npm:^4.1.0" - cron-parser: "npm:^4.9.0" + cron-parser: "npm:^5.0.4" + eslint: "npm:^8.57.0" + eslint-plugin-prettier: "npm:5.2.3" + jest: "npm:^29.7.0" + jest-mock: "npm:^29.7.0" + jest-mock-extended: "npm:^3.0.7" + nock: "npm:^14.0.1" + prettier: "npm:3.4.2" + ts-jest: "npm:^29.2.5" + ts-node: "npm:^10.9.2" + ts-node-dev: "npm:^2.0.0" + typescript: "npm:^5.7.3" languageName: unknown linkType: soft @@ -173,7 +184,12 @@ __metadata: "@vercel/ncc": "npm:^0.38.3" aws-sdk-client-mock: "npm:^4.1.0" aws-sdk-client-mock-jest: "npm:^4.1.0" - cron-parser: "npm:^4.9.0" + cron-parser: "npm:^5.0.4" + eslint: "npm:^8.57.0" + eslint-plugin-prettier: "npm:5.2.3" + jest: "npm:^29.7.0" + jest-mock: "npm:^29.7.0" + jest-mock-extended: "npm:^3.0.7" moment-timezone: "npm:^0.5.47" nock: "npm:^14.0.1" ts-node: "npm:^10.9.2" @@ -6573,12 +6589,12 @@ __metadata: languageName: node linkType: hard -"cron-parser@npm:^4.9.0": - version: 4.9.0 - resolution: "cron-parser@npm:4.9.0" +"cron-parser@npm:^5.0.4": + version: 5.0.4 + resolution: "cron-parser@npm:5.0.4" dependencies: - luxon: "npm:^3.2.1" - checksum: 10c0/348622bdcd1a15695b61fc33af8a60133e5913a85cf99f6344367579e7002896514ba3b0a9d6bb569b02667d6b06836722bf2295fcd101b3de378f71d37bed0b + luxon: "npm:^3.5.0" + checksum: 10c0/cac705efad1976d3441e967083dc786fb1dca5dbcdafc73e26774a231fed7d6efaf62d2b155c4b28232e4a3501d65e71d250b2d319c951ec35d3f3dc6ac87c98 languageName: node linkType: hard @@ -8600,10 +8616,10 @@ __metadata: languageName: node linkType: hard -"luxon@npm:^3.2.1": - version: 3.3.0 - resolution: "luxon@npm:3.3.0" - checksum: 10c0/47f8e1e96b25441c799b8aa833b3f007fb1854713bcffc8c3384eda8e61fc9af1f038474d137274d2d386492f341c8a8c992fc78c213adfb3143780feba2776c +"luxon@npm:^3.5.0": + version: 3.5.0 + resolution: "luxon@npm:3.5.0" + checksum: 10c0/335789bba95077db831ef99894edadeb23023b3eb2137a1b56acd0d290082b691cf793143d69e30bc069ec95f0b49f36419f48e951c68014f19ffe12045e3494 languageName: node linkType: hard From 55d31b1f03e1e02fb34e392e276d762d80e57ae8 Mon Sep 17 00:00:00 2001 From: Niek Palm Date: Wed, 5 Mar 2025 10:11:40 +0100 Subject: [PATCH 2/3] fix breaking change in cron-parser --- .../control-plane/src/scale-runners/scale-down-config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lambdas/functions/control-plane/src/scale-runners/scale-down-config.ts b/lambdas/functions/control-plane/src/scale-runners/scale-down-config.ts index a561df850b..2d28c38cfc 100644 --- a/lambdas/functions/control-plane/src/scale-runners/scale-down-config.ts +++ b/lambdas/functions/control-plane/src/scale-runners/scale-down-config.ts @@ -15,7 +15,7 @@ const logger = createChildLogger('scale-down-config.ts'); function inPeriod(period: ScalingDownConfig): boolean { const now = moment(new Date()); - const expr = parser.parseExpression(period.cron, { + const expr = parser.parse(period.cron, { tz: period.timeZone, }); const next = moment(expr.next().toDate()); From 06a2a39ae71fb3d8180dba65a744900b91c813cf Mon Sep 17 00:00:00 2001 From: Niek Palm Date: Mon, 17 Mar 2025 16:18:30 +0100 Subject: [PATCH 3/3] update lock file --- lambdas/yarn.lock | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/lambdas/yarn.lock b/lambdas/yarn.lock index 568fe108ac..34bee98c6d 100644 --- a/lambdas/yarn.lock +++ b/lambdas/yarn.lock @@ -121,17 +121,6 @@ __metadata: aws-sdk-client-mock: "npm:^4.1.0" aws-sdk-client-mock-jest: "npm:^4.1.0" cron-parser: "npm:^5.0.4" - eslint: "npm:^8.57.0" - eslint-plugin-prettier: "npm:5.2.3" - jest: "npm:^29.7.0" - jest-mock: "npm:^29.7.0" - jest-mock-extended: "npm:^3.0.7" - nock: "npm:^14.0.1" - prettier: "npm:3.4.2" - ts-jest: "npm:^29.2.5" - ts-node: "npm:^10.9.2" - ts-node-dev: "npm:^2.0.0" - typescript: "npm:^5.7.3" languageName: unknown linkType: soft @@ -185,11 +174,6 @@ __metadata: aws-sdk-client-mock: "npm:^4.1.0" aws-sdk-client-mock-jest: "npm:^4.1.0" cron-parser: "npm:^5.0.4" - eslint: "npm:^8.57.0" - eslint-plugin-prettier: "npm:5.2.3" - jest: "npm:^29.7.0" - jest-mock: "npm:^29.7.0" - jest-mock-extended: "npm:^3.0.7" moment-timezone: "npm:^0.5.47" nock: "npm:^14.0.1" ts-node: "npm:^10.9.2"