Merge branch 'main' into feat/dynamic-pool

Author: npalm

.github/workflows/lambda.yml

@@ -19,7 +19,7 @@ jobs:
         working-directory: ./lambdas
 
     steps:
-      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v3.2.0
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v3.2.0
       - name: Install dependencies
         run: yarn install --frozen-lockfile
       - name: Run prettier
@@ -32,7 +32,7 @@ jobs:
       - name: Build distribution
         run: yarn build
       - name: Upload coverage report
-        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v31.2
+        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v31.2
         if: ${{ failure() }}
         with:
           name: coverage-reports

.github/workflows/packer-build.yml

@@ -25,7 +25,7 @@ jobs:
         working-directory: images/${{ matrix.image }}
     steps:
       - name: "Checkout"
-        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # ratchet:actions/checkout@v4
+        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # ratchet:actions/checkout@v4
       - name: packer init
         run: packer init .
       - name: check packer formatting

.github/workflows/release.yml

@@ -17,7 +17,7 @@ jobs:
       - uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
         with:
           node-version: 20
-      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # ratchet:actions/checkout@v4
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # ratchet:actions/checkout@v4
       - name: Build dist
         working-directory: lambdas
         run: yarn install --frozen-lockfile && yarn run test && yarn dist

.github/workflows/semantic-check.yml

@@ -13,8 +13,8 @@ jobs:
     name: Semantic Commit Message Check
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # ratchet:actions/checkout@v4
-      - uses: amannn/action-semantic-pull-request@e9fabac35e210fea40ca5b14c0da95a099eff26f # ratchet:amannn/action-semantic-pull-request@v5
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # ratchet:actions/checkout@v4
+      - uses: amannn/action-semantic-pull-request@cfb60706e18bc85e8aec535e3c577abe8f70378e # ratchet:amannn/action-semantic-pull-request@v5
         name: Check PR for Semantic Commit Message
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/terraform.yml

@@ -23,7 +23,7 @@ jobs:
       image: hashicorp/terraform:${{ matrix.terraform }}
     steps:
       - name: "Checkout"
-        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
+        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b
       - name: "Fake zip files" # Validate will fail if it cannot find the zip files
         run: |
           touch lambdas/functions/webhook/webhook.zip
@@ -89,7 +89,7 @@ jobs:
     container:
       image: hashicorp/terraform:${{ matrix.terraform }}
     steps:
-      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b
       - name: terraform init
         run: terraform init -get -backend=false -input=false
       - if: contains(matrix.terraform, '1.3.')
@@ -147,7 +147,7 @@ jobs:
     container:
       image: hashicorp/terraform:${{ matrix.terraform }}
     steps:
-      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b
       - name: terraform init
         run: terraform init -get -backend=false -input=false
       - if: contains(matrix.terraform, '1.5.')

.github/workflows/update-docs.yml

@@ -25,7 +25,7 @@ jobs:
           org: philips-labs
 
       - name: Checkout with GITHUB Action token
-        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # ratchet:actions/checkout@v4
+        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # ratchet:actions/checkout@v4
         with:
           token: ${{ steps.app.outputs.token }}
 
@@ -51,7 +51,7 @@ jobs:
       # change docs via PR in case of locked main branch
       - name: Create Pull Request (main branch only)
         if: github.ref == 'refs/heads/main' && github.repository_owner == 'philips-labs'
-        uses: peter-evans/create-pull-request@c55203cfde3e5c11a452d352b4393e68b85b4533 # ratchet:peter-evans/[email protected].3
+        uses: peter-evans/create-pull-request@6d6857d36972b65feb161a90e484f2984215f83e # ratchet:peter-evans/[email protected].5
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           commit-message: "docs: auto update terraform docs"
@@ -65,7 +65,7 @@ jobs:
     needs: [docs]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # ratchet:actions/checkout@v4
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # ratchet:actions/checkout@v4
       - name: Configure Git Credentials
         run: |
           git config user.name github-actions[bot]

CHANGELOG.md

@@ -1,5 +1,39 @@
 # Changelog
 
