From 6345eef8a488aed8d18e45d844ea207ef611bf22 Mon Sep 17 00:00:00 2001
From: Jamil <jamilbk@users.noreply.github.com>
Date: Mon, 5 Feb 2024 07:52:06 -0800
Subject: [PATCH] chore(infra): Limit relays to used regions and expected load
 (#3540)

Fixes #3537
---
 terraform/environments/production/main.tf | 70 +++++++++++++----------
 terraform/environments/staging/main.tf    | 38 +++---------
 2 files changed, 46 insertions(+), 62 deletions(-)

diff --git a/terraform/environments/production/main.tf b/terraform/environments/production/main.tf
index 9d575fd03..e205c300f 100644
--- a/terraform/environments/production/main.tf
+++ b/terraform/environments/production/main.tf
@@ -725,29 +725,43 @@ module "relays" {
   project_id = module.google-cloud-project.project.project_id
 
   instances = {
-    "asia-east1" = {
-      type     = "n1-standard-1"
-      replicas = 1
-      zones    = ["asia-east1-a"]
-    }
-
-    "asia-south1" = {
-      type     = "n1-standard-1"
-      replicas = 1
-      zones    = ["asia-south1-a"]
-    }
-
-    "australia-southeast1" = {
-      type     = "n1-standard-1"
-      replicas = 1
-      zones    = ["australia-southeast1-a"]
-    }
-
-    "me-central1" = {
-      type     = "n2-standard-2"
-      replicas = 1
-      zones    = ["me-central1-a"]
-    }
+    # XXX: We may need these in the future, but for now, we don't have many
+    # (if any) Enterprise customers in these regions
+    # "asia-east1" = {
+    #   type     = "n1-standard-1"
+    #   replicas = 1
+    #   zones    = ["asia-east1-a"]
+    # }
+    #
+    # "asia-south1" = {
+    #   type     = "n1-standard-1"
+    #   replicas = 1
+    #   zones    = ["asia-south1-a"]
+    # }
+    #
+    # "australia-southeast1" = {
+    #   type     = "n1-standard-1"
+    #   replicas = 1
+    #   zones    = ["australia-southeast1-a"]
+    # }
+    #
+    # "me-central1" = {
+    #   type     = "n2-standard-2"
+    #   replicas = 1
+    #   zones    = ["me-central1-a"]
+    # }
+    #
+    # "southamerica-east1" = {
+    #   type     = "n1-standard-1"
+    #   replicas = 1
+    #   zones    = ["southamerica-east1-b"]
+    # }
+    #
+    # "us-central1" = {
+    #   type     = "n1-standard-1"
+    #   replicas = 1
+    #   zones    = ["us-central1-b"]
+    # }
 
     "europe-west1" = {
       type     = "n1-standard-1"
@@ -755,10 +769,10 @@ module "relays" {
       zones    = ["europe-west1-d"]
     }
 
-    "southamerica-east1" = {
+    "europe-west2" = {
       type     = "n1-standard-1"
       replicas = 1
-      zones    = ["southamerica-east1-b"]
+      zones    = ["europe-west2-c"]
     }
 
     "us-east1" = {
@@ -772,12 +786,6 @@ module "relays" {
       replicas = 1
       zones    = ["us-west2-b"]
     }
-
-    "us-central1" = {
-      type     = "n1-standard-1"
-      replicas = 1
-      zones    = ["us-central1-b"]
-    }
   }
 
   container_registry = module.google-artifact-registry.url
diff --git a/terraform/environments/staging/main.tf b/terraform/environments/staging/main.tf
index 39afab751..21a30e7dd 100644
--- a/terraform/environments/staging/main.tf
+++ b/terraform/environments/staging/main.tf
@@ -692,56 +692,32 @@ module "relays" {
   project_id = module.google-cloud-project.project.project_id
 
   instances = {
-    "asia-east1" = {
-      type     = "n1-standard-1"
-      replicas = 1
-      zones    = ["asia-east1-a"]
-    }
-
-    "asia-south1" = {
-      type     = "n1-standard-1"
-      replicas = 1
-      zones    = ["asia-south1-a"]
-    }
-
     "australia-southeast1" = {
-      type     = "n1-standard-1"
+      type     = "f1-micro"
       replicas = 1
       zones    = ["australia-southeast1-a"]
     }
 
-    "me-central1" = {
-      type     = "n2-standard-2"
+    "southamerica-west1" = {
+      type     = "f1-micro"
       replicas = 1
-      zones    = ["me-central1-a"]
-    }
-
-    "europe-west1" = {
-      type     = "n1-standard-1"
-      replicas = 1
-      zones    = ["europe-west1-d"]
-    }
-
-    "southamerica-east1" = {
-      type     = "n1-standard-1"
-      replicas = 1
-      zones    = ["southamerica-east1-b"]
+      zones    = ["southamerica-west1-b"]
     }
 
     "us-east1" = {
-      type     = "n1-standard-1"
+      type     = "f1-micro"
       replicas = 1
       zones    = ["us-east1-d"]
     }
 
     "us-west2" = {
-      type     = "n1-standard-1"
+      type     = "f1-micro"
       replicas = 1
       zones    = ["us-west2-b"]
     }
 
     "us-central1" = {
-      type     = "n1-standard-1"
+      type     = "f1-micro"
       replicas = 1
       zones    = ["us-central1-b"]
     }