Merge pull request #1409 from GSA/1407-service-clean-fix

1407 service clean fix
GSA · Jun 10, 2024 · ab40ef8 · ab40ef8
2 parents b31b823 + a357b00
commit ab40ef8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/cloudgov-cleanup-old-service-keys.yml b/.github/workflows/cloudgov-cleanup-old-service-keys.yml
@@ -47,4 +47,3 @@ jobs:
         run: |
           source ./scripts/pipeline/cloud-gov-login.sh
           source ./scripts/pipeline/cloud-gov-cleanup-service-keys.sh
-
diff --git a/scripts/pipeline/cloud-gov-cleanup-service-keys.sh b/scripts/pipeline/cloud-gov-cleanup-service-keys.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-service="${PROJECT}-backup-${ENVIRONMENT}"
+service="${PROJECT}-backup-${BRANCH}"
 
 raw_keys=$(cf service-keys "${service}" | sed 1,3d | awk '{print $1}')
 service_keys=("${raw_keys}")

diff --git a/scripts/pipeline/cloud-gov-login.sh b/scripts/pipeline/cloud-gov-login.sh
@@ -1,15 +1,15 @@
 #!/bin/bash
 
 echo "Logging into Cloud.gov..."
-{
+ {
   cf login \
     -a https://api.fr.cloud.gov \
     -u "${CF_USER}" \
     -p "${CF_PASSWORD}" \
     -o "${CF_ORG}" \
     -s "${PROJECT}-${BRANCH}" > login.log || login_error=1
-} >/dev/null 2>&1
+ } >/dev/null 2>&1
 
 [ -n "${login_error}" ] && echo "Error logging into Cloud.gov!" && exit 1
 
-echo "Login successful!"
+echo "Login successful!"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -47,4 +47,3 @@ jobs:
		run: \|
		source ./scripts/pipeline/cloud-gov-login.sh
		source ./scripts/pipeline/cloud-gov-cleanup-service-keys.sh