Merge pull request #2811 from philips-labs/develop

chore: sync develop to main

Author: npalm

Diff for: .github/workflows/release.yml

@@ -4,8 +4,7 @@ on:
   push:
     branches:
       - main
-      - develop
-  workflow_dispatch:
+      - refactor/release
 
 jobs:
   prepare:
@@ -15,6 +14,9 @@ jobs:
     strategy:
       matrix:
         lambda: ["modules/webhook/lambdas/webhook", "modules/runner-binaries-syncer/lambdas/runner-binaries-syncer", "modules/runners/lambdas/runners"]
+    permissions:
+      contents: read
+      actions: write
     steps:
       - name: Extract lambda name
         id: lambda
@@ -38,65 +40,59 @@ jobs:
     runs-on: ubuntu-latest
     needs:
       prepare
+    outputs:
+      upload_url: ${{ steps.release.outputs.upload_url }}
+      releases_created: ${{ steps.release.outputs.releases_created }}
+    permissions:
+      contents: write
+      issues: write
+      pull-requests: write
+      actions: write
     steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-          persist-credentials: false
-      - uses: actions/download-artifact@v3
-        with:
-          name: webhook
-          path: artifacts
-      - uses: actions/download-artifact@v3
-        with:
-          name: runners
-          path: artifacts
-      - uses: actions/download-artifact@v3
-        with:
-          name: runner-binaries-syncer
-          path: artifacts
-
       - name: Get installation token
         uses: npalm/[email protected]
-        id: app-token
+        id: token
         with:
           appId: ${{ secrets.FOREST_RELEASER_APP_ID }}
           appPrivateKeyBase64: ${{ secrets.FOREST_RELEASER_APP_PRIVATE_KEY_BASE64 }}
           appInstallationType: repo
           appInstallationValue: ${{ github.repository }}
 
-      - name: Dry run release
-        if: github.event_name != 'pull_request'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Read only token
-        run: |
-          cp .release/* .
-          yarn
-          yarn release -d --repositoryUrl https://x-access-token:[email protected]/$GITHUB_REPOSITORY.git
-
+      # bootstrap-sha and release-as needs to be removed after first release
       - name: Release
-        if: github.event_name != 'pull_request' && contains('refs/heads/main', github.ref)
-        env:
-          GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
-        run: |
-          cp .release/* .
-          yarn
-          yarn release --repositoryUrl https://x-access-token:[email protected]/$GITHUB_REPOSITORY.git
-          
-  provenance:
-    name: Generate provenance
-    runs-on: ubuntu-20.04
-    needs: 
-      release
-    if: startsWith(github.ref, 'refs/tags/')
+        id: release
+        uses: google-github-actions/release-please-action@5c07f8be172b1f6e90f9c35baf8184461b91b85f # ratchet:google-github-actions/release-please-action@v3
+        with:
+          default-branch: main
+          release-type: terraform-module
+          token: ${{ steps.token.outputs.token }}
+          last-release-sha: b404332ff8b401a5a8958317a69b9f849b794a16
+
+  assets:
+    name: upload assets
+    if: ${{ needs.release.outputs.releases_created }}
+    needs: release
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        asset: ["webhook", "runner-binaries-syncer", "runners"]
+    permissions:
+      contents: write
+      actions: read
 
     steps:
-      - name: Generate provenance for release
-        uses: philips-labs/[email protected]
+      - uses: actions/download-artifact@v3
         with:
-          artifact_path: release-assets
-          output_path: 'build.provenance'
-          tag_name: "${{ github.ref_name }}"
-        env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          name: ${{ matrix.asset }}
+          path: artifacts
 
+      - name: Upload Release Asset
+        id: upload-release-asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ needs.release.outputs.upload_url }}
+          asset_path: artifacts/${{ matrix.asset }}.zip
+          asset_name: ${{ matrix.asset }}.zip
+          asset_content_type: application/zip

Diff for: README.md

@@ -4,6 +4,8 @@
 
 This [Terraform](https://www.terraform.io/) module creates the required infrastructure needed to host [GitHub Actions](https://github.com/features/actions) self-hosted, auto-scaling runners on [AWS spot instances](https://aws.amazon.com/ec2/spot/). It provides the required logic to handle the life cycle for scaling up and down using a set of AWS Lambda functions. Runners are scaled down to zero to avoid costs when no workflows are active.
 
+> 📢 [Upcoming v2](https://github.com/philips-labs/terraform-aws-github-runner/issues/2517): We are busy with merging `next` back in to `main`. From that moment on we will not actively support v1. We will maintain for some moment a `v1` branch. Default PR's will go only back into main (`v2`). In case you woul like to get work explicit back in `v1` consider a PR to `v1`.
+
 > 📢 HELP WANTED: We are running the AWS self-hosted GitHub runners OS project in Philips Labs for over two years! And we are incredibly happy with all the feedback and contribution of the open-source community. In the next months we will speak at some conferences to share the solution and story of running this open-source project. Via [this questionaire](https://forms.office.com/r/j03CUzdLFp) we would like to gather  feedback from the community to use in our talks.
 
 - [Motivation](#motivation)

Diff for: modules/runner-binaries-syncer/lambdas/runner-binaries-syncer/package.json

@@ -19,13 +19,12 @@
     "@octokit/rest": "^19.0.5",
     "@trivago/prettier-plugin-sort-imports": "^4.0.0",
     "@types/jest": "^29.2.4",
-    "@types/node": "^18.11.14",
+    "@types/node": "^18.11.18",
     "@types/request": "^2.48.8",
-    "@typescript-eslint/eslint-plugin": "^5.46.1",
-    "@typescript-eslint/parser": "^5.46.1",
+    "@typescript-eslint/eslint-plugin": "^5.47.1",
+    "@typescript-eslint/parser": "^5.47.1",
     "@vercel/ncc": "^0.36.0",
-    "aws-sdk": "^2.1273.0",
-    "eslint": "^8.29.0",
+    "eslint": "^8.30.0",
     "eslint-plugin-prettier": "4.2.1",
     "jest": "^29.3",
     "jest-mock": "^29.3.1",
@@ -36,6 +35,7 @@
   },
   "dependencies": {
     "axios": "^1.2.1",
+    "aws-sdk": "^2.1283.0",
     "tslog": "^3.3.4"
   }
 }