Merge branch 'main' into ashwin/outputs

philips-labs · Dec 20, 2024 · 1bb42fa · 1bb42fa
2 parents 4cd1ab3 + 2e69cfd
commit 1bb42fa
Show file tree

Hide file tree

Showing 13 changed files with 1,323 additions and 1,138 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -30,12 +30,12 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
+      uses: github/codeql-action/init@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
       with:
         languages: ${{ matrix.language }}
         build-mode: ${{ matrix.build-mode }}
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
+      uses: github/codeql-action/analyze@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
       with:
         category: "/language:${{matrix.language}}"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog
 
+## [5.20.1](https://github.com/philips-labs/terraform-aws-github-runner/compare/v5.20.0...v5.20.1) (2024-12-09)
+
+
+### Bug Fixes
+
+* **lambda:** bump @octokit/types from 13.6.1 to 13.6.2 in /lambdas in the octokit group ([#4291](https://github.com/philips-labs/terraform-aws-github-runner/issues/4291)) ([d8d7519](https://github.com/philips-labs/terraform-aws-github-runner/commit/d8d75191eb4573d07ce3ee7f78bfb246b46e1198))
+* **lambda:** bump the aws group across 1 directory with 7 updates ([#4288](https://github.com/philips-labs/terraform-aws-github-runner/issues/4288)) ([039f5db](https://github.com/philips-labs/terraform-aws-github-runner/commit/039f5dbeb8af6a02a4686572d8e3377e5048fb3b))
+* **lambda:** bump the aws group in /lambdas with 4 updates ([#4290](https://github.com/philips-labs/terraform-aws-github-runner/issues/4290)) ([eb9c123](https://github.com/philips-labs/terraform-aws-github-runner/commit/eb9c123e53c02b332f78c92aedb69b9267810410))
+* **lambda:** bump the aws-powertools group in /lambdas with 4 updates ([#4281](https://github.com/philips-labs/terraform-aws-github-runner/issues/4281)) ([e1f330b](https://github.com/philips-labs/terraform-aws-github-runner/commit/e1f330bb3c8321af875232e23ff1f4d053c684f5))
+* **lambda:** bump typescript from 5.6.3 to 5.7.2 in /lambdas ([#4293](https://github.com/philips-labs/terraform-aws-github-runner/issues/4293)) ([f6e4b92](https://github.com/philips-labs/terraform-aws-github-runner/commit/f6e4b926e6e73bddb7b0b2f78183d3542f26d023))
+
 ## [5.20.0](https://github.com/philips-labs/terraform-aws-github-runner/compare/v5.19.0...v5.20.0) (2024-11-19)
 
 

diff --git a/README.md b/README.md
@@ -2,14 +2,12 @@
 
 [![docs](https://img.shields.io/badge/docs-runners-blue.svg)](https://philips-labs.github.io/terraform-aws-github-runner) [![awesome-runners](https://img.shields.io/badge/listed%20on-awesome--runners-blue.svg)](https://github.com/jonico/awesome-runners) [![Terraform registry](https://img.shields.io/github/v/release/philips-labs/terraform-aws-github-runner?label=Terraform%20Registry)](https://registry.terraform.io/modules/philips-labs/github-runner/aws/) [![Terraform checks](https://github.com/philips-labs/terraform-aws-github-runner/actions/workflows/terraform.yml/badge.svg)](https://github.com/philips-labs/terraform-aws-github-runner/actions/workflows/terraform.yml) [![Lambdas](https://github.com/philips-labs/terraform-aws-github-runner/actions/workflows/lambda.yml/badge.svg)](https://github.com/philips-labs/terraform-aws-github-runner/actions/workflows/lambda.yml)
 
+> 📢 We're moving `terraform-aws-github-runner` to a new organization https://github.com/github-aws-runners in January to foster growth and community ownership! 🎉 Join us on our new [Discord server](https://discord.gg/EwUScJy8) for discussions and updates. Please see #4298 for more details.
+
 > 📄 Extensive documentation is available via our [GitHub Pages Docs site](https://philips-labs.github.io/terraform-aws-github-runner/).
 
 > 📢 We maintain the project as a truly open-source project. We maintain the project on a best effort basis. We welcome contributions from the community. Feel free to help us answering issues, reviewing PRs, or maintaining and improving the project.
 
-> 📢 [`v5`](https://github.com/philips-labs/terraform-aws-github-runner/pull/3552) replaces Amazon Linux 2 with Amazon Linux 2023 as default OS. Check the PR for more details and other changes.
-
-> 📢 For contributions to older versions you can make a PR to the related branch, e.g. `v4`. We have no release process in place for older versions.
-
 This [Terraform](https://www.terraform.io/) module creates the required infrastructure needed to host [GitHub Actions](https://github.com/features/actions) self-hosted, auto-scaling runners on [AWS spot instances](https://aws.amazon.com/ec2/spot/). It provides the required logic to handle the life cycle for scaling up and down using a set of AWS Lambda functions. Runners are scaled down to zero to avoid costs when no workflows are active.
 
 <picture>

diff --git a/lambdas/functions/ami-housekeeper/package.json b/lambdas/functions/ami-housekeeper/package.json
@@ -20,17 +20,17 @@
     "@types/aws-lambda": "^8.10.145",
     "@types/jest": "^29.5.14",
     "@types/node": "^22.9.0",
-    "@typescript-eslint/eslint-plugin": "^8.15.0",
-    "@typescript-eslint/parser": "^8.14.0",
-    "@vercel/ncc": "^0.38.2",
+    "@typescript-eslint/eslint-plugin": "^8.18.1",
+    "@typescript-eslint/parser": "^8.16.0",
+    "@vercel/ncc": "^0.38.3",
     "aws-sdk-client-mock": "^4.1.0",
     "aws-sdk-client-mock-jest": "^4.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",
+    "nock": "^13.5.6",
     "prettier": "3.3.3",
     "ts-jest": "^29.2.5",
     "ts-node": "^10.9.2",
@@ -39,11 +39,11 @@
   "dependencies": {
     "@aws-github-runner/aws-powertools-util": "*",
     "@aws-github-runner/aws-ssm-util": "*",
-    "@aws-sdk/client-ec2": "^3.694.0",
-    "@aws-sdk/client-ssm": "^3.693.0",
-    "@aws-sdk/types": "^3.692.0",
+    "@aws-sdk/client-ec2": "^3.714.0",
+    "@aws-sdk/client-ssm": "^3.714.0",
+    "@aws-sdk/types": "^3.714.0",
     "cron-parser": "^4.9.0",
-    "typescript": "^5.6.3"
+    "typescript": "^5.7.2"
   },
   "nx": {
     "includedScripts": [

diff --git a/lambdas/functions/control-plane/package.json b/lambdas/functions/control-plane/package.json
@@ -20,9 +20,9 @@
     "@types/aws-lambda": "^8.10.145",
     "@types/jest": "^29.5.14",
     "@types/node": "^22.9.0",
-    "@typescript-eslint/eslint-plugin": "^8.15.0",
-    "@typescript-eslint/parser": "^8.14.0",
-    "@vercel/ncc": "^0.38.2",
+    "@typescript-eslint/eslint-plugin": "^8.18.1",
+    "@typescript-eslint/parser": "^8.16.0",
+    "@vercel/ncc": "^0.38.3",
     "aws-sdk-client-mock": "^4.1.0",
     "aws-sdk-client-mock-jest": "^4.1.0",
     "eslint": "^8.57.0",
@@ -31,7 +31,7 @@
     "jest-mock": "^29.7.0",
     "jest-mock-extended": "^3.0.7",
     "moment-timezone": "^0.5.46",
-    "nock": "^13.5.4",
+    "nock": "^13.5.6",
     "prettier": "3.3.3",
     "ts-jest": "^29.2.5",
     "ts-node": "^10.9.2",
@@ -40,18 +40,18 @@
   "dependencies": {
     "@aws-github-runner/aws-powertools-util": "*",
     "@aws-github-runner/aws-ssm-util": "*",
-    "@aws-lambda-powertools/parameters": "^2.10.0",
-    "@aws-sdk/client-ec2": "^3.694.0",
-    "@aws-sdk/client-sqs": "^3.693.0",
-    "@aws-sdk/types": "^3.692.0",
+    "@aws-lambda-powertools/parameters": "^2.11.0",
+    "@aws-sdk/client-ec2": "^3.714.0",
+    "@aws-sdk/client-sqs": "^3.714.0",
+    "@aws-sdk/types": "^3.714.0",
     "@middy/core": "^4.7.0",
     "@octokit/auth-app": "6.1.3",
     "@octokit/core": "5.2.0",
     "@octokit/plugin-throttling": "8.2.0",
     "@octokit/rest": "20.1.1",
-    "@octokit/types": "^13.6.1",
+    "@octokit/types": "^13.6.2",
     "cron-parser": "^4.9.0",
-    "typescript": "^5.6.3"
+    "typescript": "^5.7.2"
   },
   "nx": {
     "includedScripts": [

diff --git a/lambdas/functions/control-plane/src/scale-runners/scale-up.ts b/lambdas/functions/control-plane/src/scale-runners/scale-up.ts
@@ -148,6 +148,7 @@ export async function isJobQueued(githubInstallationClient: Octokit, payload: Ac
     });
     metricGitHubAppRateLimit(jobForWorkflowRun.headers);
     isQueued = jobForWorkflowRun.data.status === 'queued';
+    logger.debug(`The job ${payload.id} is${isQueued ? ' ' : 'not'} queued`);
   } else {
     throw Error(`Event ${payload.eventType} is not supported`);
   }

diff --git a/lambdas/functions/gh-agent-syncer/package.json b/lambdas/functions/gh-agent-syncer/package.json
@@ -21,9 +21,9 @@
     "@types/jest": "^29.5.14",
     "@types/node": "^22.9.0",
     "@types/request": "^2.48.12",
-    "@typescript-eslint/eslint-plugin": "^8.15.0",
-    "@typescript-eslint/parser": "^8.14.0",
-    "@vercel/ncc": "^0.38.2",
+    "@typescript-eslint/eslint-plugin": "^8.18.1",
+    "@typescript-eslint/parser": "^8.16.0",
+    "@vercel/ncc": "^0.38.3",
     "aws-sdk-client-mock": "^4.1.0",
     "aws-sdk-client-mock-jest": "^4.1.0",
     "eslint": "^8.57.0",
@@ -33,16 +33,16 @@
     "prettier": "3.3.3",
     "ts-jest": "^29.2.5",
     "ts-node-dev": "^2.0.0",
-    "typescript": "^5.6.3"
+    "typescript": "^5.7.2"
   },
   "dependencies": {
     "@aws-github-runner/aws-powertools-util": "*",
-    "@aws-sdk/client-s3": "^3.693.0",
-    "@aws-sdk/lib-storage": "^3.693.0",
-    "@aws-sdk/types": "^3.692.0",
+    "@aws-sdk/client-s3": "^3.714.0",
+    "@aws-sdk/lib-storage": "^3.714.0",
+    "@aws-sdk/types": "^3.714.0",
     "@middy/core": "^4.7.0",
     "@octokit/rest": "20.1.1",
-    "axios": "^1.7.7"
+    "axios": "^1.7.9"
   },
   "nx": {
     "includedScripts": [

diff --git a/lambdas/functions/termination-watcher/package.json b/lambdas/functions/termination-watcher/package.json
@@ -18,28 +18,28 @@
     "@types/aws-lambda": "^8.10.145",
     "@types/jest": "^29.5.14",
     "@types/node": "^22.9.0",
-    "@typescript-eslint/eslint-plugin": "^8.15.0",
-    "@typescript-eslint/parser": "^8.14.0",
-    "@vercel/ncc": "^0.38.2",
+    "@typescript-eslint/eslint-plugin": "^8.18.1",
+    "@typescript-eslint/parser": "^8.16.0",
+    "@vercel/ncc": "^0.38.3",
     "aws-sdk-client-mock": "^4.1.0",
     "aws-sdk-client-mock-jest": "^4.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",
+    "nock": "^13.5.6",
     "prettier": "3.3.3",
     "ts-jest": "^29.2.5",
     "ts-node": "^10.9.2",
     "ts-node-dev": "^2.0.0"
   },
   "dependencies": {
     "@aws-github-runner/aws-powertools-util": "*",
-    "@aws-sdk/client-ec2": "^3.694.0",
-    "@aws-sdk/types": "^3.692.0",
+    "@aws-sdk/client-ec2": "^3.714.0",
+    "@aws-sdk/types": "^3.714.0",
     "@middy/core": "^4.7.0",
-    "typescript": "^5.6.3"
+    "typescript": "^5.7.2"
   },
   "nx": {
     "includedScripts": [

diff --git a/lambdas/functions/webhook/package.json b/lambdas/functions/webhook/package.json
@@ -16,34 +16,34 @@
     "all": "yarn build && yarn format && yarn lint && yarn test"
   },
   "devDependencies": {
-    "@aws-sdk/client-eventbridge": "^3.693.0",
+    "@aws-sdk/client-eventbridge": "^3.714.0",
     "@trivago/prettier-plugin-sort-imports": "^4.3.0",
     "@types/aws-lambda": "^8.10.145",
     "@types/express": "^4.17.21",
     "@types/jest": "^29.5.14",
     "@types/node": "^22.9.0",
-    "@typescript-eslint/eslint-plugin": "^8.15.0",
-    "@typescript-eslint/parser": "^8.14.0",
-    "@vercel/ncc": "0.38.2",
+    "@typescript-eslint/eslint-plugin": "^8.18.1",
+    "@typescript-eslint/parser": "^8.16.0",
+    "@vercel/ncc": "0.38.3",
     "body-parser": "^1.20.3",
     "eslint": "^8.57.0",
     "eslint-plugin-prettier": "5.2.1",
     "express": "^4.21.1",
     "jest": "^29.7.0",
     "jest-mock": "^29.7.0",
-    "nock": "^13.5.4",
+    "nock": "^13.5.6",
     "prettier": "3.3.3",
     "ts-jest": "^29.2.5",
     "ts-node-dev": "^2.0.0",
-    "typescript": "^5.6.3"
+    "typescript": "^5.7.2"
   },
   "dependencies": {
     "@aws-github-runner/aws-powertools-util": "*",
     "@aws-github-runner/aws-ssm-util": "*",
-    "@aws-sdk/client-sqs": "^3.693.0",
+    "@aws-sdk/client-sqs": "^3.714.0",
     "@middy/core": "^4.7.0",
     "@octokit/rest": "20.1.1",
-    "@octokit/types": "^13.6.1",
+    "@octokit/types": "^13.6.2",
     "@octokit/webhooks": "^12.3.1",
     "aws-lambda": "^1.0.7"
   },

diff --git a/lambdas/libs/aws-powertools-util/package.json b/lambdas/libs/aws-powertools-util/package.json
@@ -19,25 +19,25 @@
     "@types/express": "^4.17.21",
     "@types/jest": "^29.5.14",
     "@types/node": "^22.9.0",
-    "@typescript-eslint/eslint-plugin": "^8.15.0",
-    "@typescript-eslint/parser": "^8.14.0",
-    "@vercel/ncc": "0.38.2",
+    "@typescript-eslint/eslint-plugin": "^8.18.1",
+    "@typescript-eslint/parser": "^8.16.0",
+    "@vercel/ncc": "0.38.3",
     "body-parser": "^1.20.3",
     "eslint": "^8.57.0",
     "eslint-plugin-prettier": "5.2.1",
     "express": "^4.21.1",
     "jest": "^29.7.0",
     "jest-mock": "^29.7.0",
-    "nock": "^13.5.4",
+    "nock": "^13.5.6",
     "prettier": "3.3.3",
     "ts-jest": "^29.2.5",
     "ts-node-dev": "^2.0.0",
-    "typescript": "^5.6.3"
+    "typescript": "^5.7.2"
   },
   "dependencies": {
-    "@aws-lambda-powertools/logger": "^2.10.0",
-    "@aws-lambda-powertools/metrics": "^2.10.0",
-    "@aws-lambda-powertools/tracer": "^2.10.0",
+    "@aws-lambda-powertools/logger": "^2.11.0",
+    "@aws-lambda-powertools/metrics": "^2.11.0",
+    "@aws-lambda-powertools/tracer": "^2.11.0",
     "aws-lambda": "^1.0.7"
   },
   "nx": {

diff --git a/lambdas/libs/aws-ssm-util/package.json b/lambdas/libs/aws-ssm-util/package.json
@@ -19,25 +19,25 @@
     "@types/express": "^4.17.21",
     "@types/jest": "^29.5.14",
     "@types/node": "^22.9.0",
-    "@typescript-eslint/eslint-plugin": "^8.15.0",
-    "@typescript-eslint/parser": "^8.14.0",
-    "@vercel/ncc": "0.38.2",
+    "@typescript-eslint/eslint-plugin": "^8.18.1",
+    "@typescript-eslint/parser": "^8.16.0",
+    "@vercel/ncc": "0.38.3",
     "body-parser": "^1.20.3",
     "eslint": "^8.57.0",
     "eslint-plugin-prettier": "5.2.1",
     "express": "^4.21.1",
     "jest": "^29.7.0",
     "jest-mock": "^29.7.0",
-    "nock": "^13.5.4",
+    "nock": "^13.5.6",
     "prettier": "3.3.3",
     "ts-jest": "^29.2.5",
     "ts-node-dev": "^2.0.0",
-    "typescript": "^5.6.3"
+    "typescript": "^5.7.2"
   },
   "dependencies": {
     "@aws-github-runner/aws-powertools-util": "*",
-    "@aws-sdk/client-ssm": "^3.693.0",
-    "@aws-sdk/types": "^3.692.0"
+    "@aws-sdk/client-ssm": "^3.714.0",
+    "@aws-sdk/types": "^3.714.0"
   },
   "nx": {
     "includedScripts": [

diff --git a/lambdas/package.json b/lambdas/package.json
@@ -25,13 +25,13 @@
     "@nx/jest": "20.0.1",
     "@nx/js": "^20.0.1",
     "@swc-node/register": "~1.10.9",
-    "@swc/core": "~1.7.40",
+    "@swc/core": "~1.10.1",
     "@swc/helpers": "~0.5.15",
     "eslint": "^8.57.0",
     "jest": "^29.7.0",
-    "nx": "20.0.1",
+    "nx": "20.1.3",
     "prettier": "^3.3.3",
-    "typescript": "^5.6.3"
+    "typescript": "^5.7.2"
   },
   "packageManager": "[email protected]"
 }