Incorporate review comments and fix build issue

Author: aadrijnberg

CHANGELOG.md

@@ -1,16 +1,5 @@
 # Changelog
 
-## Unreleased
-
-### Bug fixes
-
-* Use consistent reporting back to caller in the Webhook lambda
-* In runners lambda wait for scaleDown to have finished before calling callback
-* In runner-binary-syncer support a runner binary having releases but no prereleases
-* When the runner-binary-syncer encounters an error report that back up to the lambda.ts so that it can report that back to the caller.
-* Fix incorrect or incomplete tests, and remove duplicate tests
-* Fix CONTRIBUTION.md, as the user should base on the develop branch instead of the master branch
-
 ### [0.15.1](https://github.com/philips-labs/terraform-aws-github-runner/compare/v0.15.0...v0.15.1) (2021-07-13)
 
 

CONTRIBUTING.md

@@ -63,7 +63,6 @@ Before you submit your merge request consider the following guidelines:
 
 * Create your patch, **including appropriate test cases**.
 * Run the test suite and ensure that all tests pass.
-* Add a line in the CHANGELOG.md under Unreleased. This will be used form generating the release notes.
 * Install [pre-commit hooks](https://pre-commit.com/). The hooks runs some basic checks and update the docs. The commit will run the hooks, you can invoke the hooks manually `pre-commit run --all-files` as well.
 * Commit your changes using a descriptive commit message.
 
@@ -137,5 +136,5 @@ Use the badge to sign-up.
 [![Slack](https://philips-software-slackin.now.sh/badge.svg)](https://philips-software-slackin.now.sh)
 
 [contribute]: CONTRIBUTING.md
-[github]: https://github.com/philips-lam/terraform-aws-github-runner/issues
+[github]: https://github.com/philips-labs/terraform-aws-github-runner/issues
 [slack]: https://philips-software.slack.com/home

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

@@ -35,14 +35,21 @@ export async function listRunners(filters: ListRunnerFilters | undefined = undef
     }
   }
   const runningInstances = await ec2.describeInstances({ Filters: ec2Filters }).promise();
-  const runners = runningInstances.Reservations?.flatMap((r) => (
-    r.Instances?.map((i) => ({
-        instanceId: i.InstanceId as string,
-        launchTime: i.LaunchTime,
-        repo: i.Tags?.find((e) => e.Key === 'Repo')?.Value,
-        org: i.Tags?.find((e) => e.Key === 'Org')?.Value,
-      })) ?? []
-  )) ?? [];
+  const runners: RunnerInfo[] = [];
+  if (runningInstances.Reservations) {
+    for (const r of runningInstances.Reservations) {
+      if (r.Instances) {
+        for (const i of r.Instances) {
+          runners.push({
+            instanceId: i.InstanceId as string,
+            launchTime: i.LaunchTime,
+            repo: i.Tags?.find((e) => e.Key === 'Repo')?.Value,
+            org: i.Tags?.find((e) => e.Key === 'Org')?.Value,
+          });
+        }
+      }
+    }
+  }
   return runners;
 }
 

modules/webhook/lambdas/webhook/src/webhook/handler.ts

@@ -27,7 +27,7 @@ export interface WorkflowJob {
   };
 }
 
-export const handle = async (headers: IncomingHttpHeaders, payload: string): Promise<number> => {
+export const handle = async (headers: IncomingHttpHeaders, payload: any): Promise<number> => {
   // ensure header keys lower case since github headers can contain capitals.
   for (const key in headers) {
     headers[key.toLowerCase()] = headers[key];