Merge branch 'main' into feat-ssm-runner-matcher-chunking

npalm · web-flow · commit 35d3f6da7b55 · 2025-11-06T14:32:26.000+01:00
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -42,12 +42,12 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
+      uses: github/codeql-action/init@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
       with:
         languages: ${{ matrix.language }}
         build-mode: none
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
+      uses: github/codeql-action/analyze@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
       with:
         category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/ossf-scorecard.yml b/.github/workflows/ossf-scorecard.yml
@@ -53,6 +53,6 @@ jobs:
       # Upload the results to GitHub's code scanning dashboard (optional).
       # Commenting out will disable upload of results to your repo's Code Scanning dashboard
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
+        uses: github/codeql-action/upload-sarif@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/ovs.yml b/.github/workflows/ovs.yml
@@ -17,4 +17,4 @@ jobs:
       actions: read            # Required to upload SARIF file to CodeQL
       security-events: write   # Require writing security events to upload
       contents: read           # for checkout
-    uses: "google/osv-scanner-action/.github/workflows/osv-scanner-reusable-pr.yml@e92b5d07338d4f0ba0981dffed17c48976ca4730" # v2.2.3
+    uses: "google/osv-scanner-action/.github/workflows/osv-scanner-reusable-pr.yml@9bb69575e74019c2ad085a1860787043adf47ccb" # v2.2.4
diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml
@@ -64,7 +64,7 @@ jobs:
           key: tflint-${{ hashFiles('.tflint.hcl') }}
       - if: contains(matrix.terraform, '1.5.')
         name: Setup TFLint
-        uses: terraform-linters/setup-tflint@acd1575d3c037258ce5b2dd01379dc49ce24c6b7 # v6.2.0
+        uses: terraform-linters/setup-tflint@4cb9feea73331a35b422df102992a03a44a3bb33 # v6.2.1
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
       - if: contains(matrix.terraform, '1.5.')
@@ -130,7 +130,7 @@ jobs:
           key: tflint-${{ hashFiles('.tflint.hcl') }}
       - if: contains(matrix.terraform, '1.3.')
         name: Setup TFLint
-        uses: terraform-linters/setup-tflint@acd1575d3c037258ce5b2dd01379dc49ce24c6b7 # v6.2.0
+        uses: terraform-linters/setup-tflint@4cb9feea73331a35b422df102992a03a44a3bb33 # v6.2.1
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
       - if: contains(matrix.terraform, '1.3.')
@@ -195,7 +195,7 @@ jobs:
           key: tflint-${{ hashFiles('.tflint.hcl') }}
       - if: contains(matrix.terraform, '1.5.')
         name: Setup TFLint
-        uses: terraform-linters/setup-tflint@acd1575d3c037258ce5b2dd01379dc49ce24c6b7 # v6.2.0
+        uses: terraform-linters/setup-tflint@4cb9feea73331a35b422df102992a03a44a3bb33 # v6.2.1
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
       - if: contains(matrix.terraform, '1.5.')
