From fee97c1d6bd0244bcc09fac8202828fa610fe949 Mon Sep 17 00:00:00 2001
From: Matt-Spence <matthewswSpence@gmail.com>
Date: Tue, 5 Nov 2024 10:26:27 -0600
Subject: [PATCH 1/5] Update clone-staging.yaml

---
 .github/workflows/clone-staging.yaml | 66 +++++++++++-----------------
 1 file changed, 26 insertions(+), 40 deletions(-)

diff --git a/.github/workflows/clone-staging.yaml b/.github/workflows/clone-staging.yaml
index df943f138..eceed3604 100644
--- a/.github/workflows/clone-staging.yaml
+++ b/.github/workflows/clone-staging.yaml
@@ -18,44 +18,30 @@ jobs:
   clone-database:
     runs-on: ubuntu-latest
     env:
-      CF_USERNAME: CF_MS_USERNAME
-      CF_PASSWORD: CF_MS_PASSWORD
+      CF_USERNAME: ${{ secrets.CF_MS_USERNAME }}
+      CF_PASSWORD: ${{ secrets.CF_MS_PASSWORD }}
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-      
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.13'
-          cache: 'pip' # caching pip dependencies
-          
-      - name: Install CG Tool
-        run: pip install git+https://github.com/cloud-gov/cg-manage-rds.git
-
-      - name: Share DB Service
-        uses: cloud-gov/cg-cli-tools@main
-        with:
-          cf_username: ${{ secrets[env.CF_USERNAME] }}
-          cf_password: ${{ secrets[env.CF_PASSWORD] }}
-          cf_org: cisa-dotgov
-          cf_space: ${{ env.DESTINATION_ENVIRONMENT }}
-          cf_command: share-service getgov-${{ env.DESTINATION_ENVIRONMENT }}-database -s ${{ env.SOURCE_ENVIRONMENT }}
-
-      - name: Clone Database
-        uses: cloud-gov/cg-cli-tools@main
-        with:
-          cf_username: ${{ secrets.CF_MS_USERNAME }}
-          cf_password: ${{ secrets.CF_MS_PASSWORD }}
-          cf_org: cisa-dotgov
-          cf_space: ${{ env.SOURCE_ENVIRONMENT }}
-          command: cg-manage-rds clone getgov-${{ env.SOURCE_ENVIRONMENT }}-database getgov-${{ env.DESTINATION_ENVIRONMENT }}-database
-      
-      - name: Unshare DB Service
-        uses: cloud-gov/cg-cli-tools@main
-        with:
-          cf_username: ${{ secrets.CF_MS_USERNAME }}
-          cf_password: ${{ secrets.CF_MS_PASSWORD }}
-          cf_org: cisa-dotgov
-          cf_space: ${{ env.SOURCE_ENVIRONMENT }}
-          cf_command: unshare-service getgov-${{ env.DESTINATION_ENVIRONMENT }}-database -s ${{ env.SOURCE_ENVIRONMENT }}
+        - name: Clone Database
+          run: |
+            # install cf cli and other tools
+            wget -q -O - https://packages.cloudfoundry.org/debian/cli.cloudfoundry.org.key | sudo gpg --dearmor -o /usr/share/keyrings/cli.cloudfoundry.org.gpg
+            echo "deb [signed-by=/usr/share/keyrings/cli.cloudfoundry.org.gpg] https://packages.cloudfoundry.org/debian stable main" | sudo tee /etc/apt/sources.list.d/cloudfoundry-cli.list
+            
+            sudo apt-get update
+            sudo apt-get install cf8-cli postgresql-client
+            # install cg-manage-rds tool
+            pip install git+https://github.com/cloud-gov/cg-manage-rds.git
+            
+            # Authenticate and target CF org and space.
+            cf api api.fr.cloud.gov
+            cf auth "$CF_USERNAME" "$CF_PASSWORD"
+            cf target -o cisa-dotgov -s $DESTINATION_ENVIRONMENT
+            
+            # share the target db with the source space
+            cf share-service getgov-$DESTINATION_ENVIRONMENT-database -s $SOURCE_ENVIRONMENT
+            
+            # clone from source to destination
+            cg-manage-rds clone getgov-$DESTINATION_ENVIRONMENT-database getgov-$SOURCE_ENVIRONMENT-database
+            
+            # unshare the service
+            cf unshare-service getgov-$DESTINATION_ENVIRONMENT-database -s $SOURCE_ENVIRONMENT

From 97435a45f7a16683c9686ada4916fbdde9c52360 Mon Sep 17 00:00:00 2001
From: Matt-Spence <matthewswSpence@gmail.com>
Date: Wed, 6 Nov 2024 11:43:01 -0600
Subject: [PATCH 2/5] Update clone-staging.yaml

