From 1ca86bc72df85cbea5bcdae86351d11d55242def Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Fri, 24 Nov 2023 12:06:36 -0700
Subject: [PATCH] Update daily-csv-upload.yaml

---
 .github/workflows/daily-csv-upload.yaml | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/daily-csv-upload.yaml b/.github/workflows/daily-csv-upload.yaml
index 8b59f2468..a90d4c55d 100644
--- a/.github/workflows/daily-csv-upload.yaml
+++ b/.github/workflows/daily-csv-upload.yaml
@@ -68,23 +68,18 @@ jobs:
           curl -L "https://packages.cloudfoundry.org/stable?release=linux64-binary&source=github" | tar -zx
           sudo mv cf /usr/local/bin
 
-      - name: Set login credentials
+      - name: Generate current-federal.csv
         run: |
           cf api https://api.fr.cloud.gov
           cf auth ${{ secrets[env.CF_USERNAME] }} ${{ secrets[env.CF_PASSWORD] }}
           cf target -o cisa-dotgov -s ${{ env.ENVIRONMENT }}
-        env:
-          ENVIRONMENT: ${{ needs.variables.outputs.environment }}
-          CF_USERNAME: CF_${{ needs.variables.outputs.environment }}_USERNAME
-          CF_PASSWORD: CF_${{ needs.variables.outputs.environment }}_PASSWORD
-
-      - name: Generate current-federal.csv
-        run: |
           cf ssh getgov-${{ env.ENVIRONMENT }}
           /tmp/lifecycle/shell
           ./manage.py generate_current_federal_report
         env:
           ENVIRONMENT: ${{ needs.variables.outputs.environment }}
+          CF_USERNAME: CF_${{ needs.variables.outputs.environment }}_USERNAME
+          CF_PASSWORD: CF_${{ needs.variables.outputs.environment }}_PASSWORD
 
       - name: Generate current-full.csv
         run: cf run-task getgov-${{ env.ENVIRONMENT }} "/tmp/lifecycle/shell -c './manage.py generate_current_full_report'"