From 57bb85ea86249a40f6cb65987b833285df28ba20 Mon Sep 17 00:00:00 2001
From: CocoByte <nicolle.leclair@gmail.com>
Date: Thu, 31 Oct 2024 09:30:34 -0600
Subject: [PATCH 1/7] updated screenreader for domains & domain-requests search
 buttons

---
 src/registrar/templates/includes/domain_requests_table.html | 4 ++--
 src/registrar/templates/includes/domains_table.html         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/registrar/templates/includes/domain_requests_table.html b/src/registrar/templates/includes/domain_requests_table.html
index 5b7604222..5142131af 100644
--- a/src/registrar/templates/includes/domain_requests_table.html
+++ b/src/registrar/templates/includes/domain_requests_table.html
@@ -23,7 +23,7 @@
                         </svg>
                         Reset
                     </button>
-                    <label class="usa-sr-only" for="domain-requests__search-field">
+                    <label id="domain-requests__search-label" class="usa-sr-only" for="domain-requests__search-field">
                         {% if portfolio %}
                             Search by domain name or creator
                         {% else %}
@@ -41,7 +41,7 @@
                         placeholder="Search by domain name"
                         {% endif %}
                     />
-                    <button class="usa-button" type="submit" id="domain-requests__search-field-submit">
+                    <button class="usa-button" type="submit" id="domain-requests__search-field-submit" aria-labelledby="domain-requests__search-label">
                         <img
                             src="{% static 'img/usa-icons-bg/search--white.svg' %}"
                             class="usa-search__submit-icon"
diff --git a/src/registrar/templates/includes/domains_table.html b/src/registrar/templates/includes/domains_table.html
index 731249a3e..0a04af8ca 100644
--- a/src/registrar/templates/includes/domains_table.html
+++ b/src/registrar/templates/includes/domains_table.html
@@ -23,7 +23,7 @@
             </svg>
             Reset
           </button>
-          <label class="usa-sr-only" for="domains__search-field">Search by domain name</label>
+          <label id="domains__search-label" class="usa-sr-only" for="domains__search-field">Search by domain name</label>
           <input
             class="usa-input"
             id="domains__search-field"
@@ -31,7 +31,7 @@
             name="domains-search"
             placeholder="Search by domain name"
           />
-          <button class="usa-button" type="submit" id="domains__search-field-submit">
+          <button class="usa-button" type="submit" id="domains__search-field-submit" aria-labelledby="domains__search-label">
             <img
               src="{% static 'img/usa-icons-bg/search--white.svg' %}"
               class="usa-search__submit-icon"

From 0f39a731958627583668a5bb889783b525b6df97 Mon Sep 17 00:00:00 2001
From: Matt-Spence <matthewswSpence@gmail.com>
Date: Fri, 1 Nov 2024 16:03:03 -0500
Subject: [PATCH 2/7] Update clone-staging.yaml

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

diff --git a/.github/workflows/clone-staging.yaml b/.github/workflows/clone-staging.yaml
index 5989d3286..703c9bc44 100644
--- a/.github/workflows/clone-staging.yaml
+++ b/.github/workflows/clone-staging.yaml
@@ -23,12 +23,12 @@ jobs:
     steps:
         - name: Clone Database
           run: |
-            # install cf cli
+            # 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
+            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
             

From 48eb586b922c84802b6db604abaa9cbd33293ea7 Mon Sep 17 00:00:00 2001
From: Matt-Spence <matthewswSpence@gmail.com>
Date: Mon, 4 Nov 2024 10:52:49 -0600
Subject: [PATCH 3/7] Update clone-staging.yaml

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

diff --git a/.github/workflows/clone-staging.yaml b/.github/workflows/clone-staging.yaml
index 703c9bc44..edfbffa05 100644
--- a/.github/workflows/clone-staging.yaml
+++ b/.github/workflows/clone-staging.yaml
@@ -18,8 +18,8 @@ jobs:
   clone-database:
     runs-on: ubuntu-latest
     env:
-      CF_USERNAME: CF_MS_USERNAME
-      CF_PASSWORD: CF_MS_PASSWORD
+      CF_USERNAME: ${{ secrets[env.CF_USERNAME] }}
+      CF_PASSWORD: ${{ secrets[env.CF_PASSWORD] }}
     steps:
         - name: Clone Database
           run: |
