From 8dd0f8f71dce6280f339d65438b130d651b925c1 Mon Sep 17 00:00:00 2001
From: Zachary Blasczyk <zachary.blasczyk@wandb.com>
Date: Tue, 9 Jan 2024 19:33:28 -0600
Subject: [PATCH] revert merge logic

---
 main.tf | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/main.tf b/main.tf
index d34aa917f..5c783f267 100644
--- a/main.tf
+++ b/main.tf
@@ -116,7 +116,7 @@ locals {
 module "app_eks" {
   source = "./modules/app_eks"
 
-  domain_filter = local.domain_filter
+  fqdn = local.domain_filter
 
   namespace   = var.namespace
   kms_key_arn = local.kms_key_arn
@@ -197,7 +197,7 @@ module "wandb" {
   controller_image_tag   = "1.10.1"
 
   spec = {
-    values = merge({
+    values = {
       global = {
         host    = local.url
         license = var.license
@@ -242,6 +242,12 @@ module "wandb" {
         }
       }
 
+      app = var.enable_operator_alb ? {} : {
+        extraEnv = {
+          "GORILLA_GLUE_LIST" = "true"
+        }
+      }
+
       mysql = { install = false }
       redis = { install = false }
 
@@ -251,17 +257,8 @@ module "wandb" {
           efs = {
             fileSystemId = module.app_eks.efs_id
           }
-
-        }
-      }
-      }, var.enable_operator_alb ? {} :
-      {
-        app = {
-          extraEnv = {
-            "GORILLA_GLUE_LIST" = "true"
-          }
         }
       }
-    )
+    }
   }
 }