From 7bcfb0fd9c63d6abef2af7e0e2bc3f5f3ad9e595 Mon Sep 17 00:00:00 2001
From: Anthony Zawacki <anthony.c.zawacki@census.gov>
Date: Thu, 14 Sep 2023 10:03:16 -0400
Subject: [PATCH] Updated tag handling.

---
 main.tf      | 6 +++---
 s3.tf        | 4 +---
 variables.tf | 1 +
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/main.tf b/main.tf
index 6af8727..c35aa4e 100644
--- a/main.tf
+++ b/main.tf
@@ -18,13 +18,13 @@ data "kubernetes_namespace" "existing-ns" {
 }
 
 locals {
-  base_tags = {
+  tags = merge({
     "eks-cluster-name"      = var.cluster_name
     "boc:tf_module_name"    = local._module_name
     "boc:tf_module_version" = local._module_version
     "boc:created_by"        = "terraform"
     CostAllocation          = var.tag_costallocation
-  }
+  }, var.additional_tags)
 
   ns = try(kubernetes_namespace.ns[0].metadata[0].name, data.kubernetes_namespace.existing-ns[0].metadata[0].name)
 }
@@ -52,7 +52,7 @@ module "loki-irsa-role" {
       namespace_service_accounts = ["${var.namespace}:loki"]
     }
   }
-  tags = merge(local.base_tags, var.additional_tags)
+  tags = local.tags
 }
 
 resource "helm_release" "loki" {
diff --git a/s3.tf b/s3.tf
index e9907d3..f1b3611 100644
--- a/s3.tf
+++ b/s3.tf
@@ -15,7 +15,5 @@ module "loki-s3" {
   bucket_name       = format("%v-loki", var.cluster_name)
   access_log_bucket = data.aws_s3_bucket.s3_server_access_logs.id
 
-  tags = {
-    "eks-cluster-name" = var.cluster_name
-  }
+  tags = local.tags
 }
diff --git a/variables.tf b/variables.tf
index c248187..886e7b3 100644
--- a/variables.tf
+++ b/variables.tf
@@ -1,6 +1,7 @@
 variable "tag_costallocation" {
   description = "Tag CostAllocation (default)"
   type        = string
+  default     = "csvd:infrastructure"
 }
 
 variable "additional_tags" {