minor refactor

.github/workflows/clone-staging.yaml

@@ -23,24 +23,20 @@ jobs:
       - name: Install Cloud Foundry CLI
         uses: cloud-gov/cg-cli-tools@main
 
-      - name: Login to Cloud Foundry
+      - name: Clone
         env:
           CF_USERNAME: CF_${{ env.DESTINATION_ENVIRONMENT }}_USERNAME
           CF_PASSWORD: CF_${{ env.DESTINATION_ENVIRONMENT }}_PASSWORD
         with:
           cf_username: ${{ secrets[env.CF_USERNAME] }}
           cf_password: ${{ secrets[env.CF_PASSWORD] }}
-          cf_org: cisa-dotgov
-          cf_space: ${{ env.DESTINATION_ENVIRONMENT }}
         run: |
+          # login to cf cli
           cf login -a api.fr.cloud.gov -u $CF_USERNAME -p $CF_PASSWORD -o cisa-dotgov -s ${{ env.DESTINATION_ENVIRONMENT }}
-
-      - name: Install manage-rds tool
-        run: |
+          
+          # install cg-manage-rds tool
           pip install git+https://github.com/cloud-gov/cg-manage-rds.git
 
-      - name: Clone Database
-        run: |
           # share the sandbox db with the Staging space
           cf share-service getgov-${{ env.DESTINATION_ENVIRONMENT }}-database -s ${{ env.SOURCE_ENVIRONMENT }}
 
@@ -50,15 +46,10 @@ jobs:
           # clone from staging to the sandbox
           cg-manage-rds clone getgov-${{ env.SOURCE_ENVIRONMENT }}-database getgov-${{ env.DESTINATION_ENVIRONMENT }}-database
 
-          # delete the local copy of the backup that gets created
           rm db_backup.sql
 
           # switch to the target sandbox space
           cf target -s ${{ env.DESTINATION_ENVIRONMENT }}
 
           # un-share the sandbox from Staging
-          cf unshare-service getgov-${{ env.DESTINATION_ENVIRONMENT }}-database -s ${{ env.SOURCE_ENVIRONMENT }}
-
-      - name: Logout from Cloud Foundry
-        if: always()
-        run: cf logout
+          cf unshare-service getgov-${{ env.DESTINATION_ENVIRONMENT }}-database -s ${{ env.SOURCE_ENVIRONMENT }}