From f99062be18ce3d2c7fa5f79e872413d152225e68 Mon Sep 17 00:00:00 2001
From: Viraj Parekh <viraj@astronomer.io>
Date: Fri, 14 Jun 2019 12:36:28 -0400
Subject: [PATCH 1/7] Added variable for smtp uri

---
 variables.tf | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/variables.tf b/variables.tf
index b563bda..ce56970 100644
--- a/variables.tf
+++ b/variables.tf
@@ -56,4 +56,6 @@ variable "enable_gvisor" {
   type        = string
 }
 
-
+variable "smtp_uri" {
+  type        = string
+}

From 481b4d735cb3d753498753327d4e6971c8de579a Mon Sep 17 00:00:00 2001
From: Viraj Parekh <viraj@astronomer.io>
Date: Tue, 18 Jun 2019 11:46:33 -0400
Subject: [PATCH 2/7] Added smtp_uri to locals.tf for #3

---
 locals.tf | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/locals.tf b/locals.tf
index b29501a..0c63370 100644
--- a/locals.tf
+++ b/locals.tf
@@ -44,6 +44,9 @@ nginx:
 astronomer:
   houston:
     config:
+      email:
+        enabled: true
+        smtpUrl: ${var.smtp_uri == "" ? "" : var.smtp_uri}
       commander:
         enabled: false
       deployments:
@@ -68,4 +71,3 @@ astronomer:
 EOF
 
 }
-

From 9575a92545e196c1c97a109e291692a0a3dc4b52 Mon Sep 17 00:00:00 2001
From: Viraj Parekh <viraj@astronomer.io>
Date: Mon, 1 Jul 2019 22:14:04 -0400
Subject: [PATCH 3/7] Changes for #3

---
 locals.tf    | 4 ++--
 variables.tf | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/locals.tf b/locals.tf
index 0c63370..963f16b 100644
--- a/locals.tf
+++ b/locals.tf
@@ -42,13 +42,13 @@ nginx:
         value: gvisor
 
 astronomer:
+%{if var.smtp_uri == "true"}
   houston:
     config:
       email:
         enabled: true
         smtpUrl: ${var.smtp_uri == "" ? "" : var.smtp_uri}
-      commander:
-        enabled: false
+        %{endif}
       deployments:
         logHelmValues: true
         helm:
diff --git a/variables.tf b/variables.tf
index ce56970..44c5af4 100644
--- a/variables.tf
+++ b/variables.tf
@@ -57,5 +57,6 @@ variable "enable_gvisor" {
 }
 
 variable "smtp_uri" {
+  default     = ""
   type        = string
 }

From a4813484079f61373142ac2bbfb1fbabeb031e93 Mon Sep 17 00:00:00 2001
From: Viraj Parekh <viraj@astronomer.io>
Date: Mon, 1 Jul 2019 22:17:16 -0400
Subject: [PATCH 4/7] Pulled in changes from master locals.tf

---
 locals.tf | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/locals.tf b/locals.tf
index 963f16b..068f29b 100644
--- a/locals.tf
+++ b/locals.tf
@@ -6,14 +6,11 @@ global:
   baseDomain: ${var.base_domain}
   tlsSecret: astronomer-tls
   istioEnabled: ${var.enable_istio == "true" ? true : false}
-
 nginx:
   loadBalancerIP: ${var.load_balancer_ip == "" ? "~" : var.load_balancer_ip}
   privateLoadBalancer: ${var.cluster_type == "private" ? true : false}
   perserveSourceIP: true
-
 %{if var.enable_gvisor == "true"}
-
   platformNodePool:
     affinity:
       nodeAffinity:
@@ -24,7 +21,6 @@ nginx:
               operator: In
               values:
               - "false"
-
   deploymentNodePool:
     affinity:
       nodeAffinity:
@@ -40,17 +36,14 @@ nginx:
         key: sandbox.gke.io/runtime
         operator: Equal
         value: gvisor
-
 astronomer:
-%{if var.smtp_uri == "true"}
   houston:
     config:
-      email:
-        enabled: true
-        smtpUrl: ${var.smtp_uri == "" ? "" : var.smtp_uri}
-        %{endif}
-      deployments:
-        logHelmValues: true
+    %{if var.smtp_uri == "true"}
+        email:
+          enabled: true
+          smtpUrl: ${var.smtp_uri == "" ? "" : var.smtp_uri}
+          %{endif}
         helm:
            affinity:
              nodeAffinity:
@@ -66,7 +59,6 @@ astronomer:
                key: sandbox.gke.io/runtime
                operator: Equal
                value: gvisor
-
 %{endif}
 EOF
 

From 5f2fd43cb71156bb522219fc9dfec0e7dc095473 Mon Sep 17 00:00:00 2001
From: Viraj Parekh <viraj@astronomer.io>
Date: Tue, 2 Jul 2019 15:50:45 -0400
Subject: [PATCH 5/7] Adding stevens suggestions for #3

---
 locals.tf | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/locals.tf b/locals.tf
index 068f29b..e5152ac 100644
--- a/locals.tf
+++ b/locals.tf
@@ -39,11 +39,11 @@ nginx:
 astronomer:
   houston:
     config:
-    %{if var.smtp_uri == "true"}
+    %{if var.smtp_uri != ""}
         email:
           enabled: true
-          smtpUrl: ${var.smtp_uri == "" ? "" : var.smtp_uri}
-          %{endif}
+          smtpUrl: var.smtp_uri
+    %{endif}
         helm:
            affinity:
              nodeAffinity:

From b686ed92681fb9b52332c28b2be7d88e6e8f1e8c Mon Sep 17 00:00:00 2001
From: Viraj Parekh <viraj@astronomer.io>
Date: Tue, 2 Jul 2019 15:58:37 -0400
Subject: [PATCH 6/7] formatting error for string blocks

---
 locals.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locals.tf b/locals.tf
index e5152ac..4e1af86 100644
--- a/locals.tf
+++ b/locals.tf
@@ -42,7 +42,7 @@ astronomer:
     %{if var.smtp_uri != ""}
         email:
           enabled: true
-          smtpUrl: var.smtp_uri
+          smtpUrl: ${var.smtp_uri}
     %{endif}
         helm:
            affinity:

From d96eb67ce1f874a35a3f49f9a0f4a6c40874ecbb Mon Sep 17 00:00:00 2001
From: Viraj Parekh <viraj@astronomer.io>
Date: Wed, 3 Jul 2019 09:16:49 -0400
Subject: [PATCH 7/7] Merge message got back in

---
 locals.tf | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/locals.tf b/locals.tf
index 67cabf9..4e1af86 100644
--- a/locals.tf
+++ b/locals.tf
@@ -39,14 +39,11 @@ nginx:
 astronomer:
   houston:
     config:
-<<<<<<< HEAD
     %{if var.smtp_uri != ""}
         email:
           enabled: true
           smtpUrl: ${var.smtp_uri}
     %{endif}
-=======
->>>>>>> master
         helm:
            affinity:
              nodeAffinity: