Updates after rebase

npalm · npalm · commit 105e554135da · 2021-08-05T11:14:09.000+02:00
diff --git a/examples/default/main.tf b/examples/default/main.tf
@@ -32,11 +32,11 @@ module "runners" {
     webhook_secret = random_password.random.result
   }
 
-  webhook_lambda_zip                = "lambdas-download/webhook.zip"
-  runner_binaries_syncer_lambda_zip = "lambdas-download/runner-binaries-syncer.zip"
-  runners_lambda_zip                = "lambdas-download/runners.zip"
-  enable_organization_runners       = false
-  runner_extra_labels               = "default,example"
+  # webhook_lambda_zip                = "lambdas-download/webhook.zip"
+  # runner_binaries_syncer_lambda_zip = "lambdas-download/runner-binaries-syncer.zip"
+  # runners_lambda_zip                = "lambdas-download/runners.zip"
+  enable_organization_runners = true
+  runner_extra_labels         = "default,example"
 
   # enable access to the runners via SSM
   enable_ssm_on_runners = true
diff --git a/modules/runners/lambdas/runners/src/local-down.ts b/modules/runners/lambdas/runners/src/local-down.ts
@@ -1,8 +1,7 @@
 import { scaleDown } from './scale-runners/scale-down';
 
-
 export function run(): void {
-    scaleDown();
+  scaleDown();
 }
 
 run();
diff --git a/modules/runners/lambdas/runners/src/local.ts b/modules/runners/lambdas/runners/src/local.ts
@@ -1,32 +1,38 @@
-import { scaleUp } from './scale-runners/scale-up';
+import { scaleUp, ActionRequestMessage } from './scale-runners/scale-up';
 
 const sqsEvent = {
-    Records: [
-        {
-            messageId: 'e8d74d08-644e-42ca-bf82-a67daa6c4dad',
-            // eslint-disable-next-line max-len
-            receiptHandle: 'AQEBCpLYzDEKq4aKSJyFQCkJduSKZef8SJVOperbYyNhXqqnpFG5k74WygVAJ4O0+9nybRyeOFThvITOaS21/jeHiI5fgaM9YKuI0oGYeWCIzPQsluW5CMDmtvqv1aA8sXQ5n2x0L9MJkzgdIHTC3YWBFLQ2AxSveOyIHwW+cHLIFCAcZlOaaf0YtaLfGHGkAC4IfycmaijV8NSlzYgDuxrC9sIsWJ0bSvk5iT4ru/R4+0cjm7qZtGlc04k9xk5Fu6A+wRxMaIyiFRY+Ya19ykcevQldidmEjEWvN6CRToLgclk=',
-            // eslint-disable-next-line max-len
-            body: { "id": 19072, "repositoryName": "ErrBud", "repositoryOwner": "ActionsTest", "eventType": "check_run", "installationId": 5 },
-            attributes: {
-                ApproximateReceiveCount: '1',
-                SentTimestamp: '1626450047230',
-                SequenceNumber: '18863115285800432640',
-                MessageGroupId: '19072',
-                SenderId: 'AROA5KW7SQ6TTB3PW6WPH:cicddev-webhook',
-                MessageDeduplicationId: '0c458eeb87b7f6d2607301268fd3bf33dd898a49ebd888754ff7db510c4bff1e',
-                ApproximateFirstReceiveTimestamp: '1626450077251'
-            },
-            messageAttributes: {},
-            md5OfBody: '4aef3bd70526e152e86426a0938cbec6',
-            eventSource: 'aws:sqs',
-            eventSourceARN: 'arn:aws:sqs:us-west-2:916370655143:cicddev-queued-builds.fifo',
-            awsRegion: 'us-west-2'
-        }
-    ]
+  Records: [
+    {
+      messageId: 'e8d74d08-644e-42ca-bf82-a67daa6c4dad',
+      receiptHandle:
+        // eslint-disable-next-line max-len
+        'AQEBCpLYzDEKq4aKSJyFQCkJduSKZef8SJVOperbYyNhXqqnpFG5k74WygVAJ4O0+9nybRyeOFThvITOaS21/jeHiI5fgaM9YKuI0oGYeWCIzPQsluW5CMDmtvqv1aA8sXQ5n2x0L9MJkzgdIHTC3YWBFLQ2AxSveOyIHwW+cHLIFCAcZlOaaf0YtaLfGHGkAC4IfycmaijV8NSlzYgDuxrC9sIsWJ0bSvk5iT4ru/R4+0cjm7qZtGlc04k9xk5Fu6A+wRxMaIyiFRY+Ya19ykcevQldidmEjEWvN6CRToLgclk=',
+      body: {
+        id: 19072,
+        repositoryName: 'ErrBud',
+        repositoryOwner: 'ActionsTest',
+        eventType: 'check_run',
+        installationId: 5,
+      },
+      attributes: {
+        ApproximateReceiveCount: '1',
+        SentTimestamp: '1626450047230',
+        SequenceNumber: '18863115285800432640',
+        MessageGroupId: '19072',
+        SenderId: 'AROA5KW7SQ6TTB3PW6WPH:cicddev-webhook',
+        MessageDeduplicationId: '0c458eeb87b7f6d2607301268fd3bf33dd898a49ebd888754ff7db510c4bff1e',
+        ApproximateFirstReceiveTimestamp: '1626450077251',
+      },
+      messageAttributes: {},
+      md5OfBody: '4aef3bd70526e152e86426a0938cbec6',
+      eventSource: 'aws:sqs',
+      eventSourceARN: 'arn:aws:sqs:us-west-2:916370655143:cicddev-queued-builds.fifo',
+      awsRegion: 'us-west-2',
+    },
+  ],
 };
 export function run(): void {
-    scaleUp(sqsEvent.Records[0].eventSource, sqsEvent.Records[0].body);
+  scaleUp(sqsEvent.Records[0].eventSource, sqsEvent.Records[0].body as ActionRequestMessage);
 }
 
 run();
