Simplification following peer review

Author: stevebux

.github/actions/e2e-tests/action.yml

@@ -1,45 +1,17 @@
 name: E2E tests
 description: "Run end-to-end tests for this repo"
 
-inputs:
-  pr_number:
-      required: true
-      type: string
-
 runs:
   using: "composite"
 
   steps:
-    - name: Check if e2e tests should run
-      id: check_e2e
-      shell: bash
-      env:
-        GITHUB_TOKEN: ${{ env.GITHUB_TOKEN }}
-      run: |
-        if [[ -n "${{ inputs.pr_number }}" ]]; then
-          labels=$(gh pr view "${{ inputs.pr_number }}" --json labels --jq '.labels[].name' 2>/dev/null || echo "")
-
-          if echo "$labels" | grep -Fxq 'deploy-proxy'; then
-            echo "deploy-proxy label found; e2e tests will run."
-            echo "run_e2e=true" >> $GITHUB_OUTPUT
-          else
-            echo "deploy-proxy label not found; e2e tests will be skipped."
-            echo "run_e2e=false" >> $GITHUB_OUTPUT
-          fi
-        else
-          echo "Not a PR environment; e2e tests will run."
-          echo "run_e2e=true" >> $GITHUB_OUTPUT
-        fi
-
     - name: Install poetry and e2e test dependencies
-      if: steps.check_e2e.outputs.run_e2e == 'true'
       shell: bash
       run: |
         pipx install poetry
         cd tests/e2e-tests && poetry install
 
     - name: Run e2e tests
-      if: steps.check_e2e.outputs.run_e2e == 'true'
       shell: bash
       run: |
         echo "$INTERNAL_DEV_TEST_PEM" > "${GITHUB_WORKSPACE}/internal-dev-test-1.pem"

.github/workflows/cicd-1-pull-request.yaml

@@ -178,6 +178,7 @@ jobs:
       terraform_version: "${{ needs.metadata.outputs.terraform_version }}"
       version: "${{ needs.metadata.outputs.version }}"
       pr_number: ${{ needs.metadata.outputs.pr_number }}
+      proxy_deployed: "${{ needs.metadata.outputs.deploy_proxy }}"
     secrets: inherit
   publish-stage: # Recommended maximum execution time is 10 minutes
     name: "Publish stage"

.github/workflows/stage-4-acceptance.yaml

@@ -34,6 +34,10 @@ on:
       pr_number:
         required: true
         type: string
+      proxy_deployed:
+        description: "True if the APIM proxy was deployed"
+        required: true
+        type: string
 
 permissions:
   id-token: write
@@ -81,6 +85,7 @@ jobs:
   run-e2e-tests:
     name: Run End-to-End Tests
     runs-on: ubuntu-latest
+    if: inputs.proxy_deployed == 'true'
     steps:
       - uses: actions/checkout@v5.0.0
 
@@ -90,5 +95,3 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NON_PROD_API_KEY: ${{ secrets.NON_PROD_API_KEY }}
           INTERNAL_DEV_TEST_PEM: ${{ secrets.INTERNAL_DEV_TEST_PEM }}
-        with:
-          pr_number: ${{ inputs.pr_number }}