Merge pull request #2567 from philips-labs/next

chore: Add support multi-runners #2517
github-aws-runners · Dec 28, 2022 · 8e8c644 · 8e8c644
2 parents 0d2b294 + 5919612
commit 8e8c644
Show file tree

Hide file tree

Showing 140 changed files with 3,885 additions and 3,478 deletions.
diff --git a/.ci/build-yarn.sh b/.ci/build-yarn.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env bash -e
 
 # Build all the lambda's, output on the default place (inside the lambda module)
 
@@ -7,5 +7,5 @@ repoRoot=$(dirname $(dirname $(realpath ${BASH_SOURCE[0]})))
 
 for lambdaDir in ${lambdaSrcDirs[@]}; do
     cd "$repoRoot/${lambdaDir}"
-    yarn && yarn run dist
+    yarn && yarn run all && yarn run dist
 done
diff --git a/.github/lint/tflint.tfvars b/.github/lint/tflint.tfvars
@@ -0,0 +1,8 @@
+aws_region = null
+github_app = {
+  id             = "0"
+  key_base64     = "0"
+  webhook_secret = "0"
+}
+subnet_ids = []
+vpc_id     = null
diff --git a/.github/workflows/lambda-runner-binaries-syncer.yml b/.github/workflows/lambda-runner-binaries-syncer.yml
@@ -10,25 +10,6 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node: [16]
-    container:
-      image: node:${{ matrix.node }}
-    defaults:
-      run:
-        working-directory: modules/runner-binaries-syncer/lambdas/runner-binaries-syncer
-
-    steps:
-      - uses: actions/checkout@v3
-      - name: Install dependencies
-        run: yarn install
-      - name: Run prettier
-        run: yarn format-check
-      - name: Run linter
-        run: yarn lint
-      - name: Run tests
-        run: yarn test
-      - name: Build distribution
-        run: yarn build
+    uses: ./.github/workflows/lambda-template.yml
+    with:
+      working-directory: modules/runner-binaries-syncer/lambdas/runner-binaries-syncer
diff --git a/.github/workflows/lambda-runners.yml b/.github/workflows/lambda-runners.yml
@@ -10,29 +10,6 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node: [16]
-    container:
-      image: node:${{ matrix.node }}
-    defaults:
-      run:
-        working-directory: modules/runners/lambdas/runners
-
-    steps:
-      - uses: actions/checkout@v3
-      - name: Install dependencies
-        run: yarn install
-      - name: Run prettier
-        run: yarn format-check
-      - name: Run linter
-        run: yarn lint
-      - name: Run tests
-        run: yarn test
-      - name: Run two tests in isolation
-        run: |
-           yarn run test src/scale-runners/scale-up.test.ts -t 'scaleUp with GHES on org level creates a runner with labels in s specific group' --coverage=false
-           yarn run test src/scale-runners/scale-up.test.ts -t 'scaleUp with public GH on org level creates a runner with labels in s specific group' --coverage=false
-      - name: Build distribution
-        run: yarn build
+    uses: ./.github/workflows/lambda-template.yml
+    with:
+      working-directory: modules/runners/lambdas/runners
diff --git a/.github/workflows/lambda-template.yml b/.github/workflows/lambda-template.yml
@@ -0,0 +1,32 @@
+name: Lambda Syncer
+on:
+  workflow_call:
+    inputs:
+      working-directory:
+        required: true
+        type: string
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node: [18]
+    container:
+      image: node:${{ matrix.node }}
+    defaults:
+      run:
+        working-directory: ${{ inputs.working-directory }}/${{ inputs.image }}
+
+    steps:
+      - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # v3.2.0
+      - name: Install dependencies
+        run: yarn install
+      - name: Run prettier
+        run: yarn format-check
+      - name: Run linter
+        run: yarn lint
+      - name: Run tests
+        run: yarn test
+      - name: Build distribution
+        run: yarn build
diff --git a/.github/workflows/lambda-webhook.yml b/.github/workflows/lambda-webhook.yml
@@ -10,25 +10,6 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node: [16]
-    container:
-      image: node:${{ matrix.node }}
-    defaults:
-      run:
-        working-directory: modules/webhook/lambdas/webhook
-
-    steps:
-      - uses: actions/checkout@v3
-      - name: Install dependencies
-        run: yarn install
-      - name: Run prettier
-        run: yarn format-check
-      - name: Run linter
-        run: yarn lint
-      - name: Run tests
-        run: yarn test
-      - name: Build distribution
-        run: yarn build
+    uses: ./.github/workflows/lambda-template.yml
+    with:
+      working-directory: modules/webhook/lambdas/webhook
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -10,7 +10,7 @@ jobs:
   prepare:
     name: Create dist
     runs-on: ubuntu-latest
