Merge pull request #5964 from mozilla/MPP-4425/remove-heroku

Remove heroku references and code paths (MPP-4425)

Author: jwhitlock

.buildpacks

@@ -4,17 +4,13 @@
 # DOCKER_USER    - login info for docker hub
 # DOCKER_PASS
 # COVERALLS_REPO_TOKEN - used by coveralls-python
-# HEROKU_APP_NAME - Name on Heroku
-# HEROKU_API_KEY - API key from service account
 #
 version: 2.1
 orbs:
   # https://circleci.com/developer/orbs/orb/circleci/node
   node: circleci/[email protected]
   # https://circleci.com/developer/orbs/orb/circleci/python
   python: circleci/[email protected]
-  # https://circleci.com/developer/orbs/orb/circleci/heroku
-  heroku: circleci/[email protected]
 
 executors:
   # Using executors so most of the version information is here
@@ -385,13 +381,6 @@ jobs:
               docker push "${DOCKERHUB_REPO}:${CIRCLE_TAG}"
             fi
 
-  heroku_deploy:
-    executor: heroku/default
-    steps:
-      - checkout
-      - heroku/install
-      - heroku/deploy-via-git
-
   # python_job is a generic job for Python and Django tests
   # It avoids duplicating code and forgetting to duplicate fixes
   # It uses functions defined in python_job.bash
@@ -739,10 +728,3 @@ workflows:
               ignore: /addon-.*/
             branches:
               only: main
-
-      - heroku_deploy:
-          requires:
-            - build_test_backend
-          filters:
-            branches:
-              only: main

.circleci/config.yml

@@ -60,7 +60,7 @@ Proceeded with **Option 3. Implement cron job to send welcome email** because it
 
 ### Option 3: Implement cron job to send welcome email
 
