From 159e8b497bd9c2f50cc8d4c0ecf36495505889f2 Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Mon, 29 Jul 2024 18:41:53 -0400 Subject: [PATCH] no legacy --- dns_zones.tf | 74 ++++++++++++++++++++++++++-------------------------- variables.tf | 7 ----- 2 files changed, 37 insertions(+), 44 deletions(-) diff --git a/dns_zones.tf b/dns_zones.tf index fe40ef7..32b245b 100644 --- a/dns_zones.tf +++ b/dns_zones.tf @@ -161,40 +161,40 @@ module "route53_main_west" { #--- # do2-gov ("legacy") #--- -provider "aws" { - alias = "route53_main_legacy" - 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_legacy"].account_id) - session_name = var.os_username - } -} - -module "route53_main_legacy_east" { - providers = { - aws.self = aws - aws.peer = aws.route53_main_legacy - } - - 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_legacy"]["us-gov-east-1"] - zone_ids = [aws_route53_zone.cluster_domain.zone_id] - - tags = var.tags -} - -module "route53_main_legacy_west" { - providers = { - aws.self = aws - aws.peer = aws.route53_main_legacy - } - - 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 = var.route53_endpoints["route53_main_legacy"]["us-gov-west-1"] - zone_ids = [aws_route53_zone.cluster_domain.zone_id] - - tags = var.tags -} +# provider "aws" { +# alias = "route53_main_legacy" +# 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_legacy"].account_id) +# session_name = var.os_username +# } +# } + +# module "route53_main_legacy_east" { +# providers = { +# aws.self = aws +# aws.peer = aws.route53_main_legacy +# } + +# 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_legacy"]["us-gov-east-1"] +# zone_ids = [aws_route53_zone.cluster_domain.zone_id] + +# tags = var.tags +# } + +# module "route53_main_legacy_west" { +# providers = { +# aws.self = aws +# aws.peer = aws.route53_main_legacy +# } + +# 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 = var.route53_endpoints["route53_main_legacy"]["us-gov-west-1"] +# zone_ids = [aws_route53_zone.cluster_domain.zone_id] + +# tags = var.tags +# } diff --git a/variables.tf b/variables.tf index 2fe95b0..c737d51 100644 --- a/variables.tf +++ b/variables.tf @@ -172,12 +172,5 @@ variable "route53_endpoints" { "us-gov-east-1" = "vpc-070595c5b133243dd" "us-gov-west-1" = "vpc-08b7b4db6a5ddf9c1" } - route53_main_legacy = { - "account_id" = "" - "alias" = "" - "us-gov-east-1" = "" - "us-gov-west-1" = "" - - } } }