-    container: node:16
+    container: node:18
     strategy:
       matrix:
         lambda: ["modules/webhook/lambdas/webhook", "modules/runner-binaries-syncer/lambdas/runner-binaries-syncer", "modules/runners/lambdas/runners"]

diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml
@@ -7,14 +7,18 @@ on:
     paths-ignore:
       - "modules/*/lambdas/**"
 
+permissions:
+  contents: read
+  pull-requests: write
+
 env:
   AWS_REGION: eu-west-1
 jobs:
   verify_module:
     name: Verify module
     strategy:
       matrix:
-        terraform: [1.1.3, "latest"]
+        terraform: [1.3.2, "latest"]
     runs-on: ubuntu-latest
     container:
       image: hashicorp/terraform:${{ matrix.terraform }}
@@ -28,7 +32,7 @@ jobs:
           touch modules/runner-binaries-syncer/lambdas/runner-binaries-syncer/runner-binaries-syncer.zip
       - name: terraform init
         run: terraform init -get -backend=false -input=false
-      - if: contains(matrix.terraform, '1.1.')
+      - if: contains(matrix.terraform, '1.3.')
         name: check terraform formatting
         run: terraform fmt -recursive -check=true -write=false
       - if: contains(matrix.terraform, 'latest') # check formatting for the latest release but avoid failing the build
@@ -37,13 +41,21 @@ jobs:
         continue-on-error: true
       - name: validate terraform
         run: terraform validate
+      - if: contains(matrix.terraform, '1.3.')
+        name: Setup TFLint
+        uses: terraform-linters/setup-tflint@v2
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+      - if: contains(matrix.terraform, '1.3.')
+        name: Run TFLint
+        run: tflint -f compact
 
   verify_examples:
     name: Verify examples
     strategy:
       fail-fast: false
       matrix:
-        terraform: [1.0.11, 1.1.3, "latest"]
+        terraform: [1.3.0, "latest"]
         example:
           ["default", "ubuntu", "prebuilt", "arm64", "ephemeral", "windows"]
     defaults:
@@ -56,7 +68,7 @@ jobs:
       - uses: actions/checkout@v3
       - name: terraform init
         run: terraform init -get -backend=false -input=false
-      - if: contains(matrix.terraform, '1.1.')
+      - if: contains(matrix.terraform, '1.3.')
         name: check terraform formatting
         run: terraform fmt -recursive -check=true -write=false
       - if: contains(matrix.terraform, 'latest') # check formatting for the latest release but avoid failing the build
@@ -65,3 +77,31 @@ jobs:
         continue-on-error: true
       - name: validate terraform011
         run: terraform validate
+
+
+  verify_multi_runner_example:
+    name: Verify Multi-Runner examples
+    strategy:
+      fail-fast: false
+      matrix:
+        terraform: [1.3.2, "latest"]
+    defaults:
+      run:
+        working-directory: examples/multi-runner
+    runs-on: ubuntu-latest
+    container:
+      image: hashicorp/terraform:${{ matrix.terraform }}
+    steps:
+      - uses: actions/checkout@v3
+      - name: terraform init
+        run: terraform init -get -backend=false -input=false
+      - if: contains(matrix.terraform, '1.3.')
+        name: check terraform formatting
+        run: terraform fmt -recursive -check=true -write=false
+      - if: contains(matrix.terraform, 'latest') # check formatting for the latest release but avoid failing the build
+        name: check terraform formatting
+        run: terraform fmt -recursive -check=true -write=false
+        continue-on-error: true
+      - name: validate terraform
+        run: terraform validate
+
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,11 +1,11 @@
 repos:
   - repo: https://github.com/antonbabenko/pre-commit-terraform
-    rev: v1.52.0
+    rev: v1.76.0
     hooks:
       - id: terraform_fmt
       - id: terraform_tflint
       - id: terraform_docs
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.0.1
+    rev: v4.3.0
     hooks:
       - id: check-merge-conflict
diff --git a/.tflint.hcl b/.tflint.hcl
@@ -0,0 +1,7 @@
+config {
+  format = "compact"
+  module = true
+
+  varfile = [".github/lint/tflint.tfvars"]
+
+}