From f34020c9eed9bc9cd6a07ca47dee26e1738ba7af Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 19 Mar 2025 10:30:24 -0700
Subject: [PATCH 1/2] do a manifest.yml push to load new env variables

---
 .github/workflows/restage-apps.yml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/restage-apps.yml b/.github/workflows/restage-apps.yml
index 46fb88b88..3d35a46ce 100644
--- a/.github/workflows/restage-apps.yml
+++ b/.github/workflows/restage-apps.yml
@@ -33,6 +33,16 @@ jobs:
           cf_password: ${{ secrets.CLOUDGOV_PASSWORD }}
           cf_org: gsa-tts-benefits-studio
           cf_space: notify-${{ inputs.environment }}-egress
+          cf_command: >-
+            push -f manifest.yml
+            --vars-file deploy-config/${{inputs.environment}}.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"
+            --strategy rolling
           command: |
-            cf push notify-${{matrix.app}}-${{inputs.environment}} -f manifest.yml --no-start
             cf restage --strategy rolling egress-proxy-notify-${{matrix.app}}-${{inputs.environment}}

From be026d3307ceb59794e0e0dbb07354760ac0de47 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 19 Mar 2025 10:43:56 -0700
Subject: [PATCH 2/2] do a manifest.yml push to load new env variables

---
 .github/workflows/restage-apps.yml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/restage-apps.yml b/.github/workflows/restage-apps.yml
index 3d35a46ce..83f5f6302 100644
--- a/.github/workflows/restage-apps.yml
+++ b/.github/workflows/restage-apps.yml
@@ -25,14 +25,6 @@ jobs:
           cf_password: ${{ secrets.CLOUDGOV_PASSWORD }}
           cf_org: gsa-tts-benefits-studio
           cf_space: notify-${{ inputs.environment }}
-          command: "cf restage --strategy rolling notify-${{matrix.app}}-${{inputs.environment}}"
-      - name: Restage ${{matrix.app}} egress
-        uses: cloud-gov/cg-cli-tools@main
-        with:
-          cf_username: ${{ secrets.CLOUDGOV_USERNAME }}
-          cf_password: ${{ secrets.CLOUDGOV_PASSWORD }}
-          cf_org: gsa-tts-benefits-studio
-          cf_space: notify-${{ inputs.environment }}-egress
           cf_command: >-
             push -f manifest.yml
             --vars-file deploy-config/${{inputs.environment}}.yml
@@ -44,5 +36,14 @@ jobs:
             --var NOTIFY_E2E_TEST_PASSWORD="$NOTIFY_E2E_TEST_PASSWORD"
             --var LOGIN_DOT_GOV_REGISTRATION_URL="$LOGIN_DOT_GOV_REGISTRATION_URL"
             --strategy rolling
+          command: "cf restage --strategy rolling notify-${{matrix.app}}-${{inputs.environment}}"
+      - name: Restage ${{matrix.app}} egress
+        uses: cloud-gov/cg-cli-tools@main
+        with:
+          cf_username: ${{ secrets.CLOUDGOV_USERNAME }}
+          cf_password: ${{ secrets.CLOUDGOV_PASSWORD }}
+          cf_org: gsa-tts-benefits-studio
+          cf_space: notify-${{ inputs.environment }}-egress
+
           command: |
             cf restage --strategy rolling egress-proxy-notify-${{matrix.app}}-${{inputs.environment}}