From 5cc452819102461f9ecac30f35b7773c7f900570 Mon Sep 17 00:00:00 2001
From: "Matthew C. Morgan" <matthew.c.morgan@census.gov>
Date: Mon, 29 Jul 2024 21:33:07 -0400
Subject: [PATCH] fix missing things

---
 dns_zones.tf | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/dns_zones.tf b/dns_zones.tf
index 1dcb9af..c4b06f0 100644
--- a/dns_zones.tf
+++ b/dns_zones.tf
@@ -39,14 +39,14 @@ resource "aws_route53_vpc_association_authorization" "self_zone" {
   for_each   = toset(local.zone_ids)
   zone_id    = each.key
   vpc_region = var.region_map["west"]
-  vpc_id     = var.vpc_id
+  vpc_id     = data.aws_vpc.eks_vpc.id
 }
 
 resource "aws_route53_zone_association" "self_zone_west" {
   provider   = aws.route53_main_west
   for_each   = toset(local.zone_ids)
   zone_id    = each.key
-  vpc_id     = var.vpc_id
+  vpc_id     = data.aws_vpc.eks_vpc.id
   vpc_region = var.region_map["west"]
   depends_on = [aws_route53_vpc_association_authorization.self_zone]
 }
@@ -57,14 +57,14 @@ resource "aws_route53_vpc_association_authorization" "self_zone_east" {
   for_each   = toset(local.zone_ids)
   zone_id    = each.key
   vpc_region = var.region_map["east"]
-  vpc_id     = var.vpc_id
+  vpc_id     = data.aws_vpc.eks_vpc.id
 }
 
 resource "aws_route53_zone_association" "self_zone_east" {
   provider   = aws.route53_main_east
   for_each   = toset(local.zone_ids)
   zone_id    = each.key
-  vpc_id     = var.vpc_id
+  vpc_id     = data.aws_vpc.eks_vpc.id
   vpc_region = var.region_map["east"]
   depends_on = [aws_route53_vpc_association_authorization.self_zone]
 }
@@ -96,10 +96,7 @@ resource "aws_route53_zone" "cluster_domain" {
   }
 
   tags = merge(
-    local.base_tags,
-    local.common_tags,
     var.tags,
-    var.application_tags,
     { "Name" = local.cluster_domain_name },
   )
 }
@@ -127,7 +124,7 @@ resource "aws_vpc" "vpc" {
   enable_dns_support   = false
   enable_dns_hostnames = false
   tags = merge(
-    local.base_tags,
+    var.tags,
     { "Name" = "vpc0-dummy" },
   )
 }