Merge branch 'main' into dk/903-delete-other-contacts

docs/developer/migration-troubleshooting.md

@@ -41,11 +41,11 @@ This happens when you swap branches on your sandbox that contain diverging leave
 - `cf login -a api.fr.cloud.gov --sso`
 - `cf ssh getgov-<app>`
 - `/tmp/lifecycle/shell`
-- `cf run-task getgov-<app> --wait --command 'python manage.py migrate registrar 39_previous_miration --fake' --name migrate`
-- `cf run-task getgov-<app> --wait --command 'python manage.py migrate registrar 41_example_migration'  --name migrate`
-- `cf run-task getgov-<app> --wait --command 'python manage.py migrate registrar 45_last_migration --fake'  --name migrate`
-
-Then, navigate to and delete the offending migration. In this case, it is 0041_example_migration.
+- Find the conflicting migrations:  `./manage.py showmigrations`
+- Delete one of them: `rm registrar/migrations/0041_example.py`
+- `/manage.py showmigrations`
+- `/manage.py makemigrations`
+- `/manage.py migrate`
 
 ### Scenario 3: Migrations ran incorrectly, and migrate no longer works (sandbox)
 

docs/operations/README.md

@@ -35,17 +35,55 @@ Binding the database in `manifest-<ENVIRONMENT>.json` automatically inserts the
 
 # Deploy
 
-We have three types of environments: developer "sandboxes", `staging` and `stable`. Developers can deploy locally to their sandbox whenever they want. However, only our CD service can deploy to `staging` and `stable`, and it does so when we make tagged releases of `main`. For `staging`, this is done to ensure there is a non-production level test envirornment that can be used for user testing or for testing code before it is pushed to `stable`. `Staging` can be especially helpful when testing database changes or migrations that could have adververse affects in `stable`. On the other hand, `stable` is used to ensure that we have a "golden" environment to point to. We can refer to `stable` as our production environment and `staging` as our pre-production (pre-prod) environment. As such, code on main should always be tagged for `staging` before it is tagged for `stable`.
+We have four types of environments: developer "sandboxes", `development`, `staging` and `stable`. Developers can deploy locally to their sandbox whenever they want. However, only our CD service can deploy to `development`, `staging` and `stable`.
 
-You should make sure all of the USWDS assets are compiled and collected before deploying to your sandbox. To deploy locally to `sandbox`:
+For staging and stable our CD service completes this deploy when we make tagged releases from specifc branch. For `staging`, this is done to ensure there is a non-production level test environment that can be used for user testing or for testing code before it is pushed to `stable`. `Staging` can be especially helpful when testing database changes or migrations that could have adververse affects in `stable`. When deploying to staging, the branch used is often just `main`. On the other hand, `stable` is used to ensure that we have a "golden" environment to point to. We can refer to `stable` as our production environment and `staging` as our pre-production (pre-prod) environment. As such, code on main should always be tagged for `staging` before it is tagged for `stable`. Thus the branch used in `stable` releases is usually the tagged branch used for the last staging commit.
+
+The `development` environment, is one that auto deploys on any push to main via our CD service. This is to ensure we have an environment that is identical to what we have on the `main` branch. This should not be confused with the "sandboxes" given to developers and designers for ticket development.
+
+When deploying to your personal sandbox, you should make sure all of the USWDS assets are compiled and collected before deploying to your sandbox. To deploy locally to `sandbox`:
 
 For ease of use, you can run the `deploy.sh <sandbox name>` script in the `/src` directory to build the assets and deploy to your sandbox. Similarly, you could run `build.sh <sandbox name>` script to just compile and collect the assets without deploying.
 
