From 0a1cd92c0093b51a348be553a80b6a6a5fe73bf1 Mon Sep 17 00:00:00 2001
From: Jamil <jamilbk@users.noreply.github.com>
Date: Sun, 12 Jan 2025 21:34:18 -0800
Subject: [PATCH] fix(infra): Rotate naming to taint old Relay instances
 (#7739)

The Relay instance template is sticking around because none of its
inputs have changed, so we bump its name.
---
 terraform/environments/production/relays.tf       | 2 +-
 terraform/environments/staging/relays.tf          | 4 ++--
 terraform/modules/google-cloud/apps/relay/main.tf | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/terraform/environments/production/relays.tf b/terraform/environments/production/relays.tf
index 20bf4c2fa..5644545c3 100644
--- a/terraform/environments/production/relays.tf
+++ b/terraform/environments/production/relays.tf
@@ -46,7 +46,7 @@ locals {
 # Create networks
 resource "google_compute_network" "network" {
   project = module.google-cloud-project.project.project_id
-  name    = "relay"
+  name    = "relays"
 
   routing_mode = "GLOBAL"
 
diff --git a/terraform/environments/staging/relays.tf b/terraform/environments/staging/relays.tf
index 6912f3a45..2ba16c0df 100644
--- a/terraform/environments/staging/relays.tf
+++ b/terraform/environments/staging/relays.tf
@@ -46,7 +46,7 @@ locals {
 # Create networks
 resource "google_compute_network" "network" {
   project = module.google-cloud-project.project.project_id
-  name    = "relay"
+  name    = "relays"
 
   routing_mode = "GLOBAL"
 
@@ -60,7 +60,7 @@ resource "google_compute_network" "network" {
 resource "google_compute_subnetwork" "subnetwork" {
   for_each = local.subnet_ip_cidr_ranges
   project  = module.google-cloud-project.project.project_id
-  name     = "relay-${each.key}"
+  name     = "relays-${each.key}"
   region   = each.key
   network  = google_compute_network.network.self_link
 
diff --git a/terraform/modules/google-cloud/apps/relay/main.tf b/terraform/modules/google-cloud/apps/relay/main.tf
index 8a639cec4..c0e52dba1 100644
--- a/terraform/modules/google-cloud/apps/relay/main.tf
+++ b/terraform/modules/google-cloud/apps/relay/main.tf
@@ -147,7 +147,7 @@ resource "google_compute_instance_template" "application" {
 
   project = var.project_id
 
-  name_prefix = "${local.application_name}-${each.key}-"
+  name_prefix = "${local.application_name}-template-${each.key}-"
 
   description = "This template is used to create ${local.application_name} instances using Terraform."