From afdf331070347ce6c7c16fed60a8f28f098f16d8 Mon Sep 17 00:00:00 2001
From: Katalina Okano <git@kat.cafe>
Date: Mon, 7 Dec 2020 22:49:54 -0500
Subject: [PATCH] fix default tagging for cloud run

---
 terraform/variables.tf | 2 +-
 terraform/webapp.tf    | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/terraform/variables.tf b/terraform/variables.tf
index 5158b72..073be02 100644
--- a/terraform/variables.tf
+++ b/terraform/variables.tf
@@ -16,7 +16,7 @@ variable "ui_regions" {
 variable "ui_tag" {
   type        = string
   description = "Specific tag to deploy"
-  default     = ":main"
+  default = ""
 }
 
 variable "bot_client_id" {
diff --git a/terraform/webapp.tf b/terraform/webapp.tf
index 720ac22..5ae7211 100644
--- a/terraform/webapp.tf
+++ b/terraform/webapp.tf
@@ -1,3 +1,7 @@
+locals {
+  uiTag = var.ui_tag == "" ? ":${var.environment_tag}" : var.ui_tag
+}
+
 resource "google_cloud_run_service" "web" {
   for_each = toset(var.ui_regions)
 
@@ -7,7 +11,7 @@ resource "google_cloud_run_service" "web" {
   template {
     spec {
       containers {
-        image = "${local.artifactBaseMap[each.key]}/ui${var.ui_tag}"
+        image = "${local.artifactBaseMap[each.key]}/ui${local.uiTag}"
 
         env {
           name  = "API_PUBLIC_URI"