---
 .github/workflows/clone-staging.yaml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/clone-staging.yaml b/.github/workflows/clone-staging.yaml
index 9ca590993..c9a80f4c8 100644
--- a/.github/workflows/clone-staging.yaml
+++ b/.github/workflows/clone-staging.yaml
@@ -16,7 +16,7 @@ env:
 
 jobs:
   clone-database:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     env:
       CF_USERNAME: ${{ secrets.CF_MS_USERNAME }}
       CF_PASSWORD: ${{ secrets.CF_MS_PASSWORD }}
@@ -26,9 +26,7 @@ jobs:
             # install cf cli and other tools
             wget -q -O - https://packages.cloudfoundry.org/debian/cli.cloudfoundry.org.key | sudo gpg --dearmor -o /usr/share/keyrings/cli.cloudfoundry.org.gpg
             echo "deb [signed-by=/usr/share/keyrings/cli.cloudfoundry.org.gpg] https://packages.cloudfoundry.org/debian stable main" | sudo tee /etc/apt/sources.list.d/cloudfoundry-cli.list
-            
-            sudo apt-get update
-            sudo apt-get install cf8-cli postgresql-client-common
+
             # install cg-manage-rds tool
             pip install git+https://github.com/cloud-gov/cg-manage-rds.git
             

From 5a709fd1335ccc1d477704ed953dc51f1cc0a0cd Mon Sep 17 00:00:00 2001
From: Matt-Spence <matthewswSpence@gmail.com>
Date: Wed, 6 Nov 2024 11:59:43 -0600
Subject: [PATCH 3/5] Update clone-staging.yaml

---
 .github/workflows/clone-staging.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/clone-staging.yaml b/.github/workflows/clone-staging.yaml
index c9a80f4c8..885f99fec 100644
--- a/.github/workflows/clone-staging.yaml
+++ b/.github/workflows/clone-staging.yaml
@@ -27,6 +27,9 @@ jobs:
             wget -q -O - https://packages.cloudfoundry.org/debian/cli.cloudfoundry.org.key | sudo gpg --dearmor -o /usr/share/keyrings/cli.cloudfoundry.org.gpg
             echo "deb [signed-by=/usr/share/keyrings/cli.cloudfoundry.org.gpg] https://packages.cloudfoundry.org/debian stable main" | sudo tee /etc/apt/sources.list.d/cloudfoundry-cli.list
 
+            sudo apt-get update
+            sudo apt-get install cf8-cli
+            
             # install cg-manage-rds tool
             pip install git+https://github.com/cloud-gov/cg-manage-rds.git
             

From 3c0eea86d9b5405c219232e798ad7480f186dfcc Mon Sep 17 00:00:00 2001
From: Matt-Spence <matthewswSpence@gmail.com>
Date: Wed, 6 Nov 2024 12:23:27 -0600
Subject: [PATCH 4/5] Update clone-staging.yaml

---
 .github/workflows/clone-staging.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/clone-staging.yaml b/.github/workflows/clone-staging.yaml
index eceed3604..e2aa4e1d3 100644
--- a/.github/workflows/clone-staging.yaml
+++ b/.github/workflows/clone-staging.yaml
@@ -41,6 +41,7 @@ jobs:
             cf share-service getgov-$DESTINATION_ENVIRONMENT-database -s $SOURCE_ENVIRONMENT
             
             # clone from source to destination
+            cf target -s $SOURCE_ENVIRONMENT
             cg-manage-rds clone getgov-$DESTINATION_ENVIRONMENT-database getgov-$SOURCE_ENVIRONMENT-database
             
             # unshare the service

From 8bdbc4a32c27a13699fc7acd392b2b514d9817f5 Mon Sep 17 00:00:00 2001
From: Matt-Spence <matthewswSpence@gmail.com>
Date: Wed, 6 Nov 2024 15:57:51 -0600
Subject: [PATCH 5/5] Update clone-staging.yaml

---
 .github/workflows/clone-staging.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/clone-staging.yaml b/.github/workflows/clone-staging.yaml
index 3e0504700..cc085d530 100644
--- a/.github/workflows/clone-staging.yaml
+++ b/.github/workflows/clone-staging.yaml
@@ -46,4 +46,4 @@ jobs:
             cg-manage-rds clone getgov-$DESTINATION_ENVIRONMENT-database getgov-$SOURCE_ENVIRONMENT-database
             
             # unshare the service
-            cf unshare-service getgov-$DESTINATION_ENVIRONMENT-database -s $SOURCE_ENVIRONMENT
+            cf unshare-service getgov-$DESTINATION_ENVIRONMENT-database -s $SOURCE_ENVIRONMENT -f