From ec4e522dc915963feed69008a77f8fe57e19217b Mon Sep 17 00:00:00 2001
From: Andrew Shumway <ashumway@flexion.us>
Date: Thu, 26 Sep 2024 10:33:46 -0600
Subject: [PATCH 1/2] Modify input to accepted argument

---
 .github/workflows/deploy.yml | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 407150428..17b597721 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -70,15 +70,7 @@ jobs:
         cf_password: ${{ secrets.CLOUDGOV_PASSWORD }}
         cf_org: gsa-tts-benefits-studio
         cf_space: notify-staging
-        push_arguments: >-
-          --vars-file deploy-config/staging.yml
-          --var DANGEROUS_SALT="$DANGEROUS_SALT"
-          --var SECRET_KEY="$SECRET_KEY"
-          --var ADMIN_CLIENT_SECRET="$ADMIN_CLIENT_SECRET"
-          --var NEW_RELIC_LICENSE_KEY="$NEW_RELIC_LICENSE_KEY"
-          --var NOTIFY_E2E_TEST_EMAIL="$NOTIFY_E2E_TEST_EMAIL"
-          --var NOTIFY_E2E_TEST_PASSWORD="$NOTIFY_E2E_TEST_PASSWORD"
-          --var LOGIN_DOT_GOV_REGISTRATION_URL="$LOGIN_DOT_GOV_REGISTRATION_URL"
+        cf_command: "push -f manifest.yml --vars-file deploy-config/staging.yml --var var-name=${{ secrets.DANGEROUS_SALT }} --var var-name=${{ secrets.SECRET_KEY }} --var var-name=${{ secrets.ADMIN_CLIENT_SECRET }} --var var-name=${{ secrets.NEW_RELIC_LICENSE_KEY }} --var var-name=${{ secrets.NOTIFY_E2E_TEST_EMAIL }} --var var-name=${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} --var var-name=${{ secrets.LOGIN_DOT_GOV_REGISTRATION_URL }} --strategy rolling"
 
     - name: Check for changes to templates.json
       id: changed-templates

From e0dab07300f8d13484f0b26d7518c977bb890146 Mon Sep 17 00:00:00 2001
From: Andrew Shumway <ashumway@flexion.us>
Date: Mon, 30 Sep 2024 09:24:50 -0600
Subject: [PATCH 2/2] Fix env var syntax

---
 .github/workflows/deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 17b597721..24ad41f99 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -70,7 +70,7 @@ jobs:
         cf_password: ${{ secrets.CLOUDGOV_PASSWORD }}
         cf_org: gsa-tts-benefits-studio
         cf_space: notify-staging
-        cf_command: "push -f manifest.yml --vars-file deploy-config/staging.yml --var var-name=${{ secrets.DANGEROUS_SALT }} --var var-name=${{ secrets.SECRET_KEY }} --var var-name=${{ secrets.ADMIN_CLIENT_SECRET }} --var var-name=${{ secrets.NEW_RELIC_LICENSE_KEY }} --var var-name=${{ secrets.NOTIFY_E2E_TEST_EMAIL }} --var var-name=${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} --var var-name=${{ secrets.LOGIN_DOT_GOV_REGISTRATION_URL }} --strategy rolling"
+        cf_command: "push -f manifest.yml --vars-file deploy-config/staging.yml --var var-name=${{ DANGEROUS_SALT }} --var var-name=${{ SECRET_KEY }} --var var-name=${{ ADMIN_CLIENT_SECRET }} --var var-name=${{ NEW_RELIC_LICENSE_KEY }} --var var-name=${{ NOTIFY_E2E_TEST_EMAIL }} --var var-name=${{ NOTIFY_E2E_TEST_PASSWORD }} --var var-name=${{ LOGIN_DOT_GOV_REGISTRATION_URL }} --strategy rolling"
 
     - name: Check for changes to templates.json
       id: changed-templates