From deef522f2550f405f2b589ef35779c78812966fa Mon Sep 17 00:00:00 2001
From: Bart Louwers <bart@emeel.net>
Date: Tue, 25 Apr 2023 20:23:43 +0200
Subject: [PATCH] Upload Linux render tests in separate unprivileged workflow
 (#1069)

---
 .github/workflows/linux-ci.yml                | 32 ++-------
 .../workflows/upload-render-test-results.yml  | 66 +++++++++++++++++++
 2 files changed, 70 insertions(+), 28 deletions(-)
 create mode 100644 .github/workflows/upload-render-test-results.yml

diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml
index 93fc6be32..c608fae65 100644
--- a/.github/workflows/linux-ci.yml
+++ b/.github/workflows/linux-ci.yml
@@ -13,11 +13,6 @@ on:
       - "CMakeLists.txt"
       - metrics/linux-gcc8-release-style.json
 
-# https://docs.github.com/en/actions/deployment/security-hardening-your-deployments/configuring-openid-connect-in-amazon-web-services
-permissions:
-  id-token: write # This is required for requesting the JWT (AWS)
-  contents: read  # This is required for actions/checkout (AWS)
-
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   # INFO: We are cancelling the concurrency group if the change is on PR. For workflow dispatch, this will not work.
@@ -121,27 +116,8 @@ jobs:
         id: render_test
         run: xvfb-run -a ./mbgl-render-test-runner --manifestPath=metrics/linux-gcc8-release-style.json
 
-      - name: Configure AWS Credentials
-        if: ${{ steps.render_test.outcome == 'failure' }}
-        uses: aws-actions/configure-aws-credentials@v2
+      - name: Upload render test result
+        uses: actions/upload-artifact@v3
         with:
-          aws-region: us-west-2
-          role-to-assume: ${{ vars.OIDC_AWS_ROLE_TO_ASSUME }}
-          role-session-name: ${{ github.run_id	}}
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-      
-      - name: Upload render test results to S3
-        if: ${{ steps.render_test.outcome == 'failure' }}
-        id: upload_render_test_results
-        run: |
-          aws s3 cp metrics/linux-gcc8-release-style.html \
-            s3://maplibre-native-test-artifacts/${{ github.run_id	}}-linux-gcc8-release-style.html \
-            --expires "$(date -d '+30 days' --utc +'%Y-%m-%dT%H:%M:%SZ')
-
-      - name: Make comment with test results
-        if: ${{ steps.upload_render_test_results.outcome == 'success' }}
-        uses: thollander/actions-comment-pull-request@v2
-        with:
-          message: |
-            Test results at https://maplibre-native-test-artifacts.s3.eu-central-1.amazonaws.com/${{ github.run_id }}-linux-gcc8-release-style.html
+          name: render-test-result
+          path: metrics/linux-gcc8-release-style.html
diff --git a/.github/workflows/upload-render-test-results.yml b/.github/workflows/upload-render-test-results.yml
new file mode 100644
index 000000000..8ea27cce1
--- /dev/null
+++ b/.github/workflows/upload-render-test-results.yml
@@ -0,0 +1,66 @@
+name: upload-render-test-results
+
+on:
+  workflow_run:
+    workflows: [linux-ci]
+    types:
+      - completed
+
+jobs:
+  upload-render-test-results:
+    runs-on: ubuntu-22.04
+    if: ${{ github.event.workflow_run.pull_requests.length === 1 }}
+    steps:
+      # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#workflow_run
+      - name: 'Download render-test-result artifact'
+        uses: actions/github-script@v6
+        with:
+          script: |
+            let allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({
+               owner: context.repo.owner,
+               repo: context.repo.repo,
+               run_id: context.payload.workflow_run.id,
+            });
+            let matchArtifact = allArtifacts.data.artifacts.filter((artifact) => {
+              return artifact.name == "render-test-result"
+            })[0];
+            let download = await github.rest.actions.downloadArtifact({
+               owner: context.repo.owner,
+               repo: context.repo.repo,
+               artifact_id: matchArtifact.id,
+               archive_format: 'zip',
+            });
+            let fs = require('fs');
+            fs.writeFileSync(`${process.env.GITHUB_WORKSPACE}/render-test-result.zip`, Buffer.from(download.data));
+
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v2
+        with:
+          aws-region: us-west-2
+          role-to-assume: ${{ vars.OIDC_AWS_ROLE_TO_ASSUME }}
+          role-session-name: ${{ github.run_id	}}
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+
+      - name: 'Unzip render-test-result artifact'
+        run: unzip render-test-result.zip
+
+      - name: Upload render test results to S3
+        id: upload_render_test_results
+        run: |
+          aws s3 cp linux-gcc8-release-style.html \
+            s3://maplibre-native-test-artifacts/${{ github.run_id	}}-linux-gcc8-release-style.html \
+            --expires "$(date -d '+30 days' --utc +'%Y-%m-%dT%H:%M:%SZ')
+
+      - name: 'Leave comment on PR with test results'
+        uses: actions/github-script@v6
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            let fs = require('fs');
+            await github.rest.issues.createComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number:  context.payload.workflow_run.pull_requests[0].number,
+              body: `Test results at https://maplibre-native-test-artifacts.s3.eu-central-1.amazonaws.com/${context.runId}-linux-gcc8-release-style.html`
+            });