Merge pull request #1648 from cisagov/dk/1030-update-get-gov-urls

Issue #1030: update all references to beta.get.gov to get.gov in all settings file…
2025-08-05 17:28:31 +02:00 · 2024-01-19 13:37:09 -05:00 · 2024-01-19 13:37:09 -05:00 · f4bc35d0e7
commit f4bc35d0e7
parent 6f4eeb495e 573d6d0565
22 changed files with 24 additions and 24 deletions
--- a/ops/manifests/manifest-ab.yaml
+++ b/ops/manifests/manifest-ab.yaml
@ -22,7 +22,7 @@ applications:
    # Tell Django how much stuff to log
    DJANGO_LOG_LEVEL: INFO
    # default public site location
-    GETGOV_PUBLIC_SITE_URL: https://beta.get.gov
+    GETGOV_PUBLIC_SITE_URL: https://get.gov
    # Flag to disable/enable features in prod environments
    IS_PRODUCTION: False
  routes:
--- a/ops/manifests/manifest-backup.yaml
+++ b/ops/manifests/manifest-backup.yaml
@ -22,7 +22,7 @@ applications:
    # Tell Django how much stuff to log
    DJANGO_LOG_LEVEL: INFO
    # default public site location
-    GETGOV_PUBLIC_SITE_URL: https://beta.get.gov
+    GETGOV_PUBLIC_SITE_URL: https://get.gov
    # Flag to disable/enable features in prod environments
    IS_PRODUCTION: False
  routes:
--- a/ops/manifests/manifest-bl.yaml
+++ b/ops/manifests/manifest-bl.yaml
@ -22,7 +22,7 @@ applications:
    # Tell Django how much stuff to log
    DJANGO_LOG_LEVEL: INFO
    # default public site location
-    GETGOV_PUBLIC_SITE_URL: https://beta.get.gov
+    GETGOV_PUBLIC_SITE_URL: https://get.gov
    # Flag to disable/enable features in prod environments
    IS_PRODUCTION: False
  routes:
--- a/ops/manifests/manifest-development.yaml
+++ b/ops/manifests/manifest-development.yaml
@ -22,7 +22,7 @@ applications:
    # Tell Django how much stuff to log
    DJANGO_LOG_LEVEL: INFO
    # default public site location
-    GETGOV_PUBLIC_SITE_URL: https://beta.get.gov
+    GETGOV_PUBLIC_SITE_URL: https://get.gov
    # Flag to disable/enable features in prod environments
    IS_PRODUCTION: False
  routes:
--- a/ops/manifests/manifest-dk.yaml
+++ b/ops/manifests/manifest-dk.yaml
@ -22,7 +22,7 @@ applications:
    # Tell Django how much stuff to log
    DJANGO_LOG_LEVEL: INFO
    # default public site location
-    GETGOV_PUBLIC_SITE_URL: https://beta.get.gov
+    GETGOV_PUBLIC_SITE_URL: https://get.gov
    # Flag to disable/enable features in prod environments
    IS_PRODUCTION: False
  routes:
--- a/ops/manifests/manifest-es.yaml
+++ b/ops/manifests/manifest-es.yaml
@ -22,7 +22,7 @@ applications:
    # Tell Django how much stuff to log
    DJANGO_LOG_LEVEL: INFO
    # default public site location
-    GETGOV_PUBLIC_SITE_URL: https://beta.get.gov
+    GETGOV_PUBLIC_SITE_URL: https://get.gov
    # Flag to disable/enable features in prod environments
    IS_PRODUCTION: False
  routes:
--- a/ops/manifests/manifest-gd.yaml
+++ b/ops/manifests/manifest-gd.yaml
@ -22,7 +22,7 @@ applications:
    # Tell Django how much stuff to log
    DJANGO_LOG_LEVEL: INFO
    # default public site location
-    GETGOV_PUBLIC_SITE_URL: https://beta.get.gov
+    GETGOV_PUBLIC_SITE_URL: https://get.gov
    # Flag to disable/enable features in prod environments
    IS_PRODUCTION: False
  routes:
--- a/ops/manifests/manifest-ko.yaml
+++ b/ops/manifests/manifest-ko.yaml
@ -22,7 +22,7 @@ applications:
    # Tell Django how much stuff to log
    DJANGO_LOG_LEVEL: INFO
    # default public site location
