Feature/runners lambdas add env to filter (#10)

* Add environment to filter

* Add environment to filter (fix)

Author: npalm

modules/runners/lambdas/scale-runners/src/scale-runners/handler.test.ts

@@ -91,7 +91,10 @@ describe('handler', () => {
 
     it('gets the current org level runners', async () => {
       await handle('aws:sqs', TEST_DATA);
-      expect(listRunners).toBeCalledWith({ repoName: undefined });
+      expect(listRunners).toBeCalledWith({
+        environment: 'unit-test-environment',
+        repoName: undefined,
+      });
     });
 
     it('does not create a token when maximum runners has been reached', async () => {
@@ -126,7 +129,10 @@ describe('handler', () => {
 
     it('gets the current repo level runners', async () => {
       await handle('aws:sqs', TEST_DATA);
-      expect(listRunners).toBeCalledWith({ repoName: `${TEST_DATA.repositoryOwner}/${TEST_DATA.repositoryName}` });
+      expect(listRunners).toBeCalledWith({
+        environment: 'unit-test-environment',
+        repoName: `${TEST_DATA.repositoryOwner}/${TEST_DATA.repositoryName}`,
+      });
     });
 
     it('does not create a token when maximum runners has been reached', async () => {

modules/runners/lambdas/scale-runners/src/scale-runners/handler.ts

@@ -51,6 +51,7 @@ export const handle = async (eventSource: string, payload: ActionRequestMessage)
 
   if (queuedWorkflows.data.total_count > 0) {
     const currentRunners = await listRunners({
+      environment: environment,
       repoName: enableOrgLevel ? undefined : `${payload.repositoryOwner}/${payload.repositoryName}`,
     });
     console.info(

modules/runners/lambdas/scale-runners/src/scale-runners/runners.ts

@@ -10,6 +10,7 @@ export interface RunnerInfo {
 export interface ListRunnerFilters {
   repoName?: string;
   orgName?: string;
+  environment?: string;
 }
 
 export async function listRunners(filters: ListRunnerFilters | undefined = undefined): Promise<RunnerInfo[]> {
@@ -19,6 +20,9 @@ export async function listRunners(filters: ListRunnerFilters | undefined = undef
     { Name: 'instance-state-name', Values: ['running', 'pending'] },
   ];
   if (filters) {
+    if (filters.environment !== undefined) {
+      ec2Filters.push({ Name: 'tag:Environment', Values: [filters.environment] });
+    }
     if (filters.repoName !== undefined) {
       ec2Filters.push({ Name: 'tag:Repo', Values: [filters.repoName] });
     }