From 6fdc15718858138c4846c6361b7936aef2806edf Mon Sep 17 00:00:00 2001
From: "Matthew C. Morgan" <matthew.c.morgan@census.gov>
Date: Thu, 17 Oct 2024 11:33:05 -0400
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix(dns):=20zone=20associations?=
 =?UTF-8?q?=20were=20targeting=20the=20wrong=20vpc?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dns-providers.tf | 13 ++++++++-----
 main.tf          |  8 ++++----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/dns-providers.tf b/dns-providers.tf
index 2fa7510..797e001 100644
--- a/dns-providers.tf
+++ b/dns-providers.tf
@@ -2,8 +2,9 @@
 # Providers for Cross Account DNS Action
 #-------------------------------------------------
 provider "aws" {
-  alias  = "route53_main_east"
-  region = var.region_map["east"]
+  alias   = "route53_main_east"
+  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
@@ -11,8 +12,9 @@ provider "aws" {
 }
 
 provider "aws" {
-  alias  = "route53_main_west"
-  region = var.region_map["west"]
+  alias   = "route53_main_west"
+  region  = var.region_map["west"]
+  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
@@ -20,7 +22,8 @@ provider "aws" {
 }
 
 provider "aws" {
-  alias = "self"
+  alias   = "self"
+  profile = var.profile
   assume_role {
     role_arn     = format("arn:%v:iam::%v:role/r-inf-terraform-route53", data.aws_arn.current.partition, data.aws_caller_identity.current.account_id)
     session_name = var.os_username
diff --git a/main.tf b/main.tf
index c7eb1f2..1306d5f 100644
--- a/main.tf
+++ b/main.tf
@@ -47,7 +47,7 @@ resource "aws_route53_vpc_association_authorization" "self_zone_east" {
   count = local.region == "us-gov-east-1" && local.is_shared_vpc ? 1 : 0
 
   provider   = aws.self
-  vpc_id     = data.aws_vpc.eks_vpc.id
+  vpc_id     = var.route53_endpoints.route53_main["us-gov-east-1"]
   vpc_region = "us-gov-east-1"
   zone_id    = aws_route53_zone.cluster_domain.zone_id
 }
@@ -56,7 +56,7 @@ resource "aws_route53_zone_association" "self_zone_east" {
   count = local.region == "us-gov-east-1" && local.is_shared_vpc ? 1 : 0
 
   provider   = aws.route53_main_east
-  vpc_id     = data.aws_vpc.eks_vpc.id
+  vpc_id     = var.route53_endpoints.route53_main["us-gov-east-1"]
   vpc_region = "us-gov-east-1"
   zone_id    = aws_route53_zone.cluster_domain.zone_id
 
@@ -70,7 +70,7 @@ resource "aws_route53_vpc_association_authorization" "self_zone_west" {
   count = local.region == "us-gov-west-1" && local.is_shared_vpc ? 1 : 0
 
   provider   = aws.self
-  vpc_id     = data.aws_vpc.eks_vpc.id
+  vpc_id     = var.route53_endpoints.route53_main["us-gov-west-1"]
   vpc_region = "us-gov-west-1"
   zone_id    = aws_route53_zone.cluster_domain.zone_id
 }
@@ -79,7 +79,7 @@ resource "aws_route53_zone_association" "self_zone_west" {
   count = local.region == "us-gov-west-1" && local.is_shared_vpc ? 1 : 0
 
   provider   = aws.route53_main_west
-  vpc_id     = data.aws_vpc.eks_vpc.id
+  vpc_id     = var.route53_endpoints.route53_main["us-gov-west-1"]
   vpc_region = "us-gov-west-1"
   zone_id    = aws_route53_zone.cluster_domain.zone_id