-Relay already has [many scheduled jobs](https://dashboard.heroku.com/apps/fx-private-relay/scheduler) setup to handle asynchronous work ranging from maintaining old data to renewing monthly phone limits for users.
+Relay already has many scheduled jobs setup to handle asynchronous work ranging from maintaining old data to renewing monthly phone limits for users.
 
 - Good, because Relay can reuse code to send welcome email if or when we move to Option 1 using Redis Queue.
 - Good, because this option is inline with how we used scheduled jobs and is the lowest complexity to implement.

Procfile

@@ -2,6 +2,10 @@
 
 This doc describes how we profile Relay code.
 
+**TODO** [MPP-4441][]: Update instructions for MozCloud
+
+[MPP-4441]: https://mozilla-hub.atlassian.net/browse/MPP-4441
+
 ## Google Cloud Profiler
 
 We use Google Cloud Profiler: https://cloud.google.com/profiler/docs/about-profiler
@@ -26,17 +30,13 @@ These are the high-level steps to set up Google Cloud Profiler in Relay.
 
 #### Dev server
 
-The dev server should already have profiling set up. If it does not:
-
-1. Get the Base64-encoded JSON key from another Relay ENGR
-2. Use `heroku config:set` to set the `GOOGLE_CLOUD_PROFILER_CREDENTIALS_B64`
-   environment variable value to the Base64-encoded JSON key.
-3. Use `heroku config:set` to set the `GOOGLE_APPLICATION_CREDENTIALS`
-   environment variable value to `gcp_key.json`
+Up until October 2025, the dev server ran in Heroku and had profiling enabled. In October
+2025, the dev server moved to MozCloud, a GCP-based environment. Additional work is needed
+to enable profiling in MozCloud.
 
-#### Stage & Prod
+#### Stage and Prod
 
-The stage & prod servers should already have profiling set up. If they do not:
+The traditional GCP-based servers should already have profiling set up. If they do not:
 
 1. Have SRE set the `GOOGLE_CLOUD_PROFILER_CREDENTIALS_B64` environment variable value
    to the corresponding Base64-encoded JSON key with `roles/cloudprofiler.agent`

docs/adr/0003-decouple-welcome-email-from-new-user-flow.md

@@ -4,7 +4,7 @@
 
 - [Production][prod] - Run by SRE team in GCP
 - [Stage][stage] - Run by SRE team in GCP
-- [Dev][dev] - Run by ENGR team in Heroku
+- [Dev][dev] - Run by ENGR team in MozCloud
 - Locals: Run by ENGRs on their own devices. (See [README][readme] and other [`docs/`][docs].)
 
 ## Code branches
@@ -65,23 +65,11 @@ environment. To do this, we first release code to [Dev][dev] and
 
 ## Release to Dev
 
-Every commit to `main` is automatically deployed to the [Dev][dev] server, as
-long as it can be done with a fast-forward push. Since the
-[Great GitHub Heroku Incident of 2022][github-heroku-incident], this is
-done from CircleCI using a [service account][service-account].
+Every commit to `main` is automatically deployed to the [Dev][dev] server.
 
-To push a different branch, you need to add the Heroku app as a remote:
+**TODO** [MPP-4443][]: Add instructions for pushing an alternate branch in MozCloud.
 
-- `heroku login`
-- `heroku git:remote -a fx-private-relay`
-
-Then, you can push your local unmerged branch to Heroku:
-
-- `git push -f heroku change-1:main`
-
-Merges to main will fail to deploy until someone manually resets it to `main`:
-
-- `git push -f heroku main`
+[MPP-4443]: https://mozilla-hub.atlassian.net/browse/MPP-4443
 
 ## Release to Stage
 
@@ -136,7 +124,7 @@ After you push the tag to GitHub, you should also
 5. Edit the generated notes to add a planned release summary and organize PRs
    into sections, such as:
 
-   ```
+   ```text
    Planned for release to relay.firefox.com on August 9th, 2022.
 
    ## User-facing changes
@@ -167,7 +155,8 @@ On Monday, after the Release Readiness Review:
 1. File an [SRE ticket][sre-form] to deploy the tag to [Prod][prod].
    - Include a link to the GitHub Release
 2. On the GitHub release, update the summary with a reference to the ticket:
-   ```
+
+   ```text
    Planned for release to relay.firefox.com on August 9th, 2022 with SVCSE-1385.
    ```
 
@@ -181,10 +170,13 @@ On Tuesday:
    - Check [grafana dashboard](https://earthangel-b40313e5.influxcloud.net/d/qiwPC76Zk/fx-private-relay?orgId=1&refresh=1m&from=now-1h&to=now) for any unexpected spike in ops
    - (optional) [Run end-to-end tests](https://github.com/mozilla/fx-private-relay/actions/workflows/playwright.yml) on prod (Note: as of 2023-07-12 these are known-broken. 😢)
 3. Update the GitHub release:
+
    - Update the summary:
-     ```
+
+     ```text
      Released to relay.firefox.com on August 9th, 2022 with SVCSE-1385.
      ```
+
    - De-select "Set as a pre-release",
    - Select "Set as the latest release"
    - Click "Update release"
@@ -355,13 +347,12 @@ long-running branches")
 
 [prod]: https://relay.firefox.com/
 [stage]: https://stage.fxprivaterelay.nonprod.cloudops.mozgcp.net/
-[dev]: https://dev.fxprivaterelay.nonprod.cloudops.mozgcp.net/
+[dev]: https://relay-dev.allizom.org/
 [readme]: https://github.com/mozilla/fx-private-relay/blob/main/README.md
 [docs]: https://github.com/mozilla/fx-private-relay/tree/main/docs
 [github-flow]: https://docs.github.com/en/get-started/quickstart/github-flow
-[github-heroku-incident]: https://blog.heroku.com/april-2022-incident-review
-[service-account]: https://mana.mozilla.org/wiki/display/TS/List+of+Heroku+service+accounts
 [calver]: https://calver.org/
 [sre-form]: https://mozilla-hub.atlassian.net/jira/software/c/projects/SREIN/form/1344
 [github-new-release]: https://github.com/mozilla/fx-private-relay/releases/new
 [prod-version]: https://relay.firefox.com/__version__
+[feature-flags]: ./feature_flags.md

docs/img/structurizr-1-RelayDevelopmentDeployment-key.svg

@@ -150,20 +150,13 @@ additional services for the deployment environment.
 
 ## Development Deployment Diagram
 
-The development deployment is hosted in Heroku and AWS. Deployments are done by Relay
-developers, by pushing a branch to Heroku.
+Up until October 2025, the development deployment was hosted in Heroku and AWS.
+After October 2025, the development deployment is in MozCloud (a Mozilla-managed
+GCP environment) and AWS.
 
-The Dev Deployment lacks some of the full Relay System features:
+**TODO** MPP-4442: Update diagrams for MozCloud.
 
-- Logs are not forwarded to the data platform
-- Metrics are disabled
-- Firefox does not integrate with this deployment
-- There are no other API users (as far as we know)
-
-[![Development Deployment](./img/structurizr-1-RelayDevelopmentDeployment.svg)](./img/structurizr-1-RelayDevelopmentDeployment.svg)
-
-Key:
-![Development_Deployment](./img/structurizr-1-RelayDevelopmentDeployment-key.svg)
+[MPP-4442]: https://mozilla-hub.atlassian.net/browse/MPP-4442
 
 ## Stage Deployment Diagram
 

docs/img/structurizr-1-RelayDevelopmentDeployment.svg

@@ -363,86 +363,6 @@ workspace "${SERVICE_NAME}" "Mozilla's service providing email and phone masks."
         c2_periodic_tasks -> metrics "Sends metrics" "UDP"
         c2_periodic_tasks -> logs "Emits logs"
 
-        dev_deploy = deploymentEnvironment "dev.fxprivaterelay.nonprod.cloudops.mozgcp.net" {
-            deploymentNode "Dev User Interfaces" {
-                dev_web = containerInstance web
-                dev_add_on = containerInstance add_on
-            }
-            deploymentNode "Amazon Web Services" {
-                deploymentNode "us-east-1 region" {
-                    deploymentNode "Amazon SQS" {
-                        dev_sqs_dlq = containerInstance email_dlq_queue
-                        dev_sqs_emails = containerInstance email_queue
-                    }
-                    deploymentNode "Amazon SNS" {
-                        dev_sns_topic = containerInstance email_topic
-                    }
-                    deploymentNode "Amazon SES" {
-                        dev_ses_incoming = containerInstance email_receiver
-                        dev_ses_outgoing = containerInstance email_sender
-                    }
-                    deploymentNode "Amazon S3" {
-                        dev_s3_emails = containerInstance email_object_store
-                    }
-                    deploymentNode "Amazon KMS" {
-                        dev_kms_emails = containerInstance email_key
-                    }
-                }
-            }
-            deploymentNode "Heroku" {
-                deploymentNode "Dynos" {
-                    deploymentNode "web" {
-                        web_dyno = containerInstance web_app
-                    }
-                    deploymentNode "worker" {
-                        worker_dyno = containerInstance email_processor
-                    }
-                }
-                deploymentNode "Heroku Add-Ons" {
-                    deploymentNode "Heroku Data for Redis" {
-                        heroku_cache = containerInstance cache
-                    }
-                    deploymentNode "Heroku Postgres" {
-                        heroku_psql = containerInstance db
-                    }
-                    deploymentNode "Heroku Scheduler" {
-                        heroku_task_cleanup = containerInstance task_cleanup
-                        heroku_task_clean_replies = containerInstance task_clean_replies
-                        heroku_task_sync_phones = containerInstance task_sync_phones
-                        heroku_task_update_phones = containerInstance task_update_phones
-                        heroku_task_welcome = containerInstance task_welcome
-                        heroku_task_dql = containerInstance task_dlq
-                    }
-
-                    deploymentNode "Papertrail" {
-                        heroku_papertrail = containerInstance logs
-                    }
-                }
-            }
-            deploymentNode "Google Cloud Platform" {
-                deploymentNode "Cloud Profiler" {
-                    dev_gcprofiler = containerInstance profiler
-                }
-            }
-            deploymentNode accounts.stage.mozaws.net {
-                dev_accounts = softwareSystemInstance accounts
-            }
-            deploymentNode analytics.google.com {
-                dev_ga = softwareSystemInstance ga
-            }
-            deploymentNode mozilla.sentry.io {
-                dev_sentry = softwareSystemInstance sentry
-            }
-            deploymentNode "Stripe" {
-                dev_stripe = softwareSystemInstance stripe {
-                    description "Development Stripe, with select subscriptions"
-                }
-            }
-            deploymentNode twilio.com {
-                dev_twilio_phone = containerInstance phone_service
-            }
-        }
-
         stage_deploy = deploymentEnvironment "stage.fxprivaterelay.nonprod.cloudops.mozgcp.net" {
             deploymentNode "Stage User Interfaces" {
                 stage_web = containerInstance web
@@ -923,10 +843,6 @@ workspace "${SERVICE_NAME}" "Mozilla's service providing email and phone masks."
             email_sender -> user "User receives email"
         }
 
-        deployment relay dev_deploy "RelayDevelopmentDeployment" {
-            title "[Deployment] Development"
-            include *
-        }
         deployment relay stage_deploy "RelayStageDeployment" {
             title "[Deployment] Stage"
             include *