From a2fd8da578c8707bc71dc6e63e1b4def77e5e370 Mon Sep 17 00:00:00 2001
From: Erica Portnoy <erica@eff.org>
Date: Fri, 24 Apr 2026 15:22:06 -0700
Subject: [PATCH] add back aws secrets but better

---
 .github/workflows/tox_steps.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/.github/workflows/tox_steps.yml b/.github/workflows/tox_steps.yml
index ec9232f5b..8d0c89daa 100644
--- a/.github/workflows/tox_steps.yml
+++ b/.github/workflows/tox_steps.yml
@@ -18,6 +18,8 @@ jobs:
     name: ${{ inputs.TOXENV }} ${{ inputs.IMAGE_NAME }}
     runs-on:
       - "${{ inputs.IMAGE_NAME }}"
+    env:
+      AWS_EC2_PEM_FILE: ${{ github.workspace }}/GHAKeyPair.pem
     steps:
     - name: Checkout
       uses: actions/checkout@v6.0.2
@@ -58,8 +60,17 @@ jobs:
       run: |-
         python3 tools/pip_install.py tox
       shell: bash
+    - name: Create test farm pem file
+      if: contains(inputs.TOXENV, 'test-farm')
+      env:
+        PEM_CONTENTS: "${{ secrets.AWS_TEST_FARM_PEM }}"
+      run: |-
+        echo "${PEM_CONTENTS}" >> $AWS_EC2_PEM_FILE
+      shell: bash
     - name: Run tox
       env:
+        AWS_ACCESS_KEY_ID: "${{ secrets.AWS_ACCESS_KEY_ID }}"
+        AWS_SECRET_ACCESS_KEY: "${{ secrets.AWS_SECRET_ACCESS_KEY }}"
         PIP_USE_PEP517: "${{ inputs.PIP_USE_PEP517 }}"
         TOXENV: "${{ inputs.TOXENV }}"
       run: |-