Merge pull request #1050 from philips-labs/develop

Release

Author: npalm

.release/yarn.lock

@@ -4282,9 +4282,9 @@ supports-hyperlinks@^2.1.0:
     supports-color "^7.0.0"
 
 tar@^4.4.10, tar@^4.4.12, tar@^4.4.13:
-  version "4.4.13"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
-  integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==
+  version "4.4.15"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.15.tgz#3caced4f39ebd46ddda4d6203d48493a919697f8"
+  integrity sha512-ItbufpujXkry7bHH9NpQyTXPbJ72iTlXgkBAYsAjDXk3Ds8t/3NfO5P4xZGy7u+sYuQUbimgzswX4uQIEeNVOA==
   dependencies:
     chownr "^1.1.1"
     fs-minipass "^1.2.5"

README.md

@@ -7,12 +7,17 @@ resource "random_password" "random" {
   length = 28
 }
 
-module "runners" {
-  source = "../../"
 
-  aws_region = local.aws_region
-  vpc_id     = module.vpc.vpc_id
-  subnet_ids = module.vpc.private_subnets
+################################################################################
+### Hybrid acccount
+################################################################################
+
+module "runners" {
+  source                          = "../../"
+  create_service_linked_role_spot = true
+  aws_region                      = local.aws_region
+  vpc_id                          = module.vpc.vpc_id
+  subnet_ids                      = module.vpc.private_subnets
 
   environment = local.environment
   tags = {

examples/default/main.tf

@@ -59,6 +59,7 @@ module "webhook" {
   lambda_zip                       = var.webhook_lambda_zip
   lambda_timeout                   = var.webhook_lambda_timeout
   logging_retention_in_days        = var.logging_retention_in_days
+  runner_extra_labels              = var.runner_extra_labels
 
   role_path                 = var.role_path
   role_permissions_boundary = var.role_permissions_boundary

main.tf

@@ -17,7 +17,7 @@
   "devDependencies": {
     "@octokit/rest": "^18.5.2",
     "@types/jest": "^26.0.22",
-    "@types/node": "^15.12.2",
+    "@types/node": "^16.4.12",
     "@types/request": "^2.48.4",
     "@typescript-eslint/eslint-plugin": "^4.28.0",
     "@typescript-eslint/parser": "^4.17.0",

modules/runner-binaries-syncer/lambdas/runner-binaries-syncer/package.json

@@ -25,7 +25,7 @@
     "eslint": "^7.22.0",
     "eslint-plugin-prettier": "3.4.0",
     "jest": "27.0.6",
-    "jest-mock-extended": "^1.0.13",
+    "jest-mock-extended": "^2.0.1",
     "moment-timezone": "^0.5.33",
     "nock": "^13.0.11",
     "prettier": "2.3.2",

modules/runner-binaries-syncer/lambdas/runner-binaries-syncer/yarn.lock

@@ -1,8 +1,7 @@
 import { scaleDown } from './scale-runners/scale-down';
 
-
 export function run(): void {
-    scaleDown();
+  scaleDown();
 }
 
 run();

modules/runners/lambdas/runners/package.json

@@ -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();

modules/runners/lambdas/runners/src/local-down.ts

@@ -1,8 +1,10 @@
 import { createOctoClient, createGithubAuth } from './gh-auth';
 import nock from 'nock';
 import { createAppAuth } from '@octokit/auth-app';
+
 import { StrategyOptions } from '@octokit/auth-app/dist-types/types';
 import { getParameterValue } from './ssm';
+
 import { RequestInterface } from '@octokit/types';
 import { mock, MockProxy } from 'jest-mock-extended';
 import { request } from '@octokit/request';
@@ -23,7 +25,6 @@ const PARAMETER_GITHUB_APP_CLIENT_SECRET_NAME = `/actions-runner/${ENVIRONMENT}/
 
 const mockedGet = mocked(getParameterValue);
 
-
 beforeEach(() => {
   jest.resetModules();
   jest.clearAllMocks();
@@ -93,8 +94,7 @@ describe('Test createGithubAuth', () => {
 
     const mockedAuth = jest.fn();
     mockedAuth.mockResolvedValue({ token });
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    mockedCreatAppAuth.mockImplementation((authOptions: StrategyOptions) => {
+    mockedCreatAppAuth.mockImplementation(() => {
       return mockedAuth;
     });
 
@@ -184,8 +184,7 @@ describe('Test createGithubAuth', () => {
       .mockResolvedValueOnce(GITHUB_APP_CLIENT_SECRET);
     const mockedAuth = jest.fn();
     mockedAuth.mockResolvedValue({ token });
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    mockedCreatAppAuth.mockImplementation((authOptions: StrategyOptions) => {
+    mockedCreatAppAuth.mockImplementation(() => {
       return mockedAuth;
     });