Merge branch 'main' into za/2976-senior-official-federal-agency-changes

.github/workflows/clone-staging.yaml

@@ -12,41 +12,41 @@ on:
 env:
   DESTINATION_ENVIRONMENT: ms
   SOURCE_ENVIRONMENT: staging
+  
 
 jobs:
   clone-database:
     runs-on: ubuntu-latest
+    env:
+      CF_USERNAME: CF_MS_USERNAME
+      CF_PASSWORD: CF_MS_PASSWORD
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
 
-      - name: Install Cloud Foundry CLI
+      - 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
+      - name: Clone Database
-        env:
+        uses: cloud-gov/cg-cli-tools@main
-          CF_USERNAME: CF_${{ env.DESTINATION_ENVIRONMENT }}_USERNAME
+        with:
-          CF_PASSWORD: CF_${{ env.DESTINATION_ENVIRONMENT }}_PASSWORD
+          cf_username: ${{ secrets.CF_MS_USERNAM }}
-        run: |
+          cf_password: ${{ secrets.CF_MS_PASSWORD }}
-          # login to cf cli
+          cf_org: cisa-dotgov
-          cf login -a api.fr.cloud.gov -u $CF_USERNAME -p $CF_PASSWORD -o cisa-dotgov -s ${{ env.DESTINATION_ENVIRONMENT }}
+          cf_space: ${{ env.SOURCE_ENVIRONMENT }}
-          
+          command: cg-manage-rds clone getgov-${{ env.SOURCE_ENVIRONMENT }}-database getgov-${{ env.DESTINATION_ENVIRONMENT }}-database
-          # install cg-manage-rds tool
+      
-          pip install git+https://github.com/cloud-gov/cg-manage-rds.git
+      - name: Unshare DB Service
-
+        uses: cloud-gov/cg-cli-tools@main
-          # share the sandbox db with the Staging space
+        with:
-          cf share-service getgov-${{ env.DESTINATION_ENVIRONMENT }}-database -s ${{ env.SOURCE_ENVIRONMENT }}
+          cf_username: ${{ secrets.CF_MS_USERNAM }}
-
+          cf_password: ${{ secrets.CF_MS_PASSWORD }}
-          # target the Staging space
+          cf_org: cisa-dotgov
-          cf target -s ${{ env.SOURCE_ENVIRONMENT }}
+          cf_space: ${{ env.SOURCE_ENVIRONMENT }}
-
+          cf_command: unshare-service getgov-${{ env.DESTINATION_ENVIRONMENT }}-database -s ${{ env.SOURCE_ENVIRONMENT }}
-          # clone from staging to the sandbox
-          cg-manage-rds clone getgov-${{ env.SOURCE_ENVIRONMENT }}-database getgov-${{ env.DESTINATION_ENVIRONMENT }}-database
-
-          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 }}

src/registrar/migrations/0135_alter_federalagency_agency_and_more.py

@@ -0,0 +1,30 @@
+# Generated by Django 4.2.10 on 2024-10-28 16:39
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        (
+            "registrar",
+            "0134_rename_portfolio_additional_permissions_portfolioinvitation_additional_permissions_and_more",
+        ),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="federalagency",
+            name="agency",
+            field=models.CharField(null=True, verbose_name="Federal agency"),
+        ),
+        migrations.AlterField(
+            model_name="federalagency",
+            name="federal_type",
+            field=models.CharField(
+                choices=[("executive", "Executive"), ("judicial", "Judicial"), ("legislative", "Legislative")],
+                max_length=20,
+                null=True,
+            ),
+        ),
+    ]

src/registrar/models/federal_agency.py

