From c0954d14e1a442d67395deaf76c6adda34918fae Mon Sep 17 00:00:00 2001
From: "Matthew C. Morgan" <matthew.c.morgan@census.gov>
Date: Mon, 29 Jul 2024 20:59:46 -0400
Subject: [PATCH] add zone list

---
 dns_zones.tf | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/dns_zones.tf b/dns_zones.tf
index edd6541..c4585c4 100644
--- a/dns_zones.tf
+++ b/dns_zones.tf
@@ -6,17 +6,6 @@ locals {
   zone_ids = compact(var.zone_ids)
 }
 
-#-------------------------------------------------
-# Providers for Cross Account DNS Action 
-#-------------------------------------------------
-provider "aws" {
-  alias = "self"
-  assume_role {
-    role_arn     = format("arn:%v:iam::%v:role/r-inf-terraform", data.aws_arn.current.partition, var.account_id)
-    session_name = var.os_username
-  }
-}
-
 #---
 # network prod
 #---
@@ -42,6 +31,7 @@ provider "aws" {
 # dummy vpc, so we can associate the zone to this account
 #---
 data "aws_vpc" "dummy_vpc" {
+  provider   = aws
   depends_on = [aws_vpc.vpc]
   count      = !(var.shared_vpc_label == null || var.shared_vpc_label == "") ? 1 : 0
   filter {
@@ -56,6 +46,7 @@ data "aws_vpc" "dummy_vpc" {
 
 ## Dummy VPC
 resource "aws_vpc" "vpc" {
+  provider   = aws
   cidr_block           = "192.168.0.0/24"
   enable_dns_support   = false
   enable_dns_hostnames = false
@@ -65,8 +56,18 @@ resource "aws_vpc" "vpc" {
   )
 }
 
+#---
+# zone list
+#---
+data "aws_route53_zone" "zones" {
+  provider     = aws.self
+  for_each     = toset(local.zone_ids)
+  zone_id      = each.key
+  private_zone = true
+}
 
 resource "aws_route53_zone" "cluster_domain" {
+  provider   = aws
   name          = local.cluster_domain_name
   comment       = local.cluster_domain_description
   force_destroy = false