diff --git a/modules/runners/lambdas/runners/src/scale-runners/gh-auth.ts b/modules/runners/lambdas/runners/src/scale-runners/gh-auth.ts
@@ -21,13 +21,12 @@ export async function createGithubAuth(
   authType: 'app' | 'installation',
   ghesApiUrl = '',
 ): Promise<AppAuthentication> {
-
   let authOptions: StrategyOptions = {
     appId: parseInt(await getParameterValue(process.env.PARAMETER_GITHUB_APP_ID_NAME)),
     privateKey: Buffer.from(
       await getParameterValue(process.env.PARAMETER_GITHUB_APP_KEY_BASE64_NAME),
-      'base64')
-      .toString(),
+      'base64',
+    ).toString(),
     clientId: await getParameterValue(process.env.PARAMETER_GITHUB_APP_CLIENT_ID_NAME),
     clientSecret: await getParameterValue(process.env.PARAMETER_GITHUB_APP_CLIENT_SECRET_NAME),
   };
diff --git a/modules/runners/lambdas/runners/src/scale-runners/modules.d.ts b/modules/runners/lambdas/runners/src/scale-runners/modules.d.ts
@@ -1,15 +1,15 @@
 declare namespace NodeJS {
-    export interface ProcessEnv {
-        ENVIRONMENT: string
-        SUBNET_IDS: string
-        GHES_URL: string
-        SCALE_DOWN_CONFIG: string
-        MINIMUM_RUNNING_TIME_IN_MINUTES: string
-        LAUNCH_TEMPLATE_NAME: string
-        AWS_REGION: string
-        PARAMETER_GITHUB_APP_CLIENT_ID_NAME: string
-        PARAMETER_GITHUB_APP_CLIENT_SECRET_NAME: string
-        PARAMETER_GITHUB_APP_ID_NAME: string
-        PARAMETER_GITHUB_APP_KEY_BASE64_NAME: string
-    }
+  export interface ProcessEnv {
+    ENVIRONMENT: string;
+    SUBNET_IDS: string;
+    GHES_URL: string;
+    SCALE_DOWN_CONFIG: string;
+    MINIMUM_RUNNING_TIME_IN_MINUTES: string;
+    LAUNCH_TEMPLATE_NAME: string;
+    AWS_REGION: string;
+    PARAMETER_GITHUB_APP_CLIENT_ID_NAME: string;
+    PARAMETER_GITHUB_APP_CLIENT_SECRET_NAME: string;
+    PARAMETER_GITHUB_APP_ID_NAME: string;
+    PARAMETER_GITHUB_APP_KEY_BASE64_NAME: string;
+  }
 }
diff --git a/modules/runners/lambdas/runners/src/scale-runners/runners.ts b/modules/runners/lambdas/runners/src/scale-runners/runners.ts
@@ -110,6 +110,6 @@ function getInstanceParams(
 }
 
 function getSubnet(): string {
-  const subnets = (process.env.SUBNET_IDS).split(',');
+  const subnets = process.env.SUBNET_IDS.split(',');
   return subnets[Math.floor(Math.random() * subnets.length)];
 }
