From 2071e251defac247e651bda3a01704181b49af33 Mon Sep 17 00:00:00 2001
From: EarthlingDavey <15802017+EarthlingDavey@users.noreply.github.com>
Date: Fri, 6 Dec 2024 10:58:46 +0000
Subject: [PATCH] Update test.yml

---
 .github/workflows/test.yml | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2babe44..60757b8 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -14,14 +14,8 @@ jobs:
       run: |
         cp .env.ci .env
         docker compose run --rm \
-        -e JWT=${JWT} \
-        -e AWS_CLOUDFRONT_PRIVATE_KEY=${AWS_CLOUDFRONT_PRIVATE_KEY} \
-        -e AWS_CLOUDFRONT_PUBLIC_KEY=${AWS_CLOUDFRONT_PUBLIC_KEY} \
-        -e AWS_CLOUDFRONT_PUBLIC_KEYS_OBJECT=${AWS_CLOUDFRONT_PUBLIC_KEYS_OBJECT} \
+        -e JWT=${{ secrets.JWT }} \
+        -e AWS_CLOUDFRONT_PRIVATE_KEY="${{ secrets.TEST_AWS_CLOUDFRONT_PRIVATE_KEY }}" \
+        -e AWS_CLOUDFRONT_PUBLIC_KEY="${{ secrets.TEST_AWS_CLOUDFRONT_PUBLIC_KEY }}" \
+        -e AWS_CLOUDFRONT_PUBLIC_KEYS_OBJECT="${{ secrets.TEST_AWS_CLOUDFRONT_PUBLIC_KEYS_OBJECT }}" \
         spider sh -c "npm ci && npm run test"
-      env:
-        JWT: ${{ secrets.JWT }}
-        # Use mock AWS CloudFront keys, these do not grant permission to anything.
-        AWS_CLOUDFRONT_PRIVATE_KEY: ${{ secrets.TEST_AWS_CLOUDFRONT_PRIVATE_KEY }}
-        AWS_CLOUDFRONT_PUBLIC_KEY: ${{ secrets.TEST_AWS_CLOUDFRONT_PUBLIC_KEY }}
-        AWS_CLOUDFRONT_PUBLIC_KEYS_OBJECT: ${{ secrets.TEST_AWS_CLOUDFRONT_PUBLIC_KEYS_OBJECT }}