🐛 fix(dns): zone associations were targeting the wrong vpc

SCT-Engineering · Oct 17, 2024 · 6fdc157 · 6fdc157
1 parent 53cba90
commit 6fdc157
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/dns-providers.tf b/dns-providers.tf
@@ -2,25 +2,28 @@
 # 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
   }
 }
 
 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
   }
 }
 
 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
@@ -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