From 40b777de3ebfab3b042920ab274354f1a7e001d1 Mon Sep 17 00:00:00 2001
From: badra001 <donald.e.badrak.ii@census.gov>
Date: Mon, 3 Apr 2023 16:40:56 -0400
Subject: [PATCH] afix up tags

---
 vpc-interface-endpoint/main.tf    | 4 +---
 vpc-interface-endpoint/route53.tf | 8 ++++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/vpc-interface-endpoint/main.tf b/vpc-interface-endpoint/main.tf
index 6cb7c8b..80838b2 100644
--- a/vpc-interface-endpoint/main.tf
+++ b/vpc-interface-endpoint/main.tf
@@ -96,8 +96,6 @@ resource "aws_vpc_endpoint" "interface_endpoint" {
   tags = merge(
     local.base_tags,
     var.tags,
-    tomap({
-      Name = format("vpce-%v-%v", local.short_service, var.vpc_full_name)
-    })
+    { Name = format("vpce-%v-%v", local.short_service, var.vpc_full_name) },
   )
 }
diff --git a/vpc-interface-endpoint/route53.tf b/vpc-interface-endpoint/route53.tf
index 78d3c5e..57f7671 100644
--- a/vpc-interface-endpoint/route53.tf
+++ b/vpc-interface-endpoint/route53.tf
@@ -36,8 +36,8 @@ resource "aws_route53_zone" "vpce" {
   }
 
   tags = merge(
-    local.tags,
-    local.common_tags,
+    local.base_tags,
+    var.tags,
     { Name = data.aws_vpc_endpoint_service.interface_endpoint.private_dns_name },
   )
 }
@@ -144,8 +144,8 @@ resource "aws_ssm_parameter" "vpce" {
   })
 
   tags = merge(
-    local.tags,
-    local.common_tags,
+    local.base_tags,
+    var.tags,
     { "boc:vpc_endpoint" = data.aws_vpc_endpoint_service.interface_endpoint.service },
   )
 }