-Your sandbox space should've been setup as part of the onboarding process. If this was not the case, please have an admin follow the instructions [here](../../.github/ISSUE_TEMPLATE/developer-onboarding.md#setting-up-developer-sandbox).
+Your sandbox space should've been setup as part of the onboarding process. If this was not the case, please have an admin follow the instructions below.
+
+## Creating a sandbox or new environment
+
+When possible all developers and designers should have their own sandboxes as this provides them a space to test out changes in an isolated environment. All sandboxes are still accessible on the web, just like `staging`, `stable`, and `development`.
+
+1. Make sure you have admin access to the cloud.gov organization, have admin access on github, and make sure you are targeting your own workspace in cloudfoundry
+2. Make sure you are on `main` and your local code is up to date with the repo
+3. Open the terminal to the root project directory 
+4. run [creating a developer sandbox shell script](../../ops/scripts/create_dev_sandbox.sh) by typing the path to the script followed by the name of the sandbox you wish to create. Use initials for the sandbox name. If John Doe is the name of a developer you wish to make a sandbox for you would then do:
+
+```
+./ops/scripts/create_dev_sandbox.sh jd
+```
+
+5. Follow the prompts that appear in the terminal, if on `main`, make sure to click yes to switching to a new branch. Clicking anything besides `Y` or `y` will count as a no.
+6. When the database is being set up it can take 5 mins or longer, don't close the window.
+7. The last prompt asks if you want to make a PR, this will generate a PR for you but you may need to double check against similiar PRs to make sure everything was changed correctly. To do this go to github Pull Requests and search for closed PRs with the word infrastructure.
+
+## Once the sandbox or new environment is made
+
+Once this is made, the new owner of the sandbox has a few steps they should follow. This is already in [onboarding documents](https://docs.google.com/document/d/1ukbpW4LSqkb_CCt8LWfpehP03qqfyYfvK3Fl21NaEq8/edit#heading=h.6dw0iz1u56ox), but is worth re-iterating here:
+
+1. Run fixtures if desired. Refer to the [onboarding guide](https://docs.google.com/document/d/1ukbpW4LSqkb_CCt8LWfpehP03qqfyYfvK3Fl21NaEq8/edit#heading=h.6dw0iz1u56ox) for how to do this and helpful hints
+2. add environment variables for registrar-registry communication (EPP), see [the application secrets readme](./runbooks/rotate_application_secrets.md)
+
+
+## Creating a new environment
+If we ever need a new environment to replace `development`, `staging` or `stable` we need to follow similiar steps but not identical ones to the instructions for making a sandbox.
+
+1. Just like making a sandbox make sure you have admin access to the cloud.gov organization, have admin access on github, and make sure you are targeting your own workspace in cloudfoundry.  Make sure you are on `main` and your local code is up to date with the repo
+2. Open the terminal to the root project directory.
+3. Instead of running [the script for creating a sandbox](../../ops/scripts/create_dev_sandbox.sh), you will manually copy over which commands you want directly into the terminal. Don't run the prompts in terminal, as you will be figuring out what you need to do based on your needs. All the prompts, denoted with `echo`, tell you what the following commands are doing. When uncertain look at the cloudfoundry documentation for any of the `cf` commands.
+4. In most cases, the setup will be almost identical to making a sandbox. The main difference will be deployment and determining if you want workflows like reset, deploy, and migrate to work for it. You will manually update these yaml files if you want the workflows included.
+5. Often it is the manifest file that needs to change as well, either with different environment variables, number of instances, or so on. Copy whichever manifest is closest to what you wish to do and tailor it to your specific needs. See cloudfoundry's and docker's documentation if you need assistance.
 
 ## Stable and Staging Release Rules
 
-Releases will be made for staging and stable every week starting on the first day of the sprint (Wednesday), with the second release of the sprint occuring halfway through the sprint. With the exception of first time going into production, these releases will NOT have the same code. The release to stable will be the same commit that was tagged for staging one week prior, making stable one week behind staging. Further, this means staging can be up to a week behind the main branch of code.
+Releases will be made for staging and stable twice a week, ideally Tuesday and Thursday, but can be adjusted if needed. Code on `main` will be released to `staging`, and then on the following Tuesday/Thursday this `staging` release will become the new `stable` release. This means every release day, a release will be made to `stable` containing the last `staging` code. On this same day a new `staging` release will be made that contains the most up-to-date code on main. Thus, `staging` can be a few days behind the main branch, and `stable` will be a few days behind the code on `staging`.
 
 If a bug fix or feature needs to be made to stable out of the normal cycle, this can only be done at the product owner's request.
 

src/registrar/admin.py

@@ -401,6 +401,8 @@ class HostIPInline(admin.StackedInline):
 class MyHostAdmin(AuditedAdmin):
     """Custom host admin class to use our inlines."""
 
+    search_fields = ["name", "domain__name"]
+    search_help_text = "Search by domain or hostname."
     inlines = [HostIPInline]
 
 
@@ -1252,7 +1254,7 @@ admin.site.register(models.Domain, DomainAdmin)
 admin.site.register(models.DraftDomain, DraftDomainAdmin)
 # Host and HostIP removed from django admin because changes in admin
 # do not propagate to registry and logic not applied
-# admin.site.register(models.Host, MyHostAdmin)
+admin.site.register(models.Host, MyHostAdmin)
 admin.site.register(models.Website, WebsiteAdmin)
 admin.site.register(models.PublicContact, AuditedAdmin)
 admin.site.register(models.DomainApplication, DomainApplicationAdmin)

src/registrar/forms/application_wizard.py

@@ -96,7 +96,7 @@ class RegistrarFormSet(forms.BaseFormSet):
         """
         raise NotImplementedError
 
-    def test_if_more_than_one_join(self, db_obj, rel, related_name):
+    def has_more_than_one_join(self, db_obj, rel, related_name):
         """Helper for finding whether an object is joined more than once."""
         # threshold is the number of related objects that are acceptable
         # when determining if related objects exist. threshold is 0 for most
@@ -165,13 +165,12 @@ class RegistrarFormSet(forms.BaseFormSet):
             # matching database object exists, update it
             if db_obj is not None and cleaned:
                 if should_delete(cleaned):
-                    if any(self.test_if_more_than_one_join(db_obj, rel, related_name) for rel in reverse_joins):
+                    if any(self.has_more_than_one_join(db_obj, rel, related_name) for rel in reverse_joins):
                         # Remove the specific relationship without deleting the object
                         getattr(db_obj, related_name).remove(self.application)
                     else:
                         # If there are no other relationships, delete the object
                         db_obj.delete()
-                    continue
                 else:
                     pre_update(db_obj, cleaned)
                     db_obj.save()

src/registrar/migrations/0062_alter_host_name.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.2.7 on 2024-01-09 02:32
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("registrar", "0061_domain_security_contact_registry_id"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="host",
+            name="name",
+            field=models.CharField(default=None, help_text="Fully qualified domain name", max_length=253),
+        ),
+    ]

src/registrar/models/host.py

@@ -20,7 +20,7 @@ class Host(TimeStampedModel):
         null=False,
         blank=False,
         default=None,  # prevent saving without a value
-        unique=True,
+        unique=False,
         help_text="Fully qualified domain name",
     )
 
@@ -30,3 +30,6 @@ class Host(TimeStampedModel):
         related_name="host",  # access this Host via the Domain as `domain.host`
         help_text="Domain to which this host belongs",
     )
+
+    def __str__(self):
+        return f"{self.domain.name} {self.name}"

src/registrar/templates/emails/domain_invitation.txt

@@ -3,30 +3,38 @@ Hi.
 
 {{ requester_email }} has added you as a manager on {{ domain.name }}.
 
+You can manage this domain on the .gov registrar <https://manage.get.gov>.
+
+----------------------------------------------------------------
+
 YOU NEED A LOGIN.GOV ACCOUNT
 You’ll need a Login.gov account to manage your .gov domain. Login.gov provides
-a simple and secure process for signing into many government services with one
-account. If you don’t already have one, follow these steps to create your
+a simple and secure process for signing in to many government services with one
+account. 
+
+If you don’t already have one, follow these steps to create your
 Login.gov account <https://login.gov/help/get-started/create-your-account/>.
 
+
 DOMAIN MANAGEMENT
-As a .gov domain manager you can add or update information about your domain.
+As a .gov domain manager, you can add or update information about your domain.
 You’ll also serve as a contact for your .gov domain. Please keep your contact
-information updated. Learn more about domain management <https://get.gov/help/>.
+information updated. 
+
+Learn more about domain management <https://get.gov/help/domain-management>. 
+
 
 SOMETHING WRONG?
 If you’re not affiliated with {{ domain.name }} or think you received this
-message in error, contact the .gov team <https://get.gov/help/#contact-us>.
+message in error, reply to this email.
 
 
 THANK YOU
-
-.Gov helps the public identify official, trusted information. Thank you for
-using a .gov domain.
+.Gov helps the public identify official, trusted information. Thank you for using a .gov domain.
 
 ----------------------------------------------------------------
 
 The .gov team
 Contact us: <https://get.gov/contact/>
-Visit <https://get.gov>
+Learn about .gov <https://get.gov>
 {% endautoescape %}

src/registrar/templates/emails/domain_request_withdrawn.txt

@@ -1,26 +1,28 @@
 {% autoescape off %}{# In a text file, we don't want to have HTML entities escaped #}
-Hi {{ application.submitter.first_name }}.
+Hi, {{ application.submitter.first_name }}.
+
+Your .gov domain request has been withdrawn and will not be reviewed by our team.
 
-Your .gov domain request has been withdrawn.
 DOMAIN REQUESTED: {{ application.requested_domain.name }}
-REQUEST #: {{ application.id }}
+REQUEST RECEIVED ON: {{ application.submission_date|date }}
 STATUS: Withdrawn
 
+----------------------------------------------------------------
 
 YOU CAN EDIT YOUR WITHDRAWN REQUEST
+You can edit and resubmit this request by signing in to the registrar <https://manage.get.gov/>.
+
+
+SOMETHING WRONG?
+If you didn’t ask for this domain request to be withdrawn or think you received this message in error, reply to this email. 
 
-The details of your withdrawn request are included below. You can edit and resubmit this application by logging into the registrar. <https://manage.get.gov/>.
 
 THANK YOU
-
 .Gov helps the public identify official, trusted information. Thank you for requesting a .gov domain.
 
 ----------------------------------------------------------------
 
-{% include 'emails/includes/application_summary.txt' %}
-----------------------------------------------------------------
-
 The .gov team
 Contact us: <https://get.gov/contact/>
-Visit <https://get.gov>
+Learn about .gov <https://get.gov>
 {% endautoescape %}

src/registrar/templates/emails/domain_request_withdrawn_subject.txt

@@ -1 +1 @@
-Your .gov domain request has been withdrawn
+Update on your .gov request: {{ application.requested_domain.name }}

src/registrar/templates/emails/status_change_approved.txt

@@ -1,40 +1,43 @@
 {% autoescape off %}{# In a text file, we don't want to have HTML entities escaped #}
-Hi {{ application.submitter.first_name }}.
+Hi, {{ application.submitter.first_name }}.
 
 Congratulations! Your .gov domain request has been approved.
 
 DOMAIN REQUESTED: {{ application.requested_domain.name }}
 REQUEST RECEIVED ON: {{ application.submission_date|date }}
-REQUEST #: {{ application.id }}
-STATUS: In review
+STATUS: Approved
 
-Now that your .gov domain has been approved, there are a few more things to do before your domain can be used. 
+You can manage your approved domain on the .gov registrar <https://manage.get.gov>.
 
+----------------------------------------------------------------
 
-YOU MUST ADD DOMAIN NAME SERVER INFORMATION
+ADD DOMAIN NAME SERVER INFORMATION
+Before your .gov domain can be used, you’ll first need to connect it to a Domain Name System (DNS) hosting service. At this time, we don’t provide DNS hosting services. 
 
-Before your .gov domain can be used, you have to connect it to your Domain Name System (DNS) hosting service. At this time, we don’t provide DNS hosting services.
-Go to the domain management page to add your domain name server information <https://manage.get.gov/domain/{{ application.approved_domain.id }}/nameservers>.
+After you’ve set up hosting, you’ll need to enter your name server information on the .gov registrar. 
 
-Get help with adding your domain name server information <https://get.gov/help/domain-management/#manage-dns-information-for-your-domain>.
+Learn more about: 
+- Finding a DNS hosting service <https://get.gov/domains/moving/#find-dns-hosting-services>
+- Adding name servers <https://get.gov/help/domain-management/#manage-dns-name-servers>.
 
 
 ADD DOMAIN MANAGERS, SECURITY EMAIL
+Currently, you’re the only person who can manage this domain. Please keep your contact information updated. 
 
-We strongly recommend that you add other points of contact who will help manage your domain. We also recommend that you provide a security email. This email will allow the public to report security issues on your domain. Security emails are made public. 
+We strongly recommend adding other domain managers who can serve as additional contacts. We also recommend providing a security email that the public can use to report security issues on your domain. You can add domain managers and a security email on the .gov registrar. 
 
-Go to the domain management page to add domain contacts <https://manage.get.gov/domain/{{ application.approved_domain.id }}/your-contact-information> and a security email <https://manage.get.gov/domain/{{ application.approved_domain.id }}/security-email>.
-
-Get help with managing your .gov domain <https://get.gov/help/domain-management/>.
+Learn more about:
+- Adding domain managers <https://get.gov/help/domain-management/#add-a-domain-manager-to-your-.gov-domain>
+- Adding a security email <https://get.gov/help/domain-management/#add-or-update-the-security-email-for-your-.gov-domain>
+- Domain security best practices <https://get.gov/domains/security/> 
 
 
 THANK YOU
-
 .Gov helps the public identify official, trusted information. Thank you for using a .gov domain.
 
 ----------------------------------------------------------------
 
 The .gov team
 Contact us: <https://get.gov/contact/>
-Visit <https://get.gov>
+Learn about .gov <https://get.gov>
 {% endautoescape %}

src/registrar/templates/emails/status_change_approved_subject.txt

@@ -1 +1 @@
-Your .gov domain request is approved
+Update on your .gov request: {{ application.requested_domain.name }}

src/registrar/templates/emails/status_change_rejected.txt

@@ -1,32 +1,32 @@
 {% autoescape off %}{# In a text file, we don't want to have HTML entities escaped #}
-Hi {{ application.submitter.first_name }}.
+Hi, {{ application.submitter.first_name }}.
 
 Your .gov domain request has been rejected.
 
 DOMAIN REQUESTED: {{ application.requested_domain.name }}
 REQUEST RECEIVED ON: {{ application.submission_date|date }}
-REQUEST #: {{ application.id }}
 STATUS: Rejected
 
-
-YOU CAN SUBMIT A NEW REQUEST
-
-The details of your request are included below. If your organization is eligible for a .gov 
-domain and you meet our other requirements, you can submit a new request. Learn 
-more about .gov domains <https://get.gov/help/domains/>.
-
-
-THANK YOU
-
-.Gov helps the public identify official, trusted information. Thank you for
-requesting a .gov domain.
-
 ----------------------------------------------------------------
 
-{% include 'emails/includes/application_summary.txt' %}
+YOU CAN SUBMIT A NEW REQUEST
+If your organization is eligible for a .gov domain and you meet our other requirements, you can submit a new request. 
+
+Learn more about:
+- Eligibility for a .gov domain <https://get.gov/domains/eligibility>
+- Choosing a .gov domain name <https://get.gov/domains/choosing>
+
+
+NEED ASSISTANCE?
+If you have questions about this domain request or need help choosing a new domain name, reply to this email.
+
+
+THANK YOU
+.Gov helps the public identify official, trusted information. Thank you for requesting a .gov domain.
+
 ----------------------------------------------------------------
 
 The .gov team
 Contact us: <https://get.gov/contact/>
-Visit <https://get.gov>
+Learn about .gov <https://get.gov>
 {% endautoescape %}

src/registrar/templates/emails/status_change_rejected_subject.txt

@@ -1 +1 @@
-Your .gov domain request has been rejected
+Update on your .gov request: {{ application.requested_domain.name }}

src/registrar/templates/emails/submission_confirmation.txt

@@ -1,35 +1,31 @@
 {% autoescape off %}{# In a text file, we don't want to have HTML entities escaped #}
-Hi {{ application.submitter.first_name }}.
+Hi, {{ application.submitter.first_name }}.
 
 We received your .gov domain request.
 
 DOMAIN REQUESTED: {{ application.requested_domain.name }}
 REQUEST RECEIVED ON: {{ application.submission_date|date }}
-REQUEST #: {{ application.id }}
-STATUS: Received
+STATUS: Submitted
+
+----------------------------------------------------------------
+
+NEXT STEPS
+We’ll review your request. This usually takes 20 business days. During this review we’ll verify that:
+- Your organization is eligible for a .gov domain
+- You work at the organization and/or can make requests on its behalf 
+- Your requested domain meets our naming requirements 
+
+We’ll email you if we have questions and when we complete our review. You can check the status of your request at any time on the registrar homepage. <https://manage.get.gov>
 
 
 NEED TO MAKE CHANGES?
+To make changes to your domain request, you have to withdraw it first. Withdrawing your request may extend the time it takes for the .gov team to complete their review. 
 
-If you need to change your request you have to first withdraw it. Once you
-withdraw the request you can edit it and submit it again. Changing your request
-might add to the wait time. Learn more about withdrawing your request.
-
-
-NEXT STEPS
-
-- We’ll review your request. This usually takes 20 business days.
-
-- You can check the status of your request at any time.
-  <https://manage.get.gov/application/{{ application.id }}>
-
-- We’ll email you with questions or when we complete our review.
+Learn more about withdrawing your request <https://get.gov/help/domain-requests/#withdraw-your-domain-request>.
 
 
 THANK YOU
-
-.Gov helps the public identify official, trusted information. Thank you for
-requesting a .gov domain.
+.Gov helps the public identify official, trusted information. Thank you for requesting a .gov domain.
 
 ----------------------------------------------------------------
 
@@ -38,5 +34,5 @@ requesting a .gov domain.
 
 The .gov team
 Contact us: <https://get.gov/contact/>
-Visit <https://get.gov>
+Learn about .gov <https://get.gov>
 {% endautoescape %}

src/registrar/templates/emails/submission_confirmation_subject.txt

@@ -1 +1 @@
-Thank you for applying for a .gov domain
+Update on your .gov request: {{ application.requested_domain.name }}