fix: fix runner owner logic

Author: edersonbrilhante

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

@@ -314,6 +314,7 @@ export async function scaleUp(payloads: ActionRequestMessageSQS[]): Promise<stri
   type MessagesWithClient = {
     messages: ActionRequestMessageSQS[];
     githubInstallationClient: Octokit;
+    runnerOwner: string;
   };
 
   const validMessages = new Map<string, MessagesWithClient>();
@@ -343,8 +344,9 @@ export async function scaleUp(payloads: ActionRequestMessageSQS[]): Promise<stri
       continue;
     }
 
-    let key = enableOrgLevel ? payload.repositoryOwner : `${payload.repositoryOwner}/${payload.repositoryName}`;
+    const runnerOwner = enableOrgLevel ? payload.repositoryOwner : `${payload.repositoryOwner}/${payload.repositoryName}`;
 
+    let key = runnerOwner;
     if (dynamicEc2ConfigEnabled && labels?.length) {
       const requestedDynamicEc2Config = labels.find((l) => l.startsWith('ghr-ec2-'))?.slice('ghr-ec2-'.length);
 
@@ -366,6 +368,7 @@ export async function scaleUp(payloads: ActionRequestMessageSQS[]): Promise<stri
       entry = {
         messages: [],
         githubInstallationClient,
+        runnerOwner: runnerOwner,
       };
 
       validMessages.set(key, entry);
@@ -387,15 +390,17 @@ export async function scaleUp(payloads: ActionRequestMessageSQS[]): Promise<stri
 
   logger.info(`Received events`);
 
-  for (const [group, { githubInstallationClient, messages }] of validMessages.entries()) {
+  for (const [group, { githubInstallationClient, messages, runnerOwner }] of validMessages.entries()) {
     // Work out how much we want to scale up by.
     let scaleUp = 0;
 
     if (messages.length > 0 && dynamicEc2ConfigEnabled) {
-      logger.info('Dynamic EC2 config enabled, processing labels');
+      logger.info('Dynamic EC2 config enabled, processing labels', {labels: messages[0].labels});
 
       const ec2Labels =
-        messages[0].labels?.filter(l => l.startsWith('ghr-ec2-')) ?? [];
+        messages[0].labels
+          ?.map(l => l.trim())
+          .filter(l => l.startsWith('ghr-ec2-')) ?? [];
 
       logger.info('EC2 labels detected', { ec2Labels });
 
@@ -454,7 +459,7 @@ export async function scaleUp(payloads: ActionRequestMessageSQS[]): Promise<stri
 
     // Don't call the EC2 API if we can create an unlimited number of runners.
     const currentRunners =
-      maximumRunners === -1 ? 0 : (await listEC2Runners({ environment, runnerType, runnerOwner: group })).length;
+      maximumRunners === -1 ? 0 : (await listEC2Runners({ environment, runnerType, runnerOwner: runnerOwner })).length;
 
     logger.info('Current runners', {
       currentRunners,
@@ -500,7 +505,7 @@ export async function scaleUp(payloads: ActionRequestMessageSQS[]): Promise<stri
         runnerLabels,
         runnerGroup,
         runnerNamePrefix,
-        runnerOwner: group,
+        runnerOwner: runnerOwner,
         runnerType,
         disableAutoUpdate,
         ssmTokenPath,

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

@@ -103,6 +103,7 @@ describe('Dispatcher', () => {
         installationId: 0,
         queueId: runnerConfig[0].id,
         repoOwnerType: 'Organization',
+        labels: ['self-hosted', 'Test']
       });
     });
 
@@ -150,6 +151,7 @@ describe('Dispatcher', () => {
         installationId: 0,
         queueId: 'match',
         repoOwnerType: 'Organization',
+        labels: ['self-hosted', 'match'],
       });
     });
 

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

@@ -56,6 +56,7 @@ async function handleWorkflowJob(
         installationId: body.installation?.id ?? 0,
         queueId: queue.id,
         repoOwnerType: body.repository.owner.type,
+        labels: body.workflow_job.labels,
       });
       logger.info(
         `Successfully dispatched job for ${body.repository.full_name} to the queue ${queue.id} - ` +