diff --git a/modules/runners/lambdas/runners/src/scale-runners/scale-down.ts b/modules/runners/lambdas/runners/src/scale-runners/scale-down.ts
@@ -39,16 +39,16 @@ function createGitHubClientForRunnerFactory(): (runner: RunnerInfo, orgLevel: bo
     console.debug(`[createGitHubClientForRunner] Cache miss for ${key}`);
     const installationId = orgLevel
       ? (
-        await githubClient.apps.getOrgInstallation({
-          org: repo.repoOwner,
-        })
-      ).data.id
+          await githubClient.apps.getOrgInstallation({
+            org: repo.repoOwner,
+          })
+        ).data.id
       : (
-        await githubClient.apps.getRepoInstallation({
-          owner: repo.repoOwner,
-          repo: repo.repoName,
-        })
-      ).data.id;
+          await githubClient.apps.getRepoInstallation({
+            owner: repo.repoOwner,
+            repo: repo.repoName,
+          })
+        ).data.id;
     const ghAuth2 = await createGithubAuth(installationId, 'installation', ghesApiUrl);
     const octokit = await createOctoClient(ghAuth2.token, ghesApiUrl);
     cache.set(key, octokit);
@@ -82,12 +82,12 @@ function listGithubRunnersFactory(): (
     console.debug(`[listGithubRunners] Cache miss for ${key}`);
     const runners = enableOrgLevel
       ? await client.paginate(client.actions.listSelfHostedRunnersForOrg, {
-        org: repo.repoOwner,
-      })
+          org: repo.repoOwner,
+        })
       : await client.paginate(client.actions.listSelfHostedRunnersForRepo, {
-        owner: repo.repoOwner,
-        repo: repo.repoName,
-      });
+          owner: repo.repoOwner,
+          repo: repo.repoName,
+        });
     cache.set(key, runners);
 
     return runners;
@@ -110,14 +110,14 @@ async function removeRunner(
   try {
     const result = enableOrgLevel
       ? await githubAppClient.actions.deleteSelfHostedRunnerFromOrg({
-        runner_id: ghRunnerId,
-        org: repo.repoOwner,
-      })
+          runner_id: ghRunnerId,
+          org: repo.repoOwner,
+        })
       : await githubAppClient.actions.deleteSelfHostedRunnerFromRepo({
-        runner_id: ghRunnerId,
-        owner: repo.repoOwner,
-        repo: repo.repoName,
-      });
+          runner_id: ghRunnerId,
+          owner: repo.repoOwner,
+          repo: repo.repoName,
+        });
 
     if (result.status == 204) {
       await terminateRunner(ec2runner);
diff --git a/modules/webhook/webhook.tf b/modules/webhook/webhook.tf
@@ -12,12 +12,10 @@ resource "aws_lambda_function" "webhook" {
 
   environment {
     variables = {
-      ENVIRONMENT               = var.environment
-      KMS_KEY_ID                = var.encryption.kms_key_id
-      GITHUB_APP_WEBHOOK_SECRET = local.github_app_webhook_secret
-      SQS_URL_WEBHOOK           = var.sqs_build_queue.id
-      REPOSITORY_WHITE_LIST     = jsonencode(var.repository_white_list)
-      RUNNER_LABELS             = jsonencode(var.runner_extra_labels)
+      ENVIRONMENT           = var.environment
+      SQS_URL_WEBHOOK       = var.sqs_build_queue.id
+      REPOSITORY_WHITE_LIST = jsonencode(var.repository_white_list)
+      RUNNER_LABELS         = jsonencode(var.runner_extra_labels)
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,7 @@`
`1`	`1`	`import { scaleDown } from './scale-runners/scale-down';`
`2`	`2`
`3`		`-`
`4`	`3`	`export function run(): void {`
`5`		`- scaleDown();`
	`4`	`+ scaleDown();`
`6`	`5`	`}`
`7`	`6`
`8`	`7`	`run();`
Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,6 @@ function getInstanceParams(`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`function getSubnet(): string {`
`113`		`- const subnets = (process.env.SUBNET_IDS).split(',');`
	`113`	`+ const subnets = process.env.SUBNET_IDS.split(',');`
`114`	`114`	`return subnets[Math.floor(Math.random() * subnets.length)];`
`115`	`115`	`}`