From 9c62134cb24918f4921351ddd84e6df982946be2 Mon Sep 17 00:00:00 2001
From: Keepers <ryanfkeepers@gmail.com>
Date: Mon, 15 Aug 2022 10:36:07 -0600
Subject: [PATCH] change command folding in cleanup yml (#546)

---
 .github/workflows/ci.yml              |  6 +++---
 .github/workflows/ci_test_cleanup.yml | 16 +++++++++++-----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e8799f6bb..f39f9c5c3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -75,12 +75,12 @@ jobs:
       - run: echo "Running ${{ github.repository }} integration tests."
       - name: Integration Tests
         env:
-          CORSO_CI_TESTS: true 
-          CORSO_PASSWORD: ${{ secrets.INTEGRATION_TEST_CORSO_PASSWORD }}
           CLIENT_ID: ${{ secrets.CLIENT_ID }}
           CLIENT_SECRET: ${{ secrets.CLIENT_SECRET }}
-          TENANT_ID: ${{ secrets.TENANT_ID }}
+          CORSO_CI_TESTS: true 
           CORSO_M356_TEST_USER_ID: ${{ secrets.CORSO_M356_TEST_USER_ID }}
+          CORSO_PASSWORD: ${{ secrets.INTEGRATION_TEST_CORSO_PASSWORD }}
+          TENANT_ID: ${{ secrets.TENANT_ID }}
         run: |
           set -euo pipefail
           go test -json -v ./... 2>&1 | tee /tmp/gotest.log | gotestfmt -hide successful-tests
diff --git a/.github/workflows/ci_test_cleanup.yml b/.github/workflows/ci_test_cleanup.yml
index a3fe6512d..3658d6ca8 100644
--- a/.github/workflows/ci_test_cleanup.yml
+++ b/.github/workflows/ci_test_cleanup.yml
@@ -6,6 +6,7 @@ on:
 
 jobs:
   Test-User-Data-Cleanup:
+    environment: Testing
     runs-on: ubuntu-latest
 
     steps:
@@ -49,13 +50,18 @@ jobs:
       - name: Set purge boundary
         run: |
           echo "HALF_HOUR_AGO=$(date -d '30 minutes ago' -u +"%Y-%m-%dT%H:%M:%SZ")" >> $GITHUB_ENV
-          echo "set half hour ago to: ${{ env.HALF_HOUR_AGO }}"
 
       # run the folder purge
       - name: Purge folders
         working-directory: ./src
-        run: |
-          go run ./cmd/purge/purge.go \
-          --user ${{ secrets.CORSO_M356_TEST_USER_ID }} \
-          --prefix "Corso_Restore_" \
+        env:
+          CLIENT_ID: ${{ secrets.CLIENT_ID }}
+          CLIENT_SECRET: ${{ secrets.CLIENT_SECRET }}
+          CORSO_M356_TEST_USER_ID: ${{ secrets.CORSO_M356_TEST_USER_ID }}
+          DELETE_FOLDER_PREFIX: "Corso_Restore_"
+          TENANT_ID: ${{ secrets.TENANT_ID }}
+        run: >
+          go run ./cmd/purge/purge.go
+          --user ${{ secrets.CORSO_M356_TEST_USER_ID }}
+          --prefix ${{ env.DELETE_FOLDER_PREFIX }}
           --before ${{ env.HALF_HOUR_AGO }}