diff --git a/lambdas/functions/ami-housekeeper/package.json b/lambdas/functions/ami-housekeeper/package.json
@@ -17,7 +17,7 @@
     "all": "yarn build && yarn format && yarn lint && yarn test"
   },
   "devDependencies": {
-    "@aws-sdk/types": "^3.914.0",
+    "@aws-sdk/types": "^3.921.0",
     "@types/aws-lambda": "^8.10.155",
     "@vercel/ncc": "^0.38.4",
     "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.917.0",
-    "@aws-sdk/client-ssm": "^3.917.0",
+    "@aws-sdk/client-ec2": "^3.921.0",
+    "@aws-sdk/client-ssm": "^3.921.0",
     "cron-parser": "^5.4.0"
   },
   "nx": {
diff --git a/lambdas/functions/control-plane/package.json b/lambdas/functions/control-plane/package.json
@@ -17,8 +17,8 @@
     "all": "yarn build && yarn format && yarn lint && yarn test"
   },
   "devDependencies": {
-    "@aws-sdk/types": "^3.914.0",
-    "@octokit/types": "^15.0.0",
+    "@aws-sdk/types": "^3.921.0",
+    "@octokit/types": "^16.0.0",
     "@types/aws-lambda": "^8.10.155",
     "@types/node": "^22.18.8",
     "@vercel/ncc": "^0.38.4",
@@ -32,13 +32,13 @@
   "dependencies": {
     "@aws-github-runner/aws-powertools-util": "*",
     "@aws-github-runner/aws-ssm-util": "*",
-    "@aws-lambda-powertools/parameters": "^2.27.0",
-    "@aws-sdk/client-ec2": "^3.917.0",
-    "@aws-sdk/client-sqs": "^3.917.0",
+    "@aws-lambda-powertools/parameters": "^2.28.1",
+    "@aws-sdk/client-ec2": "^3.921.0",
+    "@aws-sdk/client-sqs": "^3.921.0",
     "@middy/core": "^6.4.5",
-    "@octokit/auth-app": "8.1.1",
-    "@octokit/core": "7.0.5",
-    "@octokit/plugin-throttling": "11.0.2",
+    "@octokit/auth-app": "8.1.2",
+    "@octokit/core": "7.0.6",
+    "@octokit/plugin-throttling": "11.0.3",
     "@octokit/rest": "22.0.0",
     "cron-parser": "^5.4.0"
   },
diff --git a/lambdas/functions/control-plane/src/github/octokit.test.ts b/lambdas/functions/control-plane/src/github/octokit.test.ts
@@ -19,7 +19,9 @@ vi.mock('../github/auth', async () => ({
 }));
 
 vi.mock('@octokit/rest', async () => ({
-  Octokit: vi.fn().mockImplementation(() => mockOctokit),
+  Octokit: vi.fn().mockImplementation(function () {
+    return mockOctokit;
+  }),
 }));
 
 // We've already mocked '../github/auth' above
diff --git a/lambdas/functions/control-plane/src/pool/pool.test.ts b/lambdas/functions/control-plane/src/pool/pool.test.ts
@@ -20,7 +20,9 @@ const mockOctokit = {
 };
 
 vi.mock('@octokit/rest', () => ({
-  Octokit: vi.fn().mockImplementation(() => mockOctokit),
+  Octokit: vi.fn().mockImplementation(function () {
+    return mockOctokit;
+  }),
 }));
 
 vi.mock('./../aws/runners', async () => ({
diff --git a/lambdas/functions/control-plane/src/scale-runners/job-retry.test.ts b/lambdas/functions/control-plane/src/scale-runners/job-retry.test.ts
@@ -42,7 +42,9 @@ const mockOctokit = {
 };
 
 vi.mock('@octokit/rest', async () => ({
-  Octokit: vi.fn().mockImplementation(() => mockOctokit),
+  Octokit: vi.fn().mockImplementation(function () {
+    return mockOctokit;
+  }),
 }));
 vi.mock('../github/octokit', async () => ({
   getOctokit: vi.fn(),
diff --git a/lambdas/functions/control-plane/src/scale-runners/scale-down.test.ts b/lambdas/functions/control-plane/src/scale-runners/scale-down.test.ts
@@ -26,7 +26,9 @@ const mockOctokit = {
   paginate: vi.fn(),
 };
 vi.mock('@octokit/rest', () => ({
-  Octokit: vi.fn().mockImplementation(() => mockOctokit),
+  Octokit: vi.fn().mockImplementation(function () {
+    return mockOctokit;
+  }),
 }));
 
 vi.mock('./../aws/runners', async (importOriginal) => {
diff --git a/lambdas/functions/control-plane/src/scale-runners/scale-up.test.ts b/lambdas/functions/control-plane/src/scale-runners/scale-up.test.ts
@@ -35,7 +35,9 @@ const mockSSMClient = mockClient(SSMClient);
 const mockSSMgetParameter = vi.mocked(getParameter);
 
 vi.mock('@octokit/rest', () => ({
-  Octokit: vi.fn().mockImplementation(() => mockOctokit),
+  Octokit: vi.fn().mockImplementation(function () {
+    return mockOctokit;
+  }),
 }));
 
 vi.mock('./../aws/runners', async () => ({
diff --git a/lambdas/functions/gh-agent-syncer/package.json b/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.914.0",
+    "@aws-sdk/types": "^3.921.0",
     "@types/aws-lambda": "^8.10.155",
     "@types/node": "^22.18.8",
     "@types/request": "^2.48.13",
@@ -28,8 +28,8 @@
   },
   "dependencies": {
     "@aws-github-runner/aws-powertools-util": "*",
-    "@aws-sdk/client-s3": "^3.917.0",
-    "@aws-sdk/lib-storage": "^3.917.0",
+    "@aws-sdk/client-s3": "^3.921.0",
+    "@aws-sdk/lib-storage": "^3.921.0",
     "@middy/core": "^6.4.5",
     "@octokit/rest": "22.0.0",
     "axios": "^1.12.2"
diff --git a/lambdas/functions/gh-agent-syncer/src/syncer/syncer.test.ts b/lambdas/functions/gh-agent-syncer/src/syncer/syncer.test.ts
@@ -15,7 +15,9 @@ const mockOctokit = {
   },
 };
 vi.mock('@octokit/rest', async () => ({
-  Octokit: vi.fn().mockImplementation(() => mockOctokit),
+  Octokit: vi.fn().mockImplementation(function () {
+    return mockOctokit;
+  }),
 }));
 
 // mock stream for Axios
diff --git a/lambdas/functions/termination-watcher/package.json b/lambdas/functions/termination-watcher/package.json
@@ -15,7 +15,7 @@
     "all": "yarn build && yarn format && yarn lint && yarn test"
   },
   "devDependencies": {
-    "@aws-sdk/types": "^3.914.0",
+    "@aws-sdk/types": "^3.921.0",
     "@types/aws-lambda": "^8.10.155",
     "@types/node": "^22.18.8",
     "@vercel/ncc": "^0.38.4",
@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "@aws-github-runner/aws-powertools-util": "*",
-    "@aws-sdk/client-ec2": "^3.917.0",
+    "@aws-sdk/client-ec2": "^3.921.0",
     "@middy/core": "^6.4.5"
   },
   "nx": {
diff --git a/lambdas/functions/webhook/package.json b/lambdas/functions/webhook/package.json
@@ -17,7 +17,7 @@
     "all": "yarn build && yarn format && yarn lint && yarn test"
   },
   "devDependencies": {
-    "@aws-sdk/client-eventbridge": "^3.917.0",
+    "@aws-sdk/client-eventbridge": "^3.921.0",
     "@octokit/webhooks-types": "^7.6.1",
     "@types/aws-lambda": "^8.10.155",
     "@types/express": "^5.0.3",
@@ -30,10 +30,10 @@
   "dependencies": {
     "@aws-github-runner/aws-powertools-util": "*",
     "@aws-github-runner/aws-ssm-util": "*",
-    "@aws-sdk/client-sqs": "^3.917.0",
+    "@aws-sdk/client-sqs": "^3.921.0",
     "@middy/core": "^6.4.5",
     "@octokit/rest": "22.0.0",
-    "@octokit/types": "^15.0.0",
+    "@octokit/types": "^16.0.0",
     "@octokit/webhooks": "^14.1.3",
     "aws-lambda": "^1.0.7"
   },
diff --git a/lambdas/functions/webhook/src/sqs/index.test.ts b/lambdas/functions/webhook/src/sqs/index.test.ts
@@ -8,7 +8,9 @@ const mockSQS = {
   }),
 };
 vi.mock('@aws-sdk/client-sqs', () => ({
-  SQS: vi.fn().mockImplementation(() => mockSQS),
+  SQS: vi.fn().mockImplementation(function () {
+    return mockSQS;
+  }),
 }));
 vi.mock('@aws-github-runner/aws-ssm-util');
 
diff --git a/lambdas/libs/aws-powertools-util/package.json b/lambdas/libs/aws-powertools-util/package.json
@@ -20,9 +20,9 @@
     "body-parser": "^2.2.0"
   },
   "dependencies": {
-    "@aws-lambda-powertools/logger": "^2.27.0",
-    "@aws-lambda-powertools/metrics": "^2.27.0",
-    "@aws-lambda-powertools/tracer": "^2.27.0",
+    "@aws-lambda-powertools/logger": "^2.28.1",
+    "@aws-lambda-powertools/metrics": "^2.28.1",
+    "@aws-lambda-powertools/tracer": "^2.28.1",
     "aws-lambda": "^1.0.7"
   },
   "nx": {
diff --git a/lambdas/libs/aws-ssm-util/package.json b/lambdas/libs/aws-ssm-util/package.json
@@ -15,15 +15,15 @@
     "all": "yarn build && yarn format && yarn lint && yarn test"
   },
   "devDependencies": {
-    "@aws-sdk/types": "^3.914.0",
+    "@aws-sdk/types": "^3.921.0",
     "@types/aws-lambda": "^8.10.155",
     "@types/node": "^22.18.8",
     "aws-sdk-client-mock": "^4.1.0",
     "aws-sdk-client-mock-jest": "^4.1.0"
   },
   "dependencies": {
     "@aws-github-runner/aws-powertools-util": "*",
-    "@aws-sdk/client-ssm": "^3.917.0"
+    "@aws-sdk/client-ssm": "^3.921.0"
   },
   "nx": {
     "includedScripts": [
diff --git a/lambdas/package.json b/lambdas/package.json
@@ -33,8 +33,8 @@
     "@swc/helpers": "~0.5.17",
     "@trivago/prettier-plugin-sort-imports": "^5.2.2",
     "@typescript-eslint/eslint-plugin": "^8.46.0",
-    "@typescript-eslint/parser": "^8.46.1",
-    "@vitest/coverage-v8": "^3.2.4",
+    "@typescript-eslint/parser": "^8.46.2",
+    "@vitest/coverage-v8": "^4.0.5",
     "chalk": "^5.6.2",
     "eslint": "^9.38.0",
     "eslint-plugin-prettier": "5.5.4",
@@ -44,7 +44,7 @@
     "ts-node-dev": "^2.0.0",
     "typescript": "^5.9.3",
     "vite": "^7.1.11",
-    "vitest": "^3.2.4"
+    "vitest": "^4.0.5"
   },
   "packageManager": "yarn@4.3.1"
 }
diff --git a/lambdas/yarn.lock b/lambdas/yarn.lock
