From abf9b70137601922eb949986f22d688bff15dc54 Mon Sep 17 00:00:00 2001
From: Vraj Mohan <vraj@codeforamerica.org>
Date: Fri, 23 Feb 2024 07:10:29 -0800
Subject: [PATCH] Use STAGING_ prefix for "staging" secrets and vars

---
 .github/workflows/deploy-staging.yaml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/deploy-staging.yaml b/.github/workflows/deploy-staging.yaml
index 97a169ea..d2c4b167 100644
--- a/.github/workflows/deploy-staging.yaml
+++ b/.github/workflows/deploy-staging.yaml
@@ -26,23 +26,23 @@ jobs:
           aptible login \
             --email='${{ secrets.APTIBLE_USERNAME }}' \
             --password='${{ secrets.APTIBLE_PASSWORD }}'
-          git push --force ${{ vars.APTIBLE_REMOTE_URL }} ${GITHUB_SHA}:${{ vars.APTIBLE_REMOTE_BRANCH }}
+          git push --force ${{ vars.STAGING_APTIBLE_REMOTE_URL }} ${GITHUB_SHA}:${{ vars.STAGING_APTIBLE_REMOTE_BRANCH }}
           aptible deploy \
             --app sn-md-pilot-staging \
             --git-commitish ${GITHUB_SHA} \
-            'SPRING_DATASOURCE_URL=${{ secrets.SPRING_DATASOURCE_URL }}' \
-            'SPRING_DATASOURCE_USERNAME=${{ secrets.SPRING_DATASOURCE_USERNAME }}' \
-            'SPRING_DATASOURCE_PASSWORD=${{ secrets.SPRING_DATASOURCE_PASSWORD }}' \
+            'SPRING_DATASOURCE_URL=${{ secrets.STAGING_SPRING_DATASOURCE_URL }}' \
+            'SPRING_DATASOURCE_USERNAME=${{ secrets.STAGING_SPRING_DATASOURCE_USERNAME }}' \
+            'SPRING_DATASOURCE_PASSWORD=${{ secrets.STAGING_SPRING_DATASOURCE_PASSWORD }}' \
             'SPRING_PROFILES_ACTIVE=staging' \
-            'AWS_ACCESS_KEY=${{ secrets.AWS_ACCESS_KEY }}' \
-            'AWS_BUCKET=${{ vars.AWS_BUCKET }}' \
-            'AWS_CMK=${{ secrets.AWS_CMK }}' \
-            'AWS_SECRET_KEY=${{ secrets.AWS_SECRET_KEY }}' \
-            'MAILGUN_KEY=${{ secrets.MAILGUN_KEY }}' \
-            'MIXPANEL_API_KEY=${{ secrets.MIXPANEL_API_KEY }}' \
+            'AWS_ACCESS_KEY=${{ secrets.STAGING_AWS_ACCESS_KEY }}' \
+            'AWS_BUCKET=${{ vars.STAGING_AWS_BUCKET }}' \
+            'AWS_CMK=${{ secrets.STAGING_AWS_CMK }}' \
+            'AWS_SECRET_KEY=${{ secrets.STAGING_AWS_SECRET_KEY }}' \
+            'MAILGUN_KEY=${{ secrets.STAGING_MAILGUN_KEY }}' \
+            'MIXPANEL_API_KEY=${{ secrets.STAGING_MIXPANEL_API_KEY }}' \
             'SMARTY_AUTH_ID=${{ secrets.SMARTY_AUTH_ID }}' \
             'SMARTY_AUTH_TOKEN=${{ secrets.SMARTY_AUTH_TOKEN }}' \
-            'ENCRYPTION_KEYSET=${{ secrets.ENCRYPTION_KEYSET }}' \
+            'ENCRYPTION_KEYSET=${{ secrets.STAGING_ENCRYPTION_KEYSET }}' \
             'DEFAULT_LOCALE=en' \
             'demo=true' \
             'FORCE_SSL=true'