@@ -34,14 +34,14 @@ jobs:
             
             # Authenticate and target CF org and space.
             cf api api.fr.cloud.gov
-            cf auth ${{ secrets[env.CF_USERNAME] }} ${{ secrets[env.CF_PASSWORD] }}
-            cf target -o cisa-dotgov -s ${{ env.DESTINATION_ENVIRONMENT }}
+            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-${{ env.DESTINATION_ENVIRONMENT }}-database -s ${{ env.SOURCE_ENVIRONMENT }}
+            cf share-service getgov-$DESTINATION_ENVIRONMENT-database -s $SOURCE_ENVIRONMENT
             
             # clone from source to destination
-            cg-manage-rds clone getgov-${{ env.DESTINATION_ENVIRONMENT }}-database getgov-${{ env.SOURCE_ENVIRONMENT }}-database
+            cg-manage-rds clone getgov-$DESTINATION_ENVIRONMENT-database getgov-$SOURCE_ENVIRONMENT-database
             
             # unshare the service
-            cf unshare-service getgov-${{ env.DESTINATION_ENVIRONMENT }}-database -s ${{ env.SOURCE_ENVIRONMENT }}
+            cf unshare-service getgov-$DESTINATION_ENVIRONMENT-database -s $SOURCE_ENVIRONMENT

From e511df87c51ebffd640d67b50db216f003ce2d3a Mon Sep 17 00:00:00 2001
From: matthewswspence <Matthewswspence@gmail.com>
Date: Mon, 4 Nov 2024 11:46:18 -0600
Subject: [PATCH 4/7] update clone-staging.yaml

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

diff --git a/.github/workflows/clone-staging.yaml b/.github/workflows/clone-staging.yaml
index edfbffa05..a814f68f1 100644
--- a/.github/workflows/clone-staging.yaml
+++ b/.github/workflows/clone-staging.yaml
@@ -18,8 +18,8 @@ jobs:
   clone-database:
     runs-on: ubuntu-latest
     env:
-      CF_USERNAME: ${{ secrets[env.CF_USERNAME] }}
-      CF_PASSWORD: ${{ secrets[env.CF_PASSWORD] }}
+      CF_USERNAME: $CF_MS_USERNAME
+      CF_PASSWORD: $CF_MS_PASSWORD
     steps:
         - name: Clone Database
           run: |

From 724b14ef38df4282c2e38c1d111cf9eedea0baf4 Mon Sep 17 00:00:00 2001
From: Matt-Spence <matthewswSpence@gmail.com>
Date: Mon, 4 Nov 2024 14:17:54 -0600
Subject: [PATCH 5/7] 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 a814f68f1..56a60bf49 100644
--- a/.github/workflows/clone-staging.yaml
+++ b/.github/workflows/clone-staging.yaml
@@ -34,7 +34,7 @@ jobs:
             
             # Authenticate and target CF org and space.
             cf api api.fr.cloud.gov
-            cf auth $CF_USERNAME $CF_PASSWORD
+            cf auth "$CF_USERNAME" "$CF_PASSWORD"
             cf target -o cisa-dotgov -s $DESTINATION_ENVIRONMENT
             
             # share the target db with the source space

From 975d8399485a66b6dc858c66d0eefadffee994ad Mon Sep 17 00:00:00 2001
From: Matt-Spence <matthewswSpence@gmail.com>
Date: Tue, 5 Nov 2024 10:35:46 -0600
Subject: [PATCH 6/7] Update clone-staging.yaml

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

diff --git a/.github/workflows/clone-staging.yaml b/.github/workflows/clone-staging.yaml
index 56a60bf49..eceed3604 100644
--- a/.github/workflows/clone-staging.yaml
+++ b/.github/workflows/clone-staging.yaml
@@ -18,8 +18,8 @@ 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: Clone Database
           run: |

From 9757e58f31931e0123620790ace3836f855e634b Mon Sep 17 00:00:00 2001
From: Matt-Spence <matthewswSpence@gmail.com>
Date: Tue, 5 Nov 2024 11:24:20 -0600
Subject: [PATCH 7/7] Update pg_dump version in cloning job

---
 .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 eceed3604..9ca590993 100644
--- a/.github/workflows/clone-staging.yaml
+++ b/.github/workflows/clone-staging.yaml
@@ -28,7 +28,7 @@ jobs:
             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
+            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