Merge branch 'main' into feat-custom-scale-error

Author: npalm

lambdas/functions/ami-housekeeper/package.json

@@ -26,8 +26,8 @@
   "dependencies": {
     "@aws-github-runner/aws-powertools-util": "*",
     "@aws-github-runner/aws-ssm-util": "*",
-    "@aws-sdk/client-ec2": "^3.943.0",
-    "@aws-sdk/client-ssm": "^3.943.0",
+    "@aws-sdk/client-ec2": "^3.948.0",
+    "@aws-sdk/client-ssm": "^3.948.0",
     "cron-parser": "^5.4.0"
   },
   "nx": {

lambdas/functions/control-plane/package.json

@@ -33,8 +33,8 @@
     "@aws-github-runner/aws-powertools-util": "*",
     "@aws-github-runner/aws-ssm-util": "*",
     "@aws-lambda-powertools/parameters": "^2.29.0",
-    "@aws-sdk/client-ec2": "^3.943.0",
-    "@aws-sdk/client-sqs": "^3.943.0",
+    "@aws-sdk/client-ec2": "^3.948.0",
+    "@aws-sdk/client-sqs": "^3.948.0",
     "@middy/core": "^6.4.5",
     "@octokit/auth-app": "8.1.2",
     "@octokit/core": "7.0.6",

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

@@ -28,8 +28,8 @@
   },
   "dependencies": {
     "@aws-github-runner/aws-powertools-util": "*",
-    "@aws-sdk/client-s3": "^3.943.0",
-    "@aws-sdk/lib-storage": "^3.943.0",
+    "@aws-sdk/client-s3": "^3.948.0",
+    "@aws-sdk/lib-storage": "^3.948.0",
     "@middy/core": "^6.4.5",
     "@octokit/rest": "22.0.1",
     "axios": "^1.13.2"

lambdas/functions/termination-watcher/package.json

@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "@aws-github-runner/aws-powertools-util": "*",
-    "@aws-sdk/client-ec2": "^3.943.0",
+    "@aws-sdk/client-ec2": "^3.948.0",
     "@middy/core": "^6.4.5"
   },
   "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.943.0",
+    "@aws-sdk/client-eventbridge": "^3.948.0",
     "@octokit/webhooks-types": "^7.6.1",
     "@types/aws-lambda": "^8.10.155",
     "@types/express": "^5.0.3",
@@ -30,11 +30,11 @@
   "dependencies": {
     "@aws-github-runner/aws-powertools-util": "*",
     "@aws-github-runner/aws-ssm-util": "*",
-    "@aws-sdk/client-sqs": "^3.943.0",
+    "@aws-sdk/client-sqs": "^3.948.0",
     "@middy/core": "^6.4.5",
     "@octokit/rest": "22.0.1",
     "@octokit/types": "^16.0.0",
-    "@octokit/webhooks": "^14.1.3",
+    "@octokit/webhooks": "^14.2.0",
     "aws-lambda": "^1.0.7"
   },
   "nx": {

lambdas/functions/webhook/src/runners/dispatch.ts

@@ -36,6 +36,12 @@ async function handleWorkflowJob(
       body: `Workflow job not queued, not dispatching to queue.`,
     };
   }
+
+  logger.debug(
+    `Processing workflow job event - Repository: ${body.repository.full_name}, ` +
+      `Job ID: ${body.workflow_job.id}, Job Name: ${body.workflow_job.name}, ` +
+      `Run ID: ${body.workflow_job.run_id}, Labels: ${JSON.stringify(body.workflow_job.labels)}`,
+  );
   // sort the queuesConfig by order of matcher config exact match, with all true matches lined up ahead.
   matcherConfig.sort((a, b) => {
     return a.matcherConfig.exactMatch === b.matcherConfig.exactMatch ? 0 : a.matcherConfig.exactMatch ? -1 : 1;
@@ -51,7 +57,10 @@ async function handleWorkflowJob(
         queueId: queue.id,
         repoOwnerType: body.repository.owner.type,
       });
-      logger.info(`Successfully dispatched job for ${body.repository.full_name} to the queue ${queue.id}`);
+      logger.info(
+        `Successfully dispatched job for ${body.repository.full_name} to the queue ${queue.id} - ` +
+          `Job ID: ${body.workflow_job.id}, Job Name: ${body.workflow_job.name}, Run ID: ${body.workflow_job.run_id}`,
+      );
       return {
         statusCode: 201,
         body: `Successfully queued job for ${body.repository.full_name} to the queue ${queue.id}`,
@@ -61,7 +70,9 @@ async function handleWorkflowJob(
   const notAcceptedErrorMsg = `Received event contains runner labels '${body.workflow_job.labels}' from '${
     body.repository.full_name
   }' that are not accepted.`;
-  logger.warn(notAcceptedErrorMsg);
+  logger.warn(
+    `${notAcceptedErrorMsg} - Job ID: ${body.workflow_job.id}, Job Name: ${body.workflow_job.name}, Run ID: ${body.workflow_job.run_id}`,
+  );
   return { statusCode: 202, body: notAcceptedErrorMsg };
 }
 

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

@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@aws-github-runner/aws-powertools-util": "*",
-    "@aws-sdk/client-ssm": "^3.943.0"
+    "@aws-sdk/client-ssm": "^3.948.0"
   },
   "nx": {
     "includedScripts": [