Merge branch 'main' into fix/multi-runner-dispatch

Author: npalm

.github/workflows/actions.yml

@@ -51,7 +51,7 @@ jobs:
           path: results.sarif
 
       - name: Upload SARIF file
-        uses: github/codeql-action/upload-sarif@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
+        uses: github/codeql-action/upload-sarif@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
         with:
           sarif_file: results.sarif
           category: actions-zizmor

.github/workflows/codeql.yml

@@ -31,12 +31,12 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
+      uses: github/codeql-action/init@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
       with:
         languages: ${{ matrix.language }}
         build-mode: none
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
+      uses: github/codeql-action/analyze@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
       with:
         category: "/language:${{matrix.language}}"

CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## [6.5.8](https://github.com/github-aws-runners/terraform-aws-github-runner/compare/v6.5.7...v6.5.8) (2025-06-12)
+
+
+### Bug Fixes
+
+* scale down log level ([1d32d26](https://github.com/github-aws-runners/terraform-aws-github-runner/commit/1d32d262ff67a13b0eab8cb6b4f19fa5f9479324))
+
+## [6.5.7](https://github.com/github-aws-runners/terraform-aws-github-runner/compare/v6.5.6...v6.5.7) (2025-06-11)
+
+
+### Bug Fixes
+
+* add comment in terraform code ([d9d6373](https://github.com/github-aws-runners/terraform-aws-github-runner/commit/d9d6373b217f8abe7b112c1746c437deae25f569))
+* handle enable_on_demand_failover_for_errors default value ([ab8b15f](https://github.com/github-aws-runners/terraform-aws-github-runner/commit/ab8b15f9f2686a7a0cffe5b9de05432014a01cda))
+* **lambda:** bump the aws group across 1 directory with 7 updates ([0558831](https://github.com/github-aws-runners/terraform-aws-github-runner/commit/05588310ee8c409e29b5148930b16b3ea4f4e7d5))
+* **lambda:** bump the aws-powertools group in /lambdas with 4 updates ([0219411](https://github.com/github-aws-runners/terraform-aws-github-runner/commit/0219411d2b9bc56fad6d6e90fe94de42cc95216e))
+* **lambda:** bump the octokit group across 1 directory with 3 updates ([015752a](https://github.com/github-aws-runners/terraform-aws-github-runner/commit/015752a93b05a6ceef34f0936202a2f8ea7df35d))
+* only tag spot requests if no on-demand fallback ([2a28ef1](https://github.com/github-aws-runners/terraform-aws-github-runner/commit/2a28ef1bc5aeb0280b92c5f7b6aabf69c1a68b81))
+
 ## [6.5.6](https://github.com/github-aws-runners/terraform-aws-github-runner/compare/v6.5.5...v6.5.6) (2025-05-24)
 
 

lambdas/functions/ami-housekeeper/package.json

@@ -17,7 +17,7 @@
     "all": "yarn build && yarn format && yarn lint && yarn test"
   },
   "devDependencies": {
-    "@aws-sdk/types": "^3.804.0",
+    "@aws-sdk/types": "^3.821.0",
     "@types/aws-lambda": "^8.10.147",
     "@vercel/ncc": "^0.38.3",
     "aws-sdk-client-mock": "^4.1.0",
@@ -26,8 +26,8 @@
   "dependencies": {
     "@aws-github-runner/aws-powertools-util": "*",
     "@aws-github-runner/aws-ssm-util": "*",
-    "@aws-sdk/client-ec2": "^3.813.0",
-    "@aws-sdk/client-ssm": "^3.812.0",
+    "@aws-sdk/client-ec2": "^3.827.0",
+    "@aws-sdk/client-ssm": "^3.826.0",
     "cron-parser": "^5.0.4"
   },
   "nx": {

lambdas/functions/control-plane/package.json

@@ -17,29 +17,29 @@
     "all": "yarn build && yarn format && yarn lint && yarn test"
   },
   "devDependencies": {
-    "@aws-sdk/types": "^3.804.0",
-    "@octokit/types": "^14.0.0",
+    "@aws-sdk/types": "^3.821.0",
+    "@octokit/types": "^14.1.0",
     "@types/aws-lambda": "^8.10.147",
     "@types/node": "^22.14.0",
     "@vercel/ncc": "^0.38.3",
     "aws-sdk-client-mock": "^4.1.0",
     "aws-sdk-client-mock-jest": "^4.1.0",
-    "moment-timezone": "^0.5.47",
+    "moment-timezone": "^0.6.0",
     "nock": "^14.0.2",
     "ts-node": "^10.9.2",
     "ts-node-dev": "^2.0.0"
   },
   "dependencies": {
     "@aws-github-runner/aws-powertools-util": "*",
     "@aws-github-runner/aws-ssm-util": "*",
-    "@aws-lambda-powertools/parameters": "^2.19.1",
-    "@aws-sdk/client-ec2": "^3.813.0",
-    "@aws-sdk/client-sqs": "^3.812.0",
+    "@aws-lambda-powertools/parameters": "^2.20.0",
+    "@aws-sdk/client-ec2": "^3.827.0",
+    "@aws-sdk/client-sqs": "^3.826.0",
     "@middy/core": "^6.1.6",
     "@octokit/auth-app": "8.0.1",
     "@octokit/core": "7.0.2",
     "@octokit/plugin-throttling": "11.0.1",
-    "@octokit/rest": "21.1.1",
+    "@octokit/rest": "22.0.0",
     "cron-parser": "^5.0.4"
   },
   "nx": {

lambdas/functions/control-plane/src/scale-runners/scale-down.ts

@@ -130,7 +130,7 @@ async function removeRunner(ec2runner: RunnerInfo, ghRunnerIds: number[]): Promi
 
       if (statuses.every((status) => status == 204)) {
         await terminateRunner(ec2runner.instanceId);
-        logger.debug(`AWS runner instance '${ec2runner.instanceId}' is terminated and GitHub runner is de-registered.`);
+        logger.info(`AWS runner instance '${ec2runner.instanceId}' is terminated and GitHub runner is de-registered.`);
       } else {
         logger.error(`Failed to de-register GitHub runner: ${statuses}`);
       }

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

@@ -17,7 +17,7 @@
     "all": "yarn build && yarn format && yarn lint && yarn test"
   },
   "devDependencies": {
-    "@aws-sdk/types": "^3.804.0",
+    "@aws-sdk/types": "^3.821.0",
     "@types/aws-lambda": "^8.10.147",
     "@types/node": "^22.14.0",
     "@types/request": "^2.48.12",
@@ -28,10 +28,10 @@
   },
   "dependencies": {
     "@aws-github-runner/aws-powertools-util": "*",
-    "@aws-sdk/client-s3": "^3.812.0",
-    "@aws-sdk/lib-storage": "^3.812.0",
+    "@aws-sdk/client-s3": "^3.826.0",
+    "@aws-sdk/lib-storage": "^3.826.0",
     "@middy/core": "^6.1.6",
-    "@octokit/rest": "21.1.1",
+    "@octokit/rest": "22.0.0",
     "axios": "^1.8.4"
   },
   "nx": {

lambdas/functions/termination-watcher/package.json

@@ -15,7 +15,7 @@
     "all": "yarn build && yarn format && yarn lint && yarn test"
   },
   "devDependencies": {
-    "@aws-sdk/types": "^3.804.0",
+    "@aws-sdk/types": "^3.821.0",
     "@types/aws-lambda": "^8.10.147",
     "@types/node": "^22.14.0",
     "@vercel/ncc": "^0.38.3",
@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "@aws-github-runner/aws-powertools-util": "*",
-    "@aws-sdk/client-ec2": "^3.813.0",
+    "@aws-sdk/client-ec2": "^3.827.0",
     "@middy/core": "^6.1.6"
   },
   "nx": {

lambdas/functions/webhook/package.json

@@ -17,7 +17,7 @@
     "all": "yarn build && yarn format && yarn lint && yarn test"
   },
   "devDependencies": {
-    "@aws-sdk/client-eventbridge": "^3.812.0",
+    "@aws-sdk/client-eventbridge": "^3.826.0",
     "@octokit/webhooks-types": "^7.6.1",
     "@types/aws-lambda": "^8.10.147",
     "@types/express": "^5.0.0",
@@ -30,11 +30,11 @@
   "dependencies": {
     "@aws-github-runner/aws-powertools-util": "*",
     "@aws-github-runner/aws-ssm-util": "*",
-    "@aws-sdk/client-sqs": "^3.812.0",
+    "@aws-sdk/client-sqs": "^3.826.0",
     "@middy/core": "^6.1.6",
-    "@octokit/rest": "21.1.1",
-    "@octokit/types": "^14.0.0",
-    "@octokit/webhooks": "^14.0.0",
+    "@octokit/rest": "22.0.0",
+    "@octokit/types": "^14.1.0",
+    "@octokit/webhooks": "^14.0.2",
     "aws-lambda": "^1.0.7"
   },
   "nx": {

lambdas/libs/aws-powertools-util/package.json

@@ -20,9 +20,9 @@
     "body-parser": "^2.2.0"
   },
   "dependencies": {
-    "@aws-lambda-powertools/logger": "^2.19.1",
-    "@aws-lambda-powertools/metrics": "^2.19.1",
-    "@aws-lambda-powertools/tracer": "^2.19.1",
+    "@aws-lambda-powertools/logger": "^2.20.0",
+    "@aws-lambda-powertools/metrics": "^2.20.0",
+    "@aws-lambda-powertools/tracer": "^2.20.0",
     "aws-lambda": "^1.0.7"
   },
   "nx": {