-    GETGOV_PUBLIC_SITE_URL: https://beta.get.gov
+    GETGOV_PUBLIC_SITE_URL: https://get.gov
    # Flag to disable/enable features in prod environments
    IS_PRODUCTION: False
  routes:
--- a/ops/manifests/manifest-ky.yaml
+++ b/ops/manifests/manifest-ky.yaml
@ -22,7 +22,7 @@ applications:
    # Tell Django how much stuff to log
    DJANGO_LOG_LEVEL: INFO
    # default public site location
-    GETGOV_PUBLIC_SITE_URL: https://beta.get.gov
+    GETGOV_PUBLIC_SITE_URL: https://get.gov
    # Flag to disable/enable features in prod environments
    IS_PRODUCTION: False
  routes:
--- a/ops/manifests/manifest-nl.yaml
+++ b/ops/manifests/manifest-nl.yaml
@ -22,7 +22,7 @@ applications:
    # Tell Django how much stuff to log
    DJANGO_LOG_LEVEL: INFO
    # default public site location
-    GETGOV_PUBLIC_SITE_URL: https://beta.get.gov
+    GETGOV_PUBLIC_SITE_URL: https://get.gov
    # Flag to disable/enable features in prod environments
    IS_PRODUCTION: False
  routes:
--- a/ops/manifests/manifest-rb.yaml
+++ b/ops/manifests/manifest-rb.yaml
@ -22,7 +22,7 @@ applications:
    # Tell Django how much stuff to log
    DJANGO_LOG_LEVEL: INFO
    # default public site location
-    GETGOV_PUBLIC_SITE_URL: https://beta.get.gov
+    GETGOV_PUBLIC_SITE_URL: https://get.gov
    # Flag to disable/enable features in prod environments
    IS_PRODUCTION: False
  routes:
--- a/ops/manifests/manifest-rh.yaml
+++ b/ops/manifests/manifest-rh.yaml
@ -22,7 +22,7 @@ applications:
    # Tell Django how much stuff to log
    DJANGO_LOG_LEVEL: INFO
    # default public site location
-    GETGOV_PUBLIC_SITE_URL: https://beta.get.gov
+    GETGOV_PUBLIC_SITE_URL: https://get.gov
    # Flag to disable/enable features in prod environments
    IS_PRODUCTION: False
  routes:
--- a/ops/manifests/manifest-rjm.yaml
+++ b/ops/manifests/manifest-rjm.yaml
@ -22,7 +22,7 @@ applications:
    # Tell Django how much stuff to log
    DJANGO_LOG_LEVEL: INFO
    # default public site location
-    GETGOV_PUBLIC_SITE_URL: https://beta.get.gov
+    GETGOV_PUBLIC_SITE_URL: https://get.gov
    # Flag to disable/enable features in prod environments
    IS_PRODUCTION: False
  routes:
--- a/ops/manifests/manifest-stable.yaml
+++ b/ops/manifests/manifest-stable.yaml
@ -22,7 +22,7 @@ applications:
    # Tell Django how much stuff to log
    DJANGO_LOG_LEVEL: INFO
    # default public site location
-    GETGOV_PUBLIC_SITE_URL: https://beta.get.gov
+    GETGOV_PUBLIC_SITE_URL: https://get.gov
    # Which OIDC provider to use
    OIDC_ACTIVE_PROVIDER: login.gov production
    # Flag to disable/enable features in prod environments
--- a/ops/manifests/manifest-staging.yaml
+++ b/ops/manifests/manifest-staging.yaml
@ -22,7 +22,7 @@ applications:
    # Tell Django how much stuff to log
    DJANGO_LOG_LEVEL: INFO
    # default public site location
-    GETGOV_PUBLIC_SITE_URL: https://beta.get.gov
+    GETGOV_PUBLIC_SITE_URL: https://get.gov
    # Flag to disable/enable features in prod environments
    IS_PRODUCTION: False
  routes:
--- a/ops/manifests/manifest-za.yaml
+++ b/ops/manifests/manifest-za.yaml
@ -22,7 +22,7 @@ applications:
    # Tell Django how much stuff to log
    DJANGO_LOG_LEVEL: INFO
    # default public site location