@@ -13,15 +13,15 @@ class FederalAgency(TimeStampedModel):
 
     agency = models.CharField(
         null=True,
-        blank=True,
+        blank=False,
-        help_text="Federal agency",
+        verbose_name="Federal agency",
     )
 
     federal_type = models.CharField(
         max_length=20,
         choices=BranchChoices.choices,
         null=True,
-        blank=True,
+        blank=False,
     )
 
     acronym = models.CharField(

src/registrar/templates/domain_request_dotgov_domain.html

@@ -6,7 +6,11 @@
     <ul class="usa-list">
       <li>Be available </li>
       <li>Relate to your organization’s name, location, and/or services </li>
+      {% if portfolio %}
+      <li>Be clear to the general public. Your domain name must not be easily confused with other organizations.</li>
+      {% else %}
       <li>Be unlikely to mislead or confuse the general public (even if your domain is only intended for a specific audience) </li>
+      {% endif %}
     </ul>
   </p>
 
@@ -19,11 +23,12 @@
 
   <p>Note that <strong>only federal agencies can request generic terms</strong> like
   vote.gov.</p>
-
+  {% if not portfolio %}
   <h2 class="margin-top-3">Domain examples for your type of organization</h2>
   <div class="domain_example">
     {% include "includes/domain_example.html" %}
   </div>
+  {% endif %}
 {% endblock %}
 
 

src/registrar/templates/portfolio_domain_request_additional_details.html

@@ -7,14 +7,13 @@
 
 {% block form_fields %}
 
-    <fieldset class="usa-fieldset margin-top-2">
+    <fieldset class="usa-fieldset margin-top-2">          
-        <legend>
             <h2>Is there anything else you’d like us to know about your domain request?</h2> 
         </legend>
     </fieldset>
 
     <div class="margin-top-3" id="anything-else">
-        <p>Provide details below. <abbr class="usa-hint usa-hint--required" title="required">*</abbr></p>
+        <p><em>Provide details below. <abbr class="usa-hint usa-hint--required" title="required">*</abbr></em></p>
         {% with attr_maxlength=2000 add_label_class="usa-sr-only" %}
             {% input_with_errors forms.0.anything_else %}
         {% endwith %}

src/registrar/tests/test_reports.py

@@ -89,7 +89,6 @@ class CsvReportsTest(MockDbForSharedTests):
                 call("cdomain1.gov,Federal - Executive,World War I Centennial Commission,,,,(blank)\r\n"),
                 call("adomain10.gov,Federal,Armed Forces Retirement Home,,,,(blank)\r\n"),
                 call("ddomain3.gov,Federal,Armed Forces Retirement Home,,,,(blank)\r\n"),
-                call("adomain2.gov,Interstate,,,,,(blank)\r\n"),
                 call("zdomain12.gov,Interstate,,,,,(blank)\r\n"),
             ]
             # We don't actually want to write anything for a test case,
@@ -470,8 +469,6 @@ class ExportDataTest(MockDbForIndividualTests, MockEppLib):
         # Invoke setter
         self.domain_1.security_contact
         # Invoke setter
-        self.domain_2.security_contact
-        # Invoke setter
         self.domain_3.security_contact
         # Add a first ready date on the first domain. Leaving the others blank.
         self.domain_1.first_ready = get_default_start_date()
@@ -492,7 +489,6 @@ class ExportDataTest(MockDbForIndividualTests, MockEppLib):
             "defaultsecurity.gov,Federal - Executive,World War I Centennial Commission,,,,(blank)\n"
             "adomain10.gov,Federal,Armed Forces Retirement Home,,,,(blank)\n"
             "ddomain3.gov,Federal,Armed Forces Retirement Home,,,,security@mail.gov\n"
-            "adomain2.gov,Interstate,,,,,(blank)\n"
             "zdomain12.gov,Interstate,,,,,(blank)\n"
         )
         # Normalize line endings and remove commas,

src/registrar/utility/csv_export.py

@@ -746,7 +746,6 @@ class DomainDataFull(DomainExport):
         return Q(
             domain__state__in=[
                 Domain.State.READY,
-                Domain.State.DNS_NEEDED,
                 Domain.State.ON_HOLD,
             ],
         )
@@ -842,7 +841,6 @@ class DomainDataFederal(DomainExport):
             organization_type__icontains="federal",
             domain__state__in=[
                 Domain.State.READY,
-                Domain.State.DNS_NEEDED,
                 Domain.State.ON_HOLD,
             ],
         )