Merge pull request #1626 from philips-labs/develop

Release

Author: npalm

.github/workflows/release.yml

@@ -5,6 +5,7 @@ on:
     branches:
       - master
       - develop
+  workflow_dispatch:
 
 jobs:
   prepare:

.release/package.json

@@ -6,13 +6,13 @@
   },
   "author": "Niek Palm",
   "devDependencies": {
-    "@semantic-release/changelog": "^5.0.1",
-    "@semantic-release/commit-analyzer": "^8.0.1",
-    "@semantic-release/exec": "^5.0.0",
-    "@semantic-release/git": "^9.0.0",
-    "@semantic-release/github": "^7.2.0",
-    "@semantic-release/release-notes-generator": "^9.0.1",
-    "conventional-changelog-conventionalcommits": "^4.5.0",
-    "semantic-release": "^17.3.9"
+    "@semantic-release/changelog": "^6.0.1",
+    "@semantic-release/commit-analyzer": "^9.0.2",
+    "@semantic-release/exec": "^6.0.3",
+    "@semantic-release/git": "^10.0.1",
+    "@semantic-release/github": "^8.0.2",
+    "@semantic-release/release-notes-generator": "^10.0.3",
+    "conventional-changelog-conventionalcommits": "^4.6.3",
+    "semantic-release": "^18.0.1"
   }
 }

.release/yarn.lock

@@ -509,6 +509,6 @@ This module is part of the Philips Forest.
 
 ```
 
-Talk to the forestkeepers in the `forest`-channel on Slack.
+Talk to the forestkeepers in the `runners`-channel on Slack.
 
 [![Slack](https://img.shields.io/badge/Slack-4A154B?style=for-the-badge&logo=slack&logoColor=white)](https://join.slack.com/t/philips-software/shared_invite/zt-xecw65v5-i1531hGP~mdVwgxLFx7ckg)

README.md

@@ -7,10 +7,10 @@ packer {
   }
 }
 
-variable "action_runner_url" {
-  description = "The URL to the tarball of the action runner"
+variable "runner_version" {
+  description = "The version (no v prefix) of the runner software to install https://github.com/actions/runner/releases"
   type        = string
-  default     = "https://github.com/actions/runner/releases/download/v2.284.0/actions-runner-linux-x64-2.284.0.tar.gz"
+  default     = "2.286.0"
 }
 
 variable "region" {
@@ -19,10 +19,41 @@ variable "region" {
   default     = "eu-west-1"
 }
 
+variable "security_group_id" {
+  description = "The ID of the security group Packer will associate with the builder to enable access"
+  type        = string
+  default     = null
+}
+
+variable "subnet_id" {
+  description = "If using VPC, the ID of the subnet, such as subnet-12345def, where Packer will launch the EC2 instance. This field is required if you are using an non-default VPC"
+  type        = string
+  default     = null
+}
+
+variable "instance_type" {
+  description = "The instance type Packer will use for the builder"
+  type        = string
+  default     = "m3.medium"
+}
+
+variable "root_volume_size_gb" {
+  type    = number
+  default = 8
+}
+
+variable "tags" {
+  description = "Additional tags to add globally"
+  type        = map(string)
+  default     = {}
+}
+
 source "amazon-ebs" "githubrunner" {
-  ami_name      = "github-runner-amzn2-x86_64-${formatdate("YYYYMMDDhhmm", timestamp())}"
-  instance_type = "m3.medium"
-  region        = var.region
+  ami_name          = "github-runner-amzn2-x86_64-${formatdate("YYYYMMDDhhmm", timestamp())}"
+  instance_type     = var.instance_type
+  region            = var.region
+  security_group_id = var.security_group_id
+  subnet_id         = var.subnet_id
   source_ami_filter {
     filters = {
       name                = "amzn2-ami-hvm-2.*-x86_64-ebs"
@@ -33,10 +64,18 @@ source "amazon-ebs" "githubrunner" {
     owners      = ["137112412989"]
   }
   ssh_username = "ec2-user"
-  tags = {
-    OS_Version    = "amzn2"
-    Release       = "Latest"
-    Base_AMI_Name = "{{ .SourceAMIName }}"
+  tags = merge(
+    var.tags,
+    {
+      OS_Version    = "amzn2"
+      Release       = "Latest"
+      Base_AMI_Name = "{{ .SourceAMIName }}"
+  })
+
+  launch_block_device_mappings {
+    device_name = "/dev/xvda"
+    volume_size = "${var.root_volume_size_gb}"
+    volume_type = "gp3"
   }
 }
 
@@ -58,16 +97,24 @@ build {
     ]
   }
 
-  provisioner "shell" {
-    environment_vars = [
-      "RUNNER_TARBALL_URL=${var.action_runner_url}"
-    ]
-    inline = [templatefile("../install-runner.sh", {
+  provisioner "file" {
+    content = templatefile("../install-runner.sh", {
       install_runner = templatefile("../../modules/runners/templates/install-runner.sh", {
         ARM_PATCH                       = ""
         S3_LOCATION_RUNNER_DISTRIBUTION = ""
       })
-    })]
+    })
+    destination = "/tmp/install-runner.sh"
+  }
+
+  provisioner "shell" {
+    environment_vars = [
+      "RUNNER_TARBALL_URL=https://github.com/actions/runner/releases/download/v${var.runner_version}/actions-runner-linux-x64-${var.runner_version}.tar.gz"
+    ]
+    inline = [
+      "sudo chmod +x /tmp/install-runner.sh",
+      "sudo RUNNER_TARBALL_URL=$RUNNER_TARBALL_URL /tmp/install-runner.sh"
+    ]
   }
 
   provisioner "file" {

images/linux-amzn2/github_agent.linux.pkr.hcl

@@ -3,5 +3,10 @@
   "singleQuote": true,
   "trailingComma": "all",
   "semi": true,
-}
-  
+  "importOrderSeparation": true,
+  "importOrderSortSpecifiers": true,
+  "importOrder": [
+    "<THIRD_PARTY_MODULES>",
+    "^[./]"
+  ]
+}

modules/runner-binaries-syncer/lambdas/runner-binaries-syncer/.prettierrc

@@ -16,6 +16,7 @@
   },
   "devDependencies": {
     "@octokit/rest": "^18.12.0",
+    "@trivago/prettier-plugin-sort-imports": "^3.1.1",
     "@types/jest": "^27.4.0",
     "@types/node": "^17.0.8",
     "@types/request": "^2.48.8",
@@ -36,4 +37,4 @@
     "axios": "^0.24.0",
     "tslog": "^3.3.1"
   }
-}
+}

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

@@ -1,7 +1,8 @@
-import { sync } from './syncer/syncer';
-import { handler } from './lambda';
 import { mocked } from 'jest-mock';
 
+import { handler } from './lambda';
+import { sync } from './syncer/syncer';
+
 jest.mock('./syncer/syncer');
 
 describe('Test download sync wrapper.', () => {

modules/runner-binaries-syncer/lambdas/runner-binaries-syncer/src/lambda.test.ts

@@ -1,5 +1,5 @@
-import { sync } from './syncer/syncer';
 import { logger } from './syncer/logger';
+import { sync } from './syncer/syncer';
 
 // eslint-disable-next-line
 export async function handler(event: any, context: any): Promise<void> {

modules/runner-binaries-syncer/lambdas/runner-binaries-syncer/src/lambda.ts

@@ -1,5 +1,5 @@
-import { sync } from './syncer/syncer';
 import { logger } from './syncer/logger';
+import { sync } from './syncer/syncer';
 
 sync()
   .then()