-    GETGOV_PUBLIC_SITE_URL: https://beta.get.gov
+    GETGOV_PUBLIC_SITE_URL: https://get.gov
    # Flag to disable/enable features in prod environments
    IS_PRODUCTION: False
  routes:
--- a/ops/scripts/manifest-sandbox-template-migrate.yaml
+++ b/ops/scripts/manifest-sandbox-template-migrate.yaml
@ -22,7 +22,7 @@ applications:
    # Tell Django how much stuff to log
    DJANGO_LOG_LEVEL: INFO
    # default public site location
-    GETGOV_PUBLIC_SITE_URL: https://beta.get.gov
+    GETGOV_PUBLIC_SITE_URL: https://get.gov
  # use a non-default route to avoid conflicts
  routes:
    - route: getgov-ENVIRONMENT-migrate.app.cloud.gov
--- a/ops/scripts/manifest-sandbox-template.yaml
+++ b/ops/scripts/manifest-sandbox-template.yaml
@ -22,7 +22,7 @@ applications:
    # Tell Django how much stuff to log
    DJANGO_LOG_LEVEL: INFO
    # default public site location
-    GETGOV_PUBLIC_SITE_URL: https://beta.get.gov
+    GETGOV_PUBLIC_SITE_URL: https://get.gov
    # Flag to disable/enable features in prod environments
    IS_PRODUCTION: False
  routes:
--- a/src/docker-compose.yml
+++ b/src/docker-compose.yml
@ -32,7 +32,7 @@ services:
      # Is this a production environment
      - IS_PRODUCTION
      # Public site URL link
-      - GETGOV_PUBLIC_SITE_URL=https://beta.get.gov
+      - GETGOV_PUBLIC_SITE_URL=https://get.gov
      # Set a username for accessing the registry
      - REGISTRY_CL_ID=nothing
      # Set a password for accessing the registry
--- a/src/registrar/config/settings.py
+++ b/src/registrar/config/settings.py
@ -335,7 +335,7 @@ CSP_INCLUDE_NONCE_IN = ["script-src-elem"]
 # Cross-Origin Resource Sharing (CORS) configuration
 # Sets clients that allow access control to manage.get.gov
 # TODO: remove :8080 to see if we can have all localhost access
-CORS_ALLOWED_ORIGINS = ["http://localhost:8080", "https://beta.get.gov"]
+CORS_ALLOWED_ORIGINS = ["http://localhost:8080", "https://beta.get.gov", "https://get.gov"]
 CORS_ALLOWED_ORIGIN_REGEXES = [r"https://[\w-]+\.sites\.pages\.cloud\.gov"]

 # Content-Length header is set by django.middleware.common.CommonMiddleware
--- a/src/registrar/templates/application_org_contact.html
+++ b/src/registrar/templates/application_org_contact.html
@ -1,8 +1,8 @@
 {% extends 'application_form.html' %}
-{% load field_helpers %}
+{% load field_helpers url_helpers %}

 {% block form_instructions %}
-  <p>If your domain request is approved, the name of your organization and your city/state will be listed in <a href="https://beta.get.gov/about/data/" target="_blank">.gov’s public data.</a></p>  
+  <p>If your domain request is approved, the name of your organization and your city/state will be listed in <a href="{% public_site_url 'about/data/' %}" target="_blank">.gov’s public data.</a></p>  

  <h2>What is the name and mailing address of the organization you represent?</h2>

--- a/src/registrar/tests/test_forms.py
+++ b/src/registrar/tests/test_forms.py
@ -101,7 +101,7 @@ class TestFormValidation(MockEppLib):
            (
                "whitehouse.gov",
                "That domain isn’t available. <a class='usa-link' "
-                "href='https://beta.get.gov/domains/choosing' target='_blank'>Read more about "
+                "href='https://get.gov/domains/choosing' target='_blank'>Read more about "
                "choosing your .gov domain</a>.",
            ),
        ]
@ -151,7 +151,7 @@ class TestFormValidation(MockEppLib):
            (
                "whitehouse.gov",
                "That domain isn’t available. <a class='usa-link' "
-                "href='https://beta.get.gov/domains/choosing' target='_blank'>Read more about "
+                "href='https://get.gov/domains/choosing' target='_blank'>Read more about "
                "choosing your .gov domain</a>.",
            ),
        ]