From 3c28cc36bed53e89e4c6bf6d9c69513ccc7bb65d Mon Sep 17 00:00:00 2001 From: Rachid Mrad Date: Fri, 29 Dec 2023 23:22:04 -0500 Subject: [PATCH 01/38] update scenario 2 in migrations doc --- docs/developer/migration-troubleshooting.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/developer/migration-troubleshooting.md b/docs/developer/migration-troubleshooting.md index 25187ef13..4dda4e7c3 100644 --- a/docs/developer/migration-troubleshooting.md +++ b/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-` - `/tmp/lifecycle/shell` -- `cf run-task getgov- --wait --command 'python manage.py migrate registrar 39_previous_miration --fake' --name migrate` -- `cf run-task getgov- --wait --command 'python manage.py migrate registrar 41_example_migration' --name migrate` -- `cf run-task getgov- --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) From 6fb932159166099f4f3180efbb607b21a48b4222 Mon Sep 17 00:00:00 2001 From: Alysia Broddrick Date: Tue, 2 Jan 2024 15:44:31 -0800 Subject: [PATCH 02/38] started documentation --- docs/operations/README.md | 44 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 41 insertions(+), 3 deletions(-) diff --git a/docs/operations/README.md b/docs/operations/README.md index 0629608dd..282603de7 100644 --- a/docs/operations/README.md +++ b/docs/operations/README.md @@ -35,13 +35,51 @@ Binding the database in `manifest-.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 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`. 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` envirornment, is one that auto deploys on any push to main via our CD service. This is to ensure we have an envirornment 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 ` script in the `/src` directory to build the assets and deploy to your sandbox. Similarly, you could run `build.sh ` 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 envirornment + +When possible all developers and designers should have their own sandboxes as this provides them a space to test out changes in an isolated envirornment. 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 envirornment 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 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 envirornment variables for registrar-registry communication (EPP), see [the application secrets readme](./runbooks/rotate_application_secrets.md) + + +## Creating a new envirornment +If we ever need a new envirornment 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 +4. ## Stable and Staging Release Rules From a762904ea99f07a37cf3c6e52ff27314523be658 Mon Sep 17 00:00:00 2001 From: Alysia Broddrick Date: Sun, 7 Jan 2024 18:41:04 -0800 Subject: [PATCH 03/38] fixed typose and added more on creating a new environment --- docs/operations/README.md | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/docs/operations/README.md b/docs/operations/README.md index 282603de7..a22fa4753 100644 --- a/docs/operations/README.md +++ b/docs/operations/README.md @@ -37,9 +37,9 @@ Binding the database in `manifest-.json` automatically inserts the 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`. -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 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`. 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. +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` envirornment, is one that auto deploys on any push to main via our CD service. This is to ensure we have an envirornment 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. +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`: @@ -47,11 +47,11 @@ For ease of use, you can run the `deploy.sh ` script in the `/src` 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 envirornment +## 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 envirornment. All sandboxes are still accessible on the web, just like `staging`, `stable`, and `development`. +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 +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: @@ -60,26 +60,26 @@ When possible all developers and designers should have their own sandboxes as th ./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 +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 envirornment is made +## 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 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 envirornment variables for registrar-registry communication (EPP), see [the application secrets readme](./runbooks/rotate_application_secrets.md) +2. add environment variables for registrar-registry communication (EPP), see [the application secrets readme](./runbooks/rotate_application_secrets.md) -## Creating a new envirornment -If we ever need a new envirornment to replace `development`/`staging` or `stable` we need to follow similiar steps but not identical ones to the instructions for making a sandbox. +## 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 -4. +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 From 0376a43b73a412f02e2fc3473b03ded39a7999f8 Mon Sep 17 00:00:00 2001 From: Alysia Broddrick Date: Sun, 7 Jan 2024 19:47:45 -0800 Subject: [PATCH 04/38] updated release cadence doc --- docs/operations/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/operations/README.md b/docs/operations/README.md index 0629608dd..9a4e6e2b8 100644 --- a/docs/operations/README.md +++ b/docs/operations/README.md @@ -45,7 +45,7 @@ Your sandbox space should've been setup as part of the onboarding process. If th ## 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. From 849e3a16930b2063b5dd04b3695b9d1f169074da Mon Sep 17 00:00:00 2001 From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com> Date: Mon, 8 Jan 2024 16:31:53 -0600 Subject: [PATCH 05/38] Update content: Domain invitation email --- .../templates/emails/domain_invitation.txt | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/registrar/templates/emails/domain_invitation.txt b/src/registrar/templates/emails/domain_invitation.txt index f0612a67f..a1e029d6b 100644 --- a/src/registrar/templates/emails/domain_invitation.txt +++ b/src/registrar/templates/emails/domain_invitation.txt @@ -4,19 +4,28 @@ Hi. {{ requester_email }} has added you as a manager on {{ domain.name }}. 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 Login.gov account . + DOMAIN MANAGEMENT + 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 . +information updated. + +- Learn more about domain management . + +- Manage your domains . + SOMETHING WRONG? + If you’re not affiliated with {{ domain.name }} or think you received this -message in error, contact the .gov team . +message in error, reply to this email. THANK YOU @@ -28,5 +37,5 @@ using a .gov domain. The .gov team Contact us: -Visit -{% endautoescape %} \ No newline at end of file +Learn about .gov +{% endautoescape %} From e86e00b827fbe91674f9e1e42424d4640fe2b2ec Mon Sep 17 00:00:00 2001 From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com> Date: Mon, 8 Jan 2024 16:38:43 -0600 Subject: [PATCH 06/38] WIthdrawn email: subject line --- .../templates/emails/domain_request_withdrawn_subject.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/templates/emails/domain_request_withdrawn_subject.txt b/src/registrar/templates/emails/domain_request_withdrawn_subject.txt index ab935fb1d..5ceaa29af 100644 --- a/src/registrar/templates/emails/domain_request_withdrawn_subject.txt +++ b/src/registrar/templates/emails/domain_request_withdrawn_subject.txt @@ -1 +1 @@ -Your .gov domain request has been withdrawn \ No newline at end of file +Update on your .gov request: {{ application.requested_domain.name }} From 9eeda25d5b183a389d522ca9ec6e1658693cab3c Mon Sep 17 00:00:00 2001 From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com> Date: Mon, 8 Jan 2024 16:42:47 -0600 Subject: [PATCH 07/38] Updates to withdrawn email --- .../emails/domain_request_withdrawn.txt | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/registrar/templates/emails/domain_request_withdrawn.txt b/src/registrar/templates/emails/domain_request_withdrawn.txt index 333fdb3b7..fe9918788 100644 --- a/src/registrar/templates/emails/domain_request_withdrawn.txt +++ b/src/registrar/templates/emails/domain_request_withdrawn.txt @@ -1,15 +1,18 @@ {% autoescape off %}{# In a text file, we don't want to have HTML entities escaped #} Hi {{ application.submitter.first_name }}. -Your .gov domain request has been withdrawn. -DOMAIN REQUESTED: {{ application.requested_domain.name }} -REQUEST #: {{ application.id }} -STATUS: Withdrawn +Your .gov domain request has been withdrawn and will not be reviewed by our team. +DOMAIN REQUESTED: {{ application.requested_domain.name }} +STATUS: Withdrawn YOU CAN EDIT YOUR WITHDRAWN REQUEST -The details of your withdrawn request are included below. You can edit and resubmit this application by logging into the registrar. . +You can edit and resubmit this request by logging in to the registrar. . + +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. THANK YOU @@ -17,10 +20,7 @@ THANK YOU ---------------------------------------------------------------- -{% include 'emails/includes/application_summary.txt' %} ----------------------------------------------------------------- - The .gov team Contact us: -Visit -{% endautoescape %} \ No newline at end of file +Learn about .gov +{% endautoescape %} From c933d3dfc8d8d051d55df2fec69689e4071acd57 Mon Sep 17 00:00:00 2001 From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com> Date: Mon, 8 Jan 2024 17:10:35 -0600 Subject: [PATCH 08/38] Updates to domain approval email --- .../emails/status_change_approved.txt | 32 +++++++++++++------ 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/src/registrar/templates/emails/status_change_approved.txt b/src/registrar/templates/emails/status_change_approved.txt index e16b3e3e7..f91cac760 100644 --- a/src/registrar/templates/emails/status_change_approved.txt +++ b/src/registrar/templates/emails/status_change_approved.txt @@ -5,27 +5,39 @@ 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 -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. -YOU MUST ADD DOMAIN NAME SERVER INFORMATION +ADD DOMAIN NAME SERVER INFORMATION -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 . +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. -Get help with adding your domain name server information . +After you’ve set up hosting, you’ll need to enter your name server information on the .gov registrar. + +Learn more about: + +- Finding a DNS hosting service + +- Adding name servers . ADD DOMAIN MANAGERS, SECURITY EMAIL -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. +Currently, you’re the only person who can manage this domain. Please keep your contact information updated. -Go to the domain management page to add domain contacts and a security email . +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. -Get help with managing your .gov domain . +You can add domain managers and a security email on the .gov registrar. + +Learn more about: + +- Adding domain managers + +- Adding a security email + +- Domain security best practices THANK YOU @@ -36,5 +48,5 @@ THANK YOU The .gov team Contact us: -Visit +Learn about .gov {% endautoescape %} From b50737ed632fc27b880439104edf43646d759cbf Mon Sep 17 00:00:00 2001 From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com> Date: Mon, 8 Jan 2024 17:11:41 -0600 Subject: [PATCH 09/38] Update status - approved --- src/registrar/templates/emails/status_change_approved.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/templates/emails/status_change_approved.txt b/src/registrar/templates/emails/status_change_approved.txt index f91cac760..9ac98d781 100644 --- a/src/registrar/templates/emails/status_change_approved.txt +++ b/src/registrar/templates/emails/status_change_approved.txt @@ -5,7 +5,7 @@ Congratulations! Your .gov domain request has been approved. DOMAIN REQUESTED: {{ application.requested_domain.name }} REQUEST RECEIVED ON: {{ application.submission_date|date }} -STATUS: In review +STATUS: Approved You can manage your approved domain on the .gov registrar. From 1b2f34935ab66f13c3f00f5376cecac82f2edaff Mon Sep 17 00:00:00 2001 From: Alysia Broddrick Date: Mon, 8 Jan 2024 18:52:35 -0800 Subject: [PATCH 10/38] added hosts to be viewable on admin for non-analysts --- src/registrar/admin.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/registrar/admin.py b/src/registrar/admin.py index 364ae81f6..a90ede5c4 100644 --- a/src/registrar/admin.py +++ b/src/registrar/admin.py @@ -400,7 +400,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 +1253,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 propogate 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) From 5fed6d581086456973337194e47d823ccb06d64e Mon Sep 17 00:00:00 2001 From: Alysia Broddrick Date: Mon, 8 Jan 2024 18:52:59 -0800 Subject: [PATCH 11/38] updated host object to not be unique --- .../migrations/0062_alter_host_name.py | 17 +++++++++++++++++ src/registrar/models/host.py | 5 ++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 src/registrar/migrations/0062_alter_host_name.py diff --git a/src/registrar/migrations/0062_alter_host_name.py b/src/registrar/migrations/0062_alter_host_name.py new file mode 100644 index 000000000..9bdb72209 --- /dev/null +++ b/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), + ), + ] diff --git a/src/registrar/models/host.py b/src/registrar/models/host.py index 2d756111e..3b966832f 100644 --- a/src/registrar/models/host.py +++ b/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}" From 409615b125fb7be6eee42a790351d236521d406b Mon Sep 17 00:00:00 2001 From: Alysia Broddrick Date: Mon, 8 Jan 2024 19:12:45 -0800 Subject: [PATCH 12/38] linting --- src/registrar/admin.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/registrar/admin.py b/src/registrar/admin.py index a90ede5c4..e041ef728 100644 --- a/src/registrar/admin.py +++ b/src/registrar/admin.py @@ -400,7 +400,8 @@ class HostIPInline(admin.StackedInline): class MyHostAdmin(AuditedAdmin): """Custom host admin class to use our inlines.""" - search_fields = ["name","domain__name"] + + search_fields = ["name", "domain__name"] search_help_text = "Search by domain or hostname." inlines = [HostIPInline] From 4c04b5e6a064d94077993356c63d0907d3a2ea14 Mon Sep 17 00:00:00 2001 From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com> Date: Tue, 9 Jan 2024 12:16:13 -0600 Subject: [PATCH 13/38] Withdrawn email - updates --- .../templates/emails/domain_request_withdrawn.txt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/registrar/templates/emails/domain_request_withdrawn.txt b/src/registrar/templates/emails/domain_request_withdrawn.txt index fe9918788..463f4ae60 100644 --- a/src/registrar/templates/emails/domain_request_withdrawn.txt +++ b/src/registrar/templates/emails/domain_request_withdrawn.txt @@ -1,21 +1,19 @@ {% 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. DOMAIN REQUESTED: {{ application.requested_domain.name }} STATUS: Withdrawn -YOU CAN EDIT YOUR WITHDRAWN REQUEST -You can edit and resubmit this request by logging in to the registrar. . +YOU CAN EDIT YOUR WITHDRAWN REQUEST +You can edit and resubmit this request by logging in to the registrar . 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. THANK YOU - .Gov helps the public identify official, trusted information. Thank you for requesting a .gov domain. ---------------------------------------------------------------- From 5082a17c0e4ea235ffa79eb1ea4c006c26d0d9ea Mon Sep 17 00:00:00 2001 From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com> Date: Tue, 9 Jan 2024 12:23:47 -0600 Subject: [PATCH 14/38] Invitation updates --- .../templates/emails/domain_invitation.txt | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/registrar/templates/emails/domain_invitation.txt b/src/registrar/templates/emails/domain_invitation.txt index a1e029d6b..ef26ddb14 100644 --- a/src/registrar/templates/emails/domain_invitation.txt +++ b/src/registrar/templates/emails/domain_invitation.txt @@ -3,33 +3,29 @@ Hi. {{ requester_email }} has added you as a manager on {{ domain.name }}. -YOU NEED A LOGIN.GOV ACCOUNT +You can manage your approved domain on the .gov registrar. + +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 +account. + +If you don’t already have one, follow these steps to create your Login.gov account . - DOMAIN MANAGEMENT - 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 . - -- Manage your domains . - +Learn more about domain management . SOMETHING WRONG? - If you’re not affiliated with {{ domain.name }} or think you received this message in error, reply to this email. - THANK YOU - .Gov helps the public identify official, trusted information. Thank you for using a .gov domain. From 72f9fef8d8f1cf1831fe37280ac724fe9e31ecd4 Mon Sep 17 00:00:00 2001 From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com> Date: Tue, 9 Jan 2024 16:16:47 -0600 Subject: [PATCH 15/38] Approved subject line --- .../templates/emails/status_change_approved_subject.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/templates/emails/status_change_approved_subject.txt b/src/registrar/templates/emails/status_change_approved_subject.txt index 32756d463..5ceaa29af 100644 --- a/src/registrar/templates/emails/status_change_approved_subject.txt +++ b/src/registrar/templates/emails/status_change_approved_subject.txt @@ -1 +1 @@ -Your .gov domain request is approved \ No newline at end of file +Update on your .gov request: {{ application.requested_domain.name }} From ece2fb1e9952c24f7242fcf2072cc1d638641785 Mon Sep 17 00:00:00 2001 From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com> Date: Tue, 9 Jan 2024 16:17:11 -0600 Subject: [PATCH 16/38] Rejected subject line --- .../templates/emails/status_change_rejected_subject.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/templates/emails/status_change_rejected_subject.txt b/src/registrar/templates/emails/status_change_rejected_subject.txt index a15cc1575..5ceaa29af 100644 --- a/src/registrar/templates/emails/status_change_rejected_subject.txt +++ b/src/registrar/templates/emails/status_change_rejected_subject.txt @@ -1 +1 @@ -Your .gov domain request has been rejected \ No newline at end of file +Update on your .gov request: {{ application.requested_domain.name }} From 15a0e648d92b9effee53a3cfadf5e0100c07d406 Mon Sep 17 00:00:00 2001 From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com> Date: Tue, 9 Jan 2024 16:17:36 -0600 Subject: [PATCH 17/38] Submission subject line --- .../templates/emails/submission_confirmation_subject.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/templates/emails/submission_confirmation_subject.txt b/src/registrar/templates/emails/submission_confirmation_subject.txt index 34b958b3a..5ceaa29af 100644 --- a/src/registrar/templates/emails/submission_confirmation_subject.txt +++ b/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 }} From d4e258cdf55164dc30e946a9e67922753dc31eee Mon Sep 17 00:00:00 2001 From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com> Date: Tue, 9 Jan 2024 16:24:28 -0600 Subject: [PATCH 18/38] Domain invitation updates 2 --- src/registrar/templates/emails/domain_invitation.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/registrar/templates/emails/domain_invitation.txt b/src/registrar/templates/emails/domain_invitation.txt index ef26ddb14..a7ebf75d9 100644 --- a/src/registrar/templates/emails/domain_invitation.txt +++ b/src/registrar/templates/emails/domain_invitation.txt @@ -3,7 +3,7 @@ Hi. {{ requester_email }} has added you as a manager on {{ domain.name }}. -You can manage your approved domain on the .gov registrar. +You can manage this domain on the .gov registrar. YOU NEED A LOGIN.GOV ACCOUNT @@ -19,12 +19,13 @@ 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 . +Learn more about domain management . SOMETHING WRONG? If you’re not affiliated with {{ domain.name }} or think you received this message in error, reply to this email. + THANK YOU .Gov helps the public identify official, trusted information. Thank you for using a .gov domain. From 7b3f02d945761cb55d35a901b172161b99bad791 Mon Sep 17 00:00:00 2001 From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com> Date: Tue, 9 Jan 2024 16:34:46 -0600 Subject: [PATCH 19/38] Updates to submission email --- .../emails/submission_confirmation.txt | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/src/registrar/templates/emails/submission_confirmation.txt b/src/registrar/templates/emails/submission_confirmation.txt index b25704052..8029ee834 100644 --- a/src/registrar/templates/emails/submission_confirmation.txt +++ b/src/registrar/templates/emails/submission_confirmation.txt @@ -1,29 +1,26 @@ {% 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 - - -NEED TO MAKE CHANGES? - -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. +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 review your request. This usually takes 20 business days. +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. -- You can check the status of your request at any time. - +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. + +Learn more about withdrawing your request . -- We’ll email you with questions or when we complete our review. THANK YOU @@ -38,5 +35,5 @@ requesting a .gov domain. The .gov team Contact us: -Visit +Learn about .gov {% endautoescape %} From 2e3a0069f675ce9fd50c207fda1c3cf082140101 Mon Sep 17 00:00:00 2001 From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com> Date: Tue, 9 Jan 2024 17:03:46 -0600 Subject: [PATCH 20/38] Submission updates 2 --- .../templates/emails/submission_confirmation.txt | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/registrar/templates/emails/submission_confirmation.txt b/src/registrar/templates/emails/submission_confirmation.txt index 8029ee834..020825f94 100644 --- a/src/registrar/templates/emails/submission_confirmation.txt +++ b/src/registrar/templates/emails/submission_confirmation.txt @@ -7,7 +7,7 @@ DOMAIN REQUESTED: {{ application.requested_domain.name }} REQUEST RECEIVED ON: {{ application.submission_date|date }} 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 @@ -21,12 +21,8 @@ To make changes to your domain request, you have to withdraw it first. Withdrawi Learn more about withdrawing your 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. ---------------------------------------------------------------- From 6f285bf3b89dbd56e9fb00bda1ef0e2a126f44bd Mon Sep 17 00:00:00 2001 From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com> Date: Tue, 9 Jan 2024 17:10:33 -0600 Subject: [PATCH 21/38] Withdrawn updates 2 --- src/registrar/templates/emails/domain_request_withdrawn.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/registrar/templates/emails/domain_request_withdrawn.txt b/src/registrar/templates/emails/domain_request_withdrawn.txt index 463f4ae60..d5bde66da 100644 --- a/src/registrar/templates/emails/domain_request_withdrawn.txt +++ b/src/registrar/templates/emails/domain_request_withdrawn.txt @@ -4,8 +4,10 @@ Hi, {{ application.submitter.first_name }}. Your .gov domain request has been withdrawn and will not be reviewed by our team. DOMAIN REQUESTED: {{ application.requested_domain.name }} +REQUEST RECEIVED ON: {{ application.submission_date|date }} STATUS: Withdrawn +---------------------------------------------------------------- YOU CAN EDIT YOUR WITHDRAWN REQUEST You can edit and resubmit this request by logging in to the registrar . From 620314c833b5a1561e48c0a3420c8be8fe99b2ca Mon Sep 17 00:00:00 2001 From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com> Date: Tue, 9 Jan 2024 17:18:10 -0600 Subject: [PATCH 22/38] Spacing issue --- src/registrar/templates/emails/submission_confirmation.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/registrar/templates/emails/submission_confirmation.txt b/src/registrar/templates/emails/submission_confirmation.txt index 020825f94..0780a1e8c 100644 --- a/src/registrar/templates/emails/submission_confirmation.txt +++ b/src/registrar/templates/emails/submission_confirmation.txt @@ -8,6 +8,7 @@ REQUEST RECEIVED ON: {{ application.submission_date|date }} 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 From ff0307943a4d3a7fc0044a1a19d24218219b4a0c Mon Sep 17 00:00:00 2001 From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com> Date: Tue, 9 Jan 2024 17:24:23 -0600 Subject: [PATCH 23/38] Updates to approved 2 --- .../templates/emails/status_change_approved.txt | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/src/registrar/templates/emails/status_change_approved.txt b/src/registrar/templates/emails/status_change_approved.txt index 9ac98d781..7bb6509cc 100644 --- a/src/registrar/templates/emails/status_change_approved.txt +++ b/src/registrar/templates/emails/status_change_approved.txt @@ -9,39 +9,28 @@ STATUS: Approved You can manage your approved domain on the .gov registrar. +---------------------------------------------------------------- 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. After you’ve set up hosting, you’ll need to enter your name server information on the .gov registrar. Learn more about: - - Finding a DNS hosting service - - Adding 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 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. +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. Learn more about: - - Adding domain managers - - Adding a security email - - Domain security best practices - THANK YOU - .Gov helps the public identify official, trusted information. Thank you for using a .gov domain. ---------------------------------------------------------------- From 4d65b7662e307be5eec90929a4ce3a6aff3c137f Mon Sep 17 00:00:00 2001 From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com> Date: Tue, 9 Jan 2024 17:32:01 -0600 Subject: [PATCH 24/38] Updates to rejection email --- .../emails/status_change_rejected.txt | 32 +++++++++---------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/src/registrar/templates/emails/status_change_rejected.txt b/src/registrar/templates/emails/status_change_rejected.txt index 1b177573c..39953907a 100644 --- a/src/registrar/templates/emails/status_change_rejected.txt +++ b/src/registrar/templates/emails/status_change_rejected.txt @@ -1,32 +1,30 @@ {% 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 . - - -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 +- Choosing a .gov domain name + +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: -Visit +Learn about .gov {% endautoescape %} From f02cf3f892bdbc9d7c8c08e5e926e4030beda07e Mon Sep 17 00:00:00 2001 From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com> Date: Tue, 9 Jan 2024 17:35:52 -0600 Subject: [PATCH 25/38] Fix spacing issues --- src/registrar/templates/emails/status_change_approved.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/registrar/templates/emails/status_change_approved.txt b/src/registrar/templates/emails/status_change_approved.txt index 7bb6509cc..08a1f78b0 100644 --- a/src/registrar/templates/emails/status_change_approved.txt +++ b/src/registrar/templates/emails/status_change_approved.txt @@ -20,6 +20,7 @@ Learn more about: - Finding a DNS hosting service - Adding name servers . + ADD DOMAIN MANAGERS, SECURITY EMAIL Currently, you’re the only person who can manage this domain. Please keep your contact information updated. @@ -30,6 +31,7 @@ Learn more about: - Adding a security email - Domain security best practices + THANK YOU .Gov helps the public identify official, trusted information. Thank you for using a .gov domain. From d6716425a2c2cea63659d273afb632c0802ee35b Mon Sep 17 00:00:00 2001 From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com> Date: Tue, 9 Jan 2024 17:42:12 -0600 Subject: [PATCH 26/38] Fix spacing issues --- src/registrar/templates/emails/status_change_rejected.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/registrar/templates/emails/status_change_rejected.txt b/src/registrar/templates/emails/status_change_rejected.txt index 39953907a..c5afaf711 100644 --- a/src/registrar/templates/emails/status_change_rejected.txt +++ b/src/registrar/templates/emails/status_change_rejected.txt @@ -16,9 +16,11 @@ Learn more about: - Eligibility for a .gov domain - Choosing a .gov domain name + 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. From b3e5a7c033e0be94fb419938e164f0125fa3fa87 Mon Sep 17 00:00:00 2001 From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com> Date: Tue, 9 Jan 2024 17:47:27 -0600 Subject: [PATCH 27/38] More fixes --- src/registrar/templates/emails/status_change_approved.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/registrar/templates/emails/status_change_approved.txt b/src/registrar/templates/emails/status_change_approved.txt index 08a1f78b0..7665b1b1c 100644 --- a/src/registrar/templates/emails/status_change_approved.txt +++ b/src/registrar/templates/emails/status_change_approved.txt @@ -7,7 +7,7 @@ DOMAIN REQUESTED: {{ application.requested_domain.name }} REQUEST RECEIVED ON: {{ application.submission_date|date }} STATUS: Approved -You can manage your approved domain on the .gov registrar. +You can manage your approved domain on the .gov registrar . ---------------------------------------------------------------- @@ -27,9 +27,9 @@ Currently, you’re the only person who can manage this domain. Please keep your 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. Learn more about: -- Adding domain managers -- Adding a security email -- Domain security best practices +- Adding domain managers +- Adding a security email +- Domain security best practices THANK YOU From 0a1d0fd33421c4e3376f48a8d49b59add34da533 Mon Sep 17 00:00:00 2001 From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com> Date: Tue, 9 Jan 2024 17:52:40 -0600 Subject: [PATCH 28/38] Spacing issues --- src/registrar/templates/emails/domain_request_withdrawn.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/registrar/templates/emails/domain_request_withdrawn.txt b/src/registrar/templates/emails/domain_request_withdrawn.txt index d5bde66da..671149aaa 100644 --- a/src/registrar/templates/emails/domain_request_withdrawn.txt +++ b/src/registrar/templates/emails/domain_request_withdrawn.txt @@ -12,9 +12,11 @@ STATUS: Withdrawn YOU CAN EDIT YOUR WITHDRAWN REQUEST You can edit and resubmit this request by logging in to the registrar . + 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. + THANK YOU .Gov helps the public identify official, trusted information. Thank you for requesting a .gov domain. From b6fd21f0df2476125e382184ea94a2831a0c10d1 Mon Sep 17 00:00:00 2001 From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com> Date: Tue, 9 Jan 2024 18:00:16 -0600 Subject: [PATCH 29/38] More spacing issues --- src/registrar/templates/emails/submission_confirmation.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/registrar/templates/emails/submission_confirmation.txt b/src/registrar/templates/emails/submission_confirmation.txt index 0780a1e8c..16a951ac1 100644 --- a/src/registrar/templates/emails/submission_confirmation.txt +++ b/src/registrar/templates/emails/submission_confirmation.txt @@ -17,11 +17,13 @@ We’ll review your request. This usually takes 20 business days. During this re 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. + 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. Learn more about withdrawing your request . + THANK YOU .Gov helps the public identify official, trusted information. Thank you for requesting a .gov domain. From abd071b97ebb68e4cc3bdd82a80cb81de6415061 Mon Sep 17 00:00:00 2001 From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com> Date: Tue, 9 Jan 2024 18:08:37 -0600 Subject: [PATCH 30/38] Updates to invitation email 3 --- src/registrar/templates/emails/domain_invitation.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/registrar/templates/emails/domain_invitation.txt b/src/registrar/templates/emails/domain_invitation.txt index a7ebf75d9..ca15b0689 100644 --- a/src/registrar/templates/emails/domain_invitation.txt +++ b/src/registrar/templates/emails/domain_invitation.txt @@ -3,8 +3,9 @@ Hi. {{ requester_email }} has added you as a manager on {{ domain.name }}. -You can manage this domain on the .gov registrar. +You can manage this domain on the .gov registrar . +---------------------------------------------------------------- YOU NEED A LOGIN.GOV ACCOUNT You’ll need a Login.gov account to manage your .gov domain. Login.gov provides @@ -14,6 +15,7 @@ account. If you don’t already have one, follow these steps to create your Login.gov account . + DOMAIN MANAGEMENT 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 @@ -21,14 +23,14 @@ information updated. Learn more about domain management . + SOMETHING WRONG? If you’re not affiliated with {{ domain.name }} or think you received this 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. ---------------------------------------------------------------- From 5cfe783cbae8d2c5515f2f3723cdfadfa39fd488 Mon Sep 17 00:00:00 2001 From: Alysia Broddrick <109625347+abroddrick@users.noreply.github.com> Date: Tue, 9 Jan 2024 19:40:43 -0800 Subject: [PATCH 31/38] Update docs/operations/README.md Co-authored-by: rachidatecs <107004823+rachidatecs@users.noreply.github.com> --- docs/operations/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/operations/README.md b/docs/operations/README.md index a22fa4753..3b317a466 100644 --- a/docs/operations/README.md +++ b/docs/operations/README.md @@ -37,7 +37,7 @@ Binding the database in `manifest-.json` automatically inserts the 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`. -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. +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. From c97ff1cf51fc45eca6ce8f240ec470b7228a3bb9 Mon Sep 17 00:00:00 2001 From: Alysia Broddrick <109625347+abroddrick@users.noreply.github.com> Date: Tue, 9 Jan 2024 19:41:02 -0800 Subject: [PATCH 32/38] Update docs/operations/README.md Co-authored-by: rachidatecs <107004823+rachidatecs@users.noreply.github.com> --- docs/operations/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/operations/README.md b/docs/operations/README.md index 3b317a466..523782659 100644 --- a/docs/operations/README.md +++ b/docs/operations/README.md @@ -68,7 +68,7 @@ When possible all developers and designers should have their own sandboxes as th 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 the [onboarding guide](https://docs.google.com/document/d/1ukbpW4LSqkb_CCt8LWfpehP03qqfyYfvK3Fl21NaEq8/edit#heading=h.6dw0iz1u56ox) for how to do this and helpful hints +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) From 5f1f91e475c7b6c123ddae4341bc0a6c207ae3b5 Mon Sep 17 00:00:00 2001 From: Alysia Broddrick <109625347+abroddrick@users.noreply.github.com> Date: Tue, 9 Jan 2024 19:42:59 -0800 Subject: [PATCH 33/38] Update docs/operations/README.md Co-authored-by: zandercymatics <141044360+zandercymatics@users.noreply.github.com> --- docs/operations/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/operations/README.md b/docs/operations/README.md index 9a4e6e2b8..3fc43be50 100644 --- a/docs/operations/README.md +++ b/docs/operations/README.md @@ -45,7 +45,7 @@ Your sandbox space should've been setup as part of the onboarding process. If th ## Stable and Staging Release Rules -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`. +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. From 123862eb4910e21334b3b9a50e835bb258d973d6 Mon Sep 17 00:00:00 2001 From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com> Date: Wed, 10 Jan 2024 11:27:26 -0600 Subject: [PATCH 34/38] Typos --- src/registrar/templates/emails/domain_invitation.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/registrar/templates/emails/domain_invitation.txt b/src/registrar/templates/emails/domain_invitation.txt index ca15b0689..b9e4ba853 100644 --- a/src/registrar/templates/emails/domain_invitation.txt +++ b/src/registrar/templates/emails/domain_invitation.txt @@ -9,7 +9,7 @@ You can manage this domain on the .gov registrar . 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 +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 @@ -17,7 +17,7 @@ Login.gov 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. From 9cfa30f0539189f2c81d3b38f83fb5e63514dc1f Mon Sep 17 00:00:00 2001 From: Michelle Rago <60157596+michelle-rago@users.noreply.github.com> Date: Wed, 10 Jan 2024 12:41:14 -0500 Subject: [PATCH 35/38] Added comma after "Hi" to be consistent with other greetings --- src/registrar/templates/emails/status_change_approved.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/templates/emails/status_change_approved.txt b/src/registrar/templates/emails/status_change_approved.txt index 7665b1b1c..bc548bfb6 100644 --- a/src/registrar/templates/emails/status_change_approved.txt +++ b/src/registrar/templates/emails/status_change_approved.txt @@ -1,5 +1,5 @@ {% 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. From 0379c8aa5fbad4a614742b1873fb153a2d8cb4c6 Mon Sep 17 00:00:00 2001 From: Michelle Rago <60157596+michelle-rago@users.noreply.github.com> Date: Wed, 10 Jan 2024 12:51:50 -0500 Subject: [PATCH 36/38] Change "logging in" to "signing in" --- src/registrar/templates/emails/domain_request_withdrawn.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/templates/emails/domain_request_withdrawn.txt b/src/registrar/templates/emails/domain_request_withdrawn.txt index 671149aaa..ba40c2f08 100644 --- a/src/registrar/templates/emails/domain_request_withdrawn.txt +++ b/src/registrar/templates/emails/domain_request_withdrawn.txt @@ -10,7 +10,7 @@ STATUS: Withdrawn ---------------------------------------------------------------- YOU CAN EDIT YOUR WITHDRAWN REQUEST -You can edit and resubmit this request by logging in to the registrar . +You can edit and resubmit this request by signing in to the registrar . SOMETHING WRONG? From 3a221ce1cc4aba42d2de9369e4ccce3e1002bbad Mon Sep 17 00:00:00 2001 From: David Kennedy Date: Wed, 10 Jan 2024 14:35:52 -0500 Subject: [PATCH 37/38] update for code clarity --- src/registrar/forms/application_wizard.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/registrar/forms/application_wizard.py b/src/registrar/forms/application_wizard.py index 64fbdcdd6..82821f8d9 100644 --- a/src/registrar/forms/application_wizard.py +++ b/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,7 +165,7 @@ 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: From b5161eec4ceca31ac9a800a5c7604df5f0d64348 Mon Sep 17 00:00:00 2001 From: David Kennedy Date: Wed, 10 Jan 2024 18:43:53 -0500 Subject: [PATCH 38/38] removed extraneous line of code --- src/registrar/forms/application_wizard.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/registrar/forms/application_wizard.py b/src/registrar/forms/application_wizard.py index 82821f8d9..2d151a08e 100644 --- a/src/registrar/forms/application_wizard.py +++ b/src/registrar/forms/application_wizard.py @@ -171,7 +171,6 @@ class RegistrarFormSet(forms.BaseFormSet): else: # If there are no other relationships, delete the object db_obj.delete() - continue else: pre_update(db_obj, cleaned) db_obj.save()