+## [5.10.4](https://github.com/philips-labs/terraform-aws-github-runner/compare/v5.10.3...v5.10.4) (2024-05-06)
+
+
+### Bug Fixes
+
+* **lambda:** bump ejs from 3.1.9 to 3.1.10 in /lambdas ([#3887](https://github.com/philips-labs/terraform-aws-github-runner/issues/3887)) ([4cca21f](https://github.com/philips-labs/terraform-aws-github-runner/commit/4cca21fa5c44316e2ef2574563b24218f8ae090d))
+* **lambda:** bump the aws group across 1 directory with 6 updates ([#3890](https://github.com/philips-labs/terraform-aws-github-runner/issues/3890)) ([d1cd712](https://github.com/philips-labs/terraform-aws-github-runner/commit/d1cd712204b678a878f22eea75e540cb28d6a3ad))
+* Typo in env vars for scale-up lambda ([#3891](https://github.com/philips-labs/terraform-aws-github-runner/issues/3891)) ([f4ecf46](https://github.com/philips-labs/terraform-aws-github-runner/commit/f4ecf466014d7d51aed238aa851290908d3c7972))
+
+## [5.10.3](https://github.com/philips-labs/terraform-aws-github-runner/compare/v5.10.2...v5.10.3) (2024-05-03)
+
+
+### Bug Fixes
+
+* revert depedency update / broken release 5.10.2 ([#3885](https://github.com/philips-labs/terraform-aws-github-runner/issues/3885)) ([7464f2b](https://github.com/philips-labs/terraform-aws-github-runner/commit/7464f2bbb401c9c1b07d252c2572a4a970468e95))
+
+## [5.10.2](https://github.com/philips-labs/terraform-aws-github-runner/compare/v5.10.1...v5.10.2) (2024-04-25)
+
+
+### Bug Fixes
+
+* change log level for termination watcher if no match ([#3866](https://github.com/philips-labs/terraform-aws-github-runner/issues/3866)) ([649ad35](https://github.com/philips-labs/terraform-aws-github-runner/commit/649ad35b63f519739354b8bc801dff6c70d66f46))
+* update dependencies ([#3867](https://github.com/philips-labs/terraform-aws-github-runner/issues/3867)) ([85b5aac](https://github.com/philips-labs/terraform-aws-github-runner/commit/85b5aac73931cebdeb779a86118d7b5043286493))
+
+## [5.10.1](https://github.com/philips-labs/terraform-aws-github-runner/compare/v5.10.0...v5.10.1) (2024-04-24)
+
+
+### Bug Fixes
+
+* Add missing webhook_events_workflow_job_queue_policy to multi-runner queue ([#3848](https://github.com/philips-labs/terraform-aws-github-runner/issues/3848)) ([a8cba4e](https://github.com/philips-labs/terraform-aws-github-runner/commit/a8cba4e3795c6105636530ede9360e3123c92c3a))
+* **lambda:** bump the aws group in /lambdas with 5 updates ([#3861](https://github.com/philips-labs/terraform-aws-github-runner/issues/3861)) ([6119354](https://github.com/philips-labs/terraform-aws-github-runner/commit/611935472f8551c103544bc074c7ae419b455528))
+* **lambda:** bump typescript from 5.3.3 to 5.4.5 in /lambdas ([#3863](https://github.com/philips-labs/terraform-aws-github-runner/issues/3863)) ([e3f3d77](https://github.com/philips-labs/terraform-aws-github-runner/commit/e3f3d779a8f66f2933da0600c6ef3de252fb440d))
+* webhook expects REPOSITORY_ALLOW_LIST env var ([#3856](https://github.com/philips-labs/terraform-aws-github-runner/issues/3856)) ([0006ab9](https://github.com/philips-labs/terraform-aws-github-runner/commit/0006ab9fb5880fb1daf31b3e1b8d218e7b86105b))
+
 ## [5.10.0](https://github.com/philips-labs/terraform-aws-github-runner/compare/v5.9.0...v5.10.0) (2024-04-17)
 
 

lambdas/functions/ami-housekeeper/package.json

@@ -29,21 +29,21 @@
     "eslint-plugin-prettier": "5.1.2",
     "jest": "^29.5",
     "jest-mock": "^29.5.0",
-    "jest-mock-extended": "^3.0.4",
+    "jest-mock-extended": "^3.0.6",
     "nock": "^13.4.0",
     "prettier": "3.2.5",
     "ts-jest": "^29.1.0",
     "ts-node": "^10.9.1",
     "ts-node-dev": "^2.0.0"
   },
   "dependencies": {
-    "@aws-sdk/client-ec2": "^3.554.0",
-    "@aws-sdk/client-ssm": "^3.554.0",
+    "@aws-sdk/client-ec2": "^3.568.0",
+    "@aws-sdk/client-ssm": "^3.568.0",
     "@aws-sdk/types": "^3.433.0",
     "@terraform-aws-github-runner/aws-powertools-util": "*",
     "@terraform-aws-github-runner/aws-ssm-util": "*",
     "cron-parser": "^4.8.1",
-    "typescript": "^5.3.3"
+    "typescript": "^5.4.5"
   },
   "nx": {
     "includedScripts": ["build","dist","format","format-check","start","watch","all"]

lambdas/functions/control-plane/package.json

@@ -29,7 +29,7 @@
     "eslint-plugin-prettier": "5.1.2",
     "jest": "^29.5",
     "jest-mock": "^29.5.0",
-    "jest-mock-extended": "^3.0.4",
+    "jest-mock-extended": "^3.0.6",
     "moment-timezone": "^0.5.45",
     "nock": "^13.4.0",
     "prettier": "3.2.5",
@@ -38,7 +38,7 @@
     "ts-node-dev": "^2.0.0"
   },
   "dependencies": {
-    "@aws-sdk/client-ec2": "^3.554.0",
+    "@aws-sdk/client-ec2": "^3.568.0",
     "@aws-sdk/types": "^3.433.0",
     "@middy/core": "^4.7.0",
     "@octokit/auth-app": "6.0.3",
@@ -48,7 +48,7 @@
     "@terraform-aws-github-runner/aws-ssm-util": "*",
     "axios": "^1.6.8",
     "cron-parser": "^4.8.1",
-    "typescript": "^5.3.3"
+    "typescript": "^5.4.5"
   },
   "nx": {
     "includedScripts": ["build","dist","format","format-check","start","watch","all"]

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

@@ -34,11 +34,11 @@
     "prettier": "3.2.5",
     "ts-jest": "^29.1.0",
     "ts-node-dev": "^2.0.0",
-    "typescript": "^5.3.3"
+    "typescript": "^5.4.5"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.554.0",
-    "@aws-sdk/lib-storage": "^3.554.0",
+    "@aws-sdk/client-s3": "^3.568.0",
+    "@aws-sdk/lib-storage": "^3.568.0",
     "@aws-sdk/types": "^3.433.0",
     "@middy/core": "^4.7.0",
     "@terraform-aws-github-runner/aws-powertools-util": "*",

lambdas/functions/termination-watcher/package.json

@@ -27,19 +27,19 @@
     "eslint-plugin-prettier": "5.1.2",
     "jest": "^29.5",
     "jest-mock": "^29.5.0",
-    "jest-mock-extended": "^3.0.4",
+    "jest-mock-extended": "^3.0.6",
     "nock": "^13.4.0",
     "prettier": "3.2.5",
     "ts-jest": "^29.1.0",
     "ts-node": "^10.9.1",
     "ts-node-dev": "^2.0.0"
   },
   "dependencies": {
-    "@aws-sdk/client-ec2": "^3.554.0",
+    "@aws-sdk/client-ec2": "^3.568.0",
     "@aws-sdk/types": "^3.433.0",
     "@middy/core": "^4.7.0",
     "@terraform-aws-github-runner/aws-powertools-util": "*",
-    "typescript": "^5.3.3"
+    "typescript": "^5.4.5"
   },
   "nx": {
     "includedScripts": ["build","dist","format","format-check","start","watch","all"]

lambdas/functions/termination-watcher/src/lambda.test.ts

@@ -7,7 +7,6 @@ import { interruptionWarning } from './lambda';
 import { SpotInterruptionWarning, SpotTerminationDetail } from './types';
 
 jest.mock('./termination-warning');
-//jest.mock('@terraform-aws-github-runner/aws-powertools-util');
 
 process.env.POWERTOOLS_METRICS_NAMESPACE = 'test';
 process.env.POWERTOOLS_TRACE_ENABLED = 'true';

lambdas/functions/termination-watcher/src/termination-warning.ts

@@ -49,7 +49,7 @@ async function handle(event: SpotInterruptionWarning<SpotTerminationDetail>, con
       );
     }
   } else {
-    logger.warn(
+    logger.debug(
       `Received spot termination notification warning for instance ${event.detail['instance-id']} but ` +
         `details are not available or instance not matching the tag fileter (${config.tagFilters}).`,
     );

lambdas/functions/webhook/package.json

@@ -35,10 +35,10 @@
     "prettier": "3.2.5",
     "ts-jest": "^29.1.0",
     "ts-node-dev": "^2.0.0",
-    "typescript": "^5.3.3"
+    "typescript": "^5.4.5"
   },
   "dependencies": {
-    "@aws-sdk/client-sqs": "^3.554.0",
+    "@aws-sdk/client-sqs": "^3.568.0",
     "@middy/core": "^4.7.0",
     "@octokit/rest": "^20.0.1",
     "@octokit/types": "^12.5.0",

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

@@ -33,7 +33,7 @@
     "prettier": "3.2.5",
     "ts-jest": "^29.1.0",
     "ts-node-dev": "^2.0.0",
-    "typescript": "^5.3.3"
+    "typescript": "^5.4.5"
   },
   "dependencies": {
     "@aws-lambda-powertools/logger": "^1.17.0",

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

@@ -33,10 +33,10 @@
     "prettier": "3.2.5",
     "ts-jest": "^29.1.0",
     "ts-node-dev": "^2.0.0",
-    "typescript": "^5.3.3"
+    "typescript": "^5.4.5"
   },
   "dependencies": {
-    "@aws-sdk/client-ssm": "^3.554.0",
+    "@aws-sdk/client-ssm": "^3.568.0",
     "@aws-sdk/types": "^3.433.0",
     "@terraform-aws-github-runner/aws-powertools-util": "*"
   },

lambdas/package.json

@@ -21,8 +21,8 @@
     "@octokit/types": "^12.0.0"
   },
   "devDependencies": {
-    "@nx/eslint": "18.0.4",
-    "@nx/jest": "18.0.4",
+    "@nx/eslint": "18.3.4",
+    "@nx/jest": "18.3.4",
     "@nx/js": "^18.0.4",
     "@swc-node/register": "~1.8.0",
     "@swc/core": "~1.3.85",