From d8bcb902127e60c340b62b4d65f0fc66e0585c47 Mon Sep 17 00:00:00 2001
From: "Matthew C. Morgan" <matthew.c.morgan@census.gov>
Date: Mon, 29 Jul 2024 19:14:32 -0400
Subject: [PATCH] no vpc7 stuff

---
 dns_zones.tf | 116 +++++++++++++++++++--------------------------------
 1 file changed, 44 insertions(+), 72 deletions(-)

diff --git a/dns_zones.tf b/dns_zones.tf
index 3cbf732..0bb37bc 100644
--- a/dns_zones.tf
+++ b/dns_zones.tf
@@ -5,34 +5,6 @@ locals {
   region                     = var.region
 }
 
-#---
-# availability-zones
-#---
-data "aws_availability_zones" "zones" {
-  state = "available"
-}
-
-data "aws_availability_zone" "zone" {
-  count = length(data.aws_availability_zones.zones.names)
-  state = "available"
-  name  = data.aws_availability_zones.zones.names[count.index]
-}
-
-output "availability_zone_names" {
-  description = "VPC Availability zone name list (3)"
-  value       = data.aws_availability_zones.zones.names
-}
-
-output "availability_zone_ids" {
-  description = "VPC Availability zone id list (3)"
-  value       = data.aws_availability_zones.zones.zone_ids
-}
-
-output "availability_zone_suffixes" {
-  description = "VPC Availability zone suffix list (3)"
-  value       = data.aws_availability_zone.zone[*].name_suffix
-}
-
 #---
 # network prod
 #---
@@ -46,15 +18,15 @@ provider "aws" {
   }
 }
 
-# provider "aws" {
-#   alias   = "route53_main_west"
-#   profile = var.profile
-#   region  = var.region_map["west"]
-#   assume_role {
-#     role_arn     = format("arn:%v:iam::%v:role/r-inf-terraform-route53", data.aws_arn.current.partition, var.route53_endpoints["route53_main"].account_id)
-#     session_name = var.os_username
-#   }
-# }
+provider "aws" {
+  alias   = "route53_main_west"
+  profile = var.profile
+  region  = var.region_map["west"]
+  assume_role {
+    role_arn     = format("arn:%v:iam::%v:role/r-inf-terraform-route53", data.aws_arn.current.partition, var.route53_endpoints["route53_main"].account_id)
+    session_name = var.os_username
+  }
+}
 
 #---
 # dummy vpc, so we can associate the zone to this account
@@ -110,20 +82,20 @@ module "route53_cluster_domain_east" {
   tags = var.tags
 }
 
-# module "route53_cluster_domain_west" {
-#   count = local.region == "us-gov-west-1" && !(var.shared_vpc_label == null || var.shared_vpc_label == "") ? 1 : 0
-#   providers = {
-#     aws.self = aws
-#     aws.peer = aws.route53_main_west
-#   }
+module "route53_cluster_domain_west" {
+  count = local.region == "us-gov-west-1" && !(var.shared_vpc_label == null || var.shared_vpc_label == "") ? 1 : 0
+  providers = {
+    aws.self = aws
+    aws.peer = aws.route53_main_west
+  }
 
-#   source   = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//route53-zone-association/zone?ref=tf-upgrade"
-#   region   = "us-gov-west-1"
-#   vpc_id   = data.aws_vpc.eks_vpc.id
-#   zone_ids = [aws_route53_zone.cluster_domain.zone_id]
+  source   = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//route53-zone-association/zone?ref=tf-upgrade"
+  region   = "us-gov-west-1"
+  vpc_id   = data.aws_vpc.eks_vpc.id
+  zone_ids = [aws_route53_zone.cluster_domain.zone_id]
 
-#   tags = var.tags
-# }
+  tags = var.tags
+}
 
 output "cluster_domain_name" {
   description = "DNS Zone Name"
@@ -145,32 +117,32 @@ output "cluster_domain_ns" {
 # and to vpc7-endpoints in network prod
 #---
 
-#---
-# network prod
-#---
-provider "aws" {
-  alias   = "route53_main"
-  region  = var.region_map["east"]
-  profile = var.profile
-  assume_role {
-    role_arn     = format("arn:%v:iam::%v:role/r-inf-terraform-route53", data.aws_arn.current.partition, var.route53_endpoints["route53_main"].account_id)
-    session_name = var.os_username
-  }
-}
+# #---
+# # network prod
+# #---
+# provider "aws" {
+#   alias   = "route53_main"
+#   region  = var.region_map["east"]
+#   profile = var.profile
+#   assume_role {
+#     role_arn     = format("arn:%v:iam::%v:role/r-inf-terraform-route53", data.aws_arn.current.partition, var.route53_endpoints["route53_main"].account_id)
+#     session_name = var.os_username
+#   }
+# }
 
-module "route53_main_east" {
-  providers = {
-    aws.self = aws
-    aws.peer = aws.route53_main
-  }
+# module "route53_main_east" {
+#   providers = {
+#     aws.self = aws
+#     aws.peer = aws.route53_main
+#   }
 
-  source   = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//route53-zone-association/zone?ref=tf-upgrade"
-  region   = "us-gov-east-1"
-  vpc_id   = var.route53_endpoints["route53_main"]["us-gov-east-1"]
-  zone_ids = [aws_route53_zone.cluster_domain.zone_id]
+#   source   = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//route53-zone-association/zone?ref=tf-upgrade"
+#   region   = "us-gov-east-1"
+#   vpc_id   = var.route53_endpoints["route53_main"]["us-gov-east-1"]
+#   zone_ids = [aws_route53_zone.cluster_domain.zone_id]
 
-  tags = var.tags
-}
+#   tags = var.tags
+# }
 
 # module "route53_main_west" {
 #   providers = {