zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-07-10 13:13:24 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'main' of https://github.com/cisagov/manage.get.gov into ad/2852-property-to-portfolio-related-fields

Browse source
This commit is contained in:
asaki222 2024-11-05 16:47:54 -05:00
commit ff7b4acfa0
No known key found for this signature in database
GPG key ID: 2C4F802060E06EA4
3 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

18
.github/workflows/clone-staging.yaml vendored
View file

@ -18,30 +18,30 @@ jobs:
clone-database: clone-database:
runs-on: ubuntu-latest runs-on: ubuntu-latest
env: env:
CF_USERNAME: CF_MS_USERNAME CF_USERNAME: ${{ secrets.CF_MS_USERNAME }}
CF_PASSWORD: CF_MS_PASSWORD CF_PASSWORD: ${{ secrets.CF_MS_PASSWORD }}
steps: steps:
- name: Clone Database - name: Clone Database
run: | 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 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 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 update
sudo apt-get install cf8-cli sudo apt-get install cf8-cli postgresql-client-common
# install cg-manage-rds tool # install cg-manage-rds tool
pip install git+https://github.com/cloud-gov/cg-manage-rds.git pip install git+https://github.com/cloud-gov/cg-manage-rds.git
# Authenticate and target CF org and space. # Authenticate and target CF org and space.
cf api api.fr.cloud.gov cf api api.fr.cloud.gov
cf auth ${{ secrets[env.CF_USERNAME] }} ${{ secrets[env.CF_PASSWORD] }} cf auth "$CF_USERNAME" "$CF_PASSWORD"
cf target -o cisa-dotgov -s ${{ env.DESTINATION_ENVIRONMENT }} cf target -o cisa-dotgov -s $DESTINATION_ENVIRONMENT
# share the target db with the source space # 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 # 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 # 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

4
src/registrar/templates/includes/domain_requests_table.html
View file

@ -23,7 +23,7 @@
</svg> </svg>
Reset Reset
</button> </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 %} {% if portfolio %}
Search by domain name or creator Search by domain name or creator
{% else %} {% else %}
@ -41,7 +41,7 @@
placeholder="Search by domain name" placeholder="Search by domain name"
{% endif %} {% 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 <img
src="{% static 'img/usa-icons-bg/search--white.svg' %}" src="{% static 'img/usa-icons-bg/search--white.svg' %}"
class="usa-search__submit-icon" class="usa-search__submit-icon"

4
src/registrar/templates/includes/domains_table.html
View file

@ -23,7 +23,7 @@
</svg> </svg>
Reset Reset
</button> </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 <input
class="usa-input" class="usa-input"
id="domains__search-field" id="domains__search-field"
@ -31,7 +31,7 @@
name="domains-search" name="domains-search"
placeholder="Search by domain name" 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 <img
src="{% static 'img/usa-icons-bg/search--white.svg' %}" src="{% static 'img/usa-icons-bg/search--white.svg' %}"
class="usa-search__submit-icon" class="usa-search__submit-icon"