From 677516ccb43a59cd157da6dbbc9c21944b7df36c Mon Sep 17 00:00:00 2001
From: Alex Steel <130377221+asteel-gsa@users.noreply.github.com>
Date: Fri, 6 Dec 2024 09:35:00 -0500
Subject: [PATCH 1/2] Remove pre-deploy zap scan from staging and prod deploy
 (#4504)

* Remove dev zap scan from staging deploy

* Also happens in prod
---
 .github/workflows/deploy-production.yml | 8 --------
 .github/workflows/deploy-staging.yml    | 7 -------
 2 files changed, 15 deletions(-)

diff --git a/.github/workflows/deploy-production.yml b/.github/workflows/deploy-production.yml
index c66205a864..3e1859de3b 100644
--- a/.github/workflows/deploy-production.yml
+++ b/.github/workflows/deploy-production.yml
@@ -14,18 +14,10 @@ jobs:
     uses: ./.github/workflows/linting.yml
     secrets: inherit
 
-  # up to date scan of the staging instance
-  scan-staging:
-    name: ZAP scan of the staging site
-    uses: ./.github/workflows/zap-scan.yml
-    with:
-      url: "https://fac-staging.app.cloud.gov/"
-
   deploy-infrastructure-production:
     name: Deploy infrastructure (production)
     needs:
       - testing
-      - scan-staging
     uses: ./.github/workflows/terraform-apply-env.yml
     with:
       environment: "production"
diff --git a/.github/workflows/deploy-staging.yml b/.github/workflows/deploy-staging.yml
index cdc59bf003..e2acb5d116 100644
--- a/.github/workflows/deploy-staging.yml
+++ b/.github/workflows/deploy-staging.yml
@@ -14,17 +14,10 @@ jobs:
     uses: ./.github/workflows/linting.yml
     secrets: inherit
 
-  scan-dev:
-    name: Zap Scan
-    uses: ./.github/workflows/zap-scan.yml
-    with:
-      url: "https://fac-dev.app.cloud.gov/"
-
   deploy-infrastructure-staging:
     name: Deploy infrastructure (staging)
     needs:
       - testing
-      - scan-dev
     uses: ./.github/workflows/terraform-apply-env.yml
     with:
       environment: "staging"

From 535f9482e98f16b3ca63e488cca2125d4e245767 Mon Sep 17 00:00:00 2001
From: James Person <james.person@gsa.gov>
Date: Fri, 6 Dec 2024 11:14:34 -0500
Subject: [PATCH 2/2] Maintenance Banner Copy Update (#4515)

* Center the maintenance banner content

* 'grid-container' on the body, not just the text.

* doing site upgrade -> performing maintenance
---
 backend/config/settings.py                         | 2 +-
 backend/templates/includes/maintenance_banner.html | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/config/settings.py b/backend/config/settings.py
index 92b8071364..1bbced2674 100644
--- a/backend/config/settings.py
+++ b/backend/config/settings.py
@@ -594,6 +594,6 @@
         "start": datetime(2024, 12, 5, 17, tzinfo=timezone.utc),
         "end": datetime(2024, 12, 10, 17, tzinfo=timezone.utc),
         "template_name": "maintenance_20241210.html",
-        "message": "FAC.gov will be doing a site upgrade on Tuesday, December 10, 2024 between 12:00 p.m. and 6:00 p.m ET. During this period, the entire website will be unavailable.",
+        "message": "FAC.gov will be performing maintenance on Tuesday, December 10, 2024 between 12:00 p.m. and 6:00 p.m ET. During this period, the entire website will be unavailable.",
     },
 ]
diff --git a/backend/templates/includes/maintenance_banner.html b/backend/templates/includes/maintenance_banner.html
index df5941b214..a9e539e98c 100644
--- a/backend/templates/includes/maintenance_banner.html
+++ b/backend/templates/includes/maintenance_banner.html
@@ -1,13 +1,13 @@
 <section class="usa-alert usa-alert--warning margin-top-0" aria-label="Site alert">
     <div class="usa-alert__body grid-container">
-      <h4 class="usa-alert__heading">Scheduled system upgrade</h4>
+      <h4 class="usa-alert__heading">Scheduled system maintenance</h4>
 
       {% comment %} If a message is given, use it. If not, display a generic message with the timeframe. {% endcomment %}
       <p class="usa-alert__text">
         {% if MAINTENANCE_BANNER_MESSAGE %}
             {{ MAINTENANCE_BANNER_MESSAGE }}
         {% else %}
-            FAC.gov will be doing a site upgrade from {{ MAINTENANCE_BANNER_START_TIME|date:"N j, Y, f A" }} to {{ MAINTENANCE_BANNER_END_TIME|date:"N j, Y, f A" }}. 
+            FAC.gov will be performing maintenance from {{ MAINTENANCE_BANNER_START_TIME|date:"N j, Y, f A" }} to {{ MAINTENANCE_BANNER_END_TIME|date:"N j, Y, f A" }}. 
             During this period, the entire website will be unavailable.
         {% endif %}
       </p>