Merge branch 'main' into refactor-e2e-relay-only-MPP-4466

Author: groovecoder

.lintstagedrc.js

@@ -2,10 +2,7 @@ module.exports = {
   "frontend/**/*.{scss,css}": "stylelint --fix",
   "frontend/**/*.{ts,tsx,js,jsx,scss,css}": "prettier --write",
   "e2e-tests/**/*.ts": "prettier --write",
-  "frontend/**/*.{ts,tsx,js,jsx}": (filenames) =>
-    `next lint frontend --fix --file ${filenames
-      .map((file) => file.split(process.cwd())[1])
-      .join(" --file ")}`,
+  "frontend/{src,pages}/**/*.{ts,tsx,js,jsx}": "eslint --fix --config frontend/.eslintrc.js",
   "*.md": "prettier --write",
   "*.py": ["black", "mypy", "ruff check --fix"],
 }

docs/django-migrations-standards.md

@@ -21,12 +21,10 @@ The Django migration command `./manage.py makemigrations` utilizes [AddField ope
    - When writing a new entry to the updated table with a new column, version X doesn't know about new columns and will omit them from INSERT statements.
      > [!NOTE]
      > These columns need a database default or allow `NULL`
-
-4. Canary pod with Version X+1 starts. It is running the same time as all the Version X pods.
-5. Kubernetes rollout of Version X+1 starts:
+4. Kubernetes rollout of Version X+1 starts:
    - New pod with Version X+1 starts.
    - When the Version X+1 pod is running, the Version X pod is shut down. This continues until no pods run Version X.
-6. Version X+1 code is happily running in several pods.
+5. Version X+1 code is happily running in several pods.
    > [!WARNING]
    > Misaligned code and database happens in Step 3 when Version X adds a new entry to the table without proper default set. In Step 6, the Version X+1 retrieves the entry. The fetched entry added by Version X does not meet the field validation in Version X+1 causing validation error.
 
@@ -46,11 +44,10 @@ Like adding a new field in an existing model, when deleting an existing model or
    - Meanwhile the column remains in the database.
      > [!NOTE]
      > When writing to an existing table, version X should not refer to deleted columns.
-4. Canary pod with Version X+1 starts. It is running the same time as all the Version X pods.
-5. Kubernetes rollout of Version X+1 starts:
+4. Kubernetes rollout of Version X+1 starts:
    - New pod with Version X+1 starts.
    - When the Version X+1 pod is running, the Version X pod is shut down. This continues until no pods run Version X.
-6. Version X+1 code is happily running in several pods.
+5. Version X+1 code is happily running in several pods.
    > [!WARNING]
    > Error happens when Version X or Version X+1 code refers to the deleted column.
 

docs/img/structurizr-1-RelayProductionDeployment.svg

@@ -2,8 +2,8 @@
 
 ## Environments
 
-- [Production][prod] - Run by SRE team in GCP
-- [Stage][stage] - Run by SRE team in GCP
+- [Production][prod] - Run by ENGR team in GCP
+- [Stage][stage] - Run by ENGR in GCP
 - [Dev][dev] - Run by ENGR team in MozCloud
 - Locals: Run by ENGRs on their own devices. (See [README][readme] and other [`docs/`][docs].)
 
@@ -180,12 +180,13 @@ On Tuesday, after the Release Readiness review with QA:
 
 1. Use the [release workflow][release-workflow] to select the tag and deploy
    to the [Prod][prod] environment by selecting `prod`.
-2. When you see `Application relay... is now running new version of deployments manifests.` in `#fx-private-relay-eng` on Slack, do some checks on prod:
+2. Once the GitHub action finishes- go to ArgoCD an click "Sync" in the production application.
+3. When you see `Application relay... is now running new version of deployments manifests.` in `#fx-private-relay-eng` on Slack, do some checks on prod:
    - Spot-check the site for basic functionality
    - Check [sentry prod project](https://mozilla.sentry.io/releases/?environment=prod) for a spike in any new issues
    - Check [grafana dashboard](https://yardstick.mozilla.org/) for any unexpected spike in ops
    - (optional) [Run the relay-only e2e test suite](https://github.com/mozilla/fx-private-relay/actions/workflows/playwright.yml) on prod
-3. Update the GitHub release:
+4. Update the GitHub release:
    - Update the summary:
 
      ```text

docs/img/structurizr-1-RelayStageDeployment.svg

@@ -160,8 +160,8 @@ GCP environment) and AWS.
 
 ## Stage Deployment Diagram
 
-The stage deployment is hosted in GCP and AWS. Deployments are done by Jenkins
-when a new tagged Docker image is published.
+The stage deployment is hosted in GCP and AWS. Deployments are done by ArgoCD
+when a new tagged Docker image is published to Google Artifact Registry.
 
 The Stage Deployment lacks some of the full Relay System features:
 
@@ -171,7 +171,6 @@ The Stage Deployment lacks some of the full Relay System features:
 The Stage Deployment has some additional features:
 
 - There is a read-only replica of the database
-- There is a canary app deployment. This single pod is updated first, so that any errors
   will halt the full deployment.
 - The Metrics Aggregator (statsd-telegraf) queries the database periodically
 - The stackdriver-telegraf service queries the GCP Cloud Metrics periodically
@@ -183,8 +182,9 @@ Key:
 
 ## Production Deployment Diagram
 
-The production deployment is hosted in GCP and AWS. Deployments are done by Jenkins
-when an SRE continues a stage deploy.
+The production deployment is hosted in GCP and AWS. Deployments are done by ArgoCD
+when a engineer clicks "Sync" after pushing up a production image tag to Google Artifact
+Registry.
 
 The Production Deployment has some additional features:
 

docs/release_process.md

@@ -368,6 +368,12 @@ workspace "${SERVICE_NAME}" "Mozilla's service providing email and phone masks."
                 stage_web = containerInstance web
                 stage_add_on = containerInstance add_on
             }
+            deploymentNode "Fastly" {
+                stage_fastly = infrastructureNode "fastly" {
+                    description "Tracks IP reputation, blocks IPs"
+                    tags "Deployment Service"
+                }
+            }
             deploymentNode "Amazon Web Services" {
                 deploymentNode "us-east-1 region" {
                     deploymentNode "Amazon SQS" {
@@ -404,17 +410,6 @@ workspace "${SERVICE_NAME}" "Mozilla's service providing email and phone masks."
                         }
                         stage_app_web = containerInstance web_app
                     }
-                    deploymentNode "app-canary" {
-                        technology "Kubernetes Deployment"
-                        instances 1
-                        stage_app_canary_nginx = infrastructureNode "nginx" {
-                            tags "Deployment Service"
-                            description "Reverse proxy"
-                        }
-                        stage_app_canary_web = containerInstance web_app {
-                            description "Canary App for deployment testing"
-                        }
-                    }
                     deploymentNode "cleanup" {
                         technology "Kubernetes Cron Job"
                         stage_task_cleanup = containerInstance task_cleanup
@@ -444,14 +439,6 @@ workspace "${SERVICE_NAME}" "Mozilla's service providing email and phone masks."
                         technology "Kubernetes Cron Job"
                         stage_task_welcome = containerInstance task_welcome
                     }
-                    deploymentNode "iprepd-nginx" {
-                        technology "Kubernetes Deployment"
-                        instances 3
-                        stage_iprepd_nginx = infrastructureNode "iprepd-nginx" {
-                            description "Tracks IP reputation, blocks IPs"
-                            tags "Deployment Service"
-                        }
-                    }
                     deploymentNode "statsd-telegraf" {
                         technology "Kubernetes Deployment"
                         instances 1
@@ -480,7 +467,7 @@ workspace "${SERVICE_NAME}" "Mozilla's service providing email and phone masks."
                 }
                 deploymentNode "Cloud Load Balancing" {
                     stage_lb = infrastructureNode "Load Balancer" {
-                        description "Zone for fxprivaterelay.nonprod.cloudops.mozgcp.net"
+                        description "Zone for stage.relay.nonprod.webservices.mozgcp.net"
                         tags "Managed Service"
                     }
                 }
@@ -508,16 +495,14 @@ workspace "${SERVICE_NAME}" "Mozilla's service providing email and phone masks."
             deploymentNode twilio.com {
                 stage_phone = containerInstance phone_service
             }
-            stage_iprepd_nginx -> stage_app_nginx "Requests" "HTTP"
-            stage_iprepd_nginx -> stage_app_canary_nginx "Requests" "HTTP"
+            stage_fastly -> stage_lb "Requests" "HTTP"
+            stage_lb -> stage_app_nginx "Requests" "HTTP"
             stage_app_nginx -> stage_app_web "Requests" "HTTP 1.0"
-            stage_app_canary_nginx -> stage_app_canary_web "Requests" "HTTP"
             stage_logs -> stage_bq "Forwards Logs"
-            stage_lb -> stage_iprepd_nginx "Requests" "HTTP"
-            stage_web -> stage_lb "Uses API, requests static assets"
-            stage_add_on -> stage_lb "Uses API, sends UI events"
-            stage_phone -> stage_lb "Informs of incoming SMS and calls"
-            stage_email_topic -> stage_lb "Sends emails, complaints, bounces" "SQS" "Optional Relationship"
+            stage_web -> stage_fastly "Uses API, requests static assets"
+            stage_add_on -> stage_fastly "Uses API, sends UI events"
+            stage_phone -> stage_fastly "Informs of incoming SMS and calls"
+            stage_email_topic -> stage_fastly "Sends emails, complaints, bounces" "SQS" "Optional Relationship"
             stage_cloudwatch -> stage_metrics "Polls metrics"
         }
         prod_deploy = deploymentEnvironment "relay.firefox.com" {
@@ -552,6 +537,12 @@ workspace "${SERVICE_NAME}" "Mozilla's service providing email and phone masks."
                     tags "Managed Service"
                 }
             }
+            deploymentNode "Fastly" {
+                prod_fastly = infrastructureNode "fastly" {
+                    description "Tracks IP reputation, blocks IPs"
+                    tags "Deployment Service"
+                }
+            }
             deploymentNode "Google Cloud Platform" {
                 deploymentNode "Kubernetes Engine" {
                     deploymentNode "app" {
@@ -563,17 +554,6 @@ workspace "${SERVICE_NAME}" "Mozilla's service providing email and phone masks."
                         }
                         prod_app_web = containerInstance web_app
                     }
-                    deploymentNode "app-canary" {
-                        technology "Kubernetes Deployment"
-                        instances 1
-                        prod_app_canary_nginx = infrastructureNode "nginx" {
-                            tags "Deployment Service"
-                            description "Reverse proxy"
-                        }
-                        prod_app_canary_web = containerInstance web_app {
-                            description "Canary App for deployment testing"
-                        }
-                    }
                     deploymentNode "cleanup" {
                         technology "Kubernetes Cron Job"
                         prod_task_cleanup = containerInstance task_cleanup
@@ -603,14 +583,6 @@ workspace "${SERVICE_NAME}" "Mozilla's service providing email and phone masks."
                         technology "Kubernetes Cron Job"
                         prod_task_welcome = containerInstance task_welcome
                     }
-                    deploymentNode "iprepd-nginx" {
-                        technology "Kubernetes Deployment"
-                        instances 3
-                        prod_iprepd_nginx = infrastructureNode "iprepd-nginx" {
-                            description "Tracks IP reputation, blocks IPs"
-                            tags "Deployment Service"
-                        }
-                    }
                     deploymentNode "statsd-telegraf" {
                         technology "Kubernetes Deployment"
                         instances 1
@@ -638,7 +610,7 @@ workspace "${SERVICE_NAME}" "Mozilla's service providing email and phone masks."
                 }
                 deploymentNode "Cloud Load Balancing" {
                     prod_lb = infrastructureNode "Load Balancer" {
-                        description "Zone for prod.fxprivaterelay.prod.cloudops.mozgcp.net"
+                        description "Zone for prod.relay.prod.webservices.mozgcp.net"
                         tags "Managed Service"
                     }
                 }
@@ -666,19 +638,17 @@ workspace "${SERVICE_NAME}" "Mozilla's service providing email and phone masks."
             deploymentNode twilio.com {
                 prod_phone = containerInstance phone_service
             }
-            prod_iprepd_nginx -> prod_app_nginx "Requests" "HTTP"
-            prod_iprepd_nginx -> prod_app_canary_nginx "Requests" "HTTP"
+            prod_fastly -> prod_lb "Requests" "HTTP"
+            prod_lb -> prod_app_nginx "Requests" "HTTP"
             prod_app_nginx -> prod_app_web "Requests" "HTTP 1.0"
-            prod_app_canary_nginx -> prod_app_canary_web "Requests" "HTTP"
             prod_logs -> prod_bq "Forwards Logs"
-            prod_lb -> prod_iprepd_nginx "Requests" "HTTP"
-            prod_web -> prod_lb "Uses API, requests static assets"
-            prod_add_on -> prod_lb "Uses API, sends UI events"
-            prod_firefox -> prod_lb "Uses API"
-            prod_other_client -> prod_lb "Uses API"
+            prod_web -> prod_fastly "Uses API, requests static assets"
+            prod_add_on -> prod_fastly "Uses API, sends UI events"
+            prod_firefox -> prod_fastly "Uses API"
+            prod_other_client -> prod_fastly "Uses API"
             prod_cloudwatch -> prod_metrics "Pulls metrics"
-            prod_phone -> prod_lb "Informs of incoming SMS and calls"
-            prod_email_topic -> prod_lb "Sends emails, complaints, bounces" "SQS" "Optional Relationship"
+            prod_phone -> prod_fastly "Informs of incoming SMS and calls"
+            prod_email_topic -> prod_fastly "Sends emails, complaints, bounces" "SQS" "Optional Relationship"
         }
     }