Skip to content

Commit d0af279

Browse files
committed
NDR-164 Don't duplicate route53 records
1 parent 500c208 commit d0af279

File tree

4 files changed

+44
-21
lines changed

4 files changed

+44
-21
lines changed

infrastructure/modules/route53/main.tf

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ data "aws_route53_zone" "ndr_zone" {
1212
}
1313

1414
resource "aws_route53_record" "ndr_fargate_record" {
15+
count = var.create_fargate_record ? 1 : 0
1516
name = terraform.workspace
1617
type = "CNAME"
1718
records = [var.dns_name]
@@ -20,6 +21,7 @@ resource "aws_route53_record" "ndr_fargate_record" {
2021
}
2122

2223
resource "aws_route53_record" "ndr_gateway_api_record" {
24+
count = var.create_gateway_api_record ? 1 : 0
2325
name = var.api_gateway_subdomain_name
2426
type = "A"
2527
zone_id = local.zone_id
@@ -30,3 +32,16 @@ resource "aws_route53_record" "ndr_gateway_api_record" {
3032
evaluate_target_health = true
3133
}
3234
}
35+
36+
resource "aws_route53_record" "ndr_mtls_gateway_api_record" {
37+
count = var.create_mtls_gateway_api_record ? 1 : 0
38+
name = var.api_gateway_subdomain_name
39+
type = "A"
40+
zone_id = local.zone_id
41+
42+
alias {
43+
name = var.api_gateway_subdomain_name
44+
zone_id = var.api_gateway_zone_id
45+
evaluate_target_health = true
46+
}
47+
}

infrastructure/modules/route53/variable.tf

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,22 @@ variable "api_gateway_zone_id" {
3939
type = string
4040
}
4141

42+
variable "create_fargate_record" {
43+
type = bool
44+
default = false
45+
}
46+
47+
variable "create_mtls_gateway_api_record" {
48+
type = bool
49+
default = false
50+
}
51+
52+
53+
variable "create_gateway_api_record" {
54+
type = bool
55+
default = false
56+
}
57+
4258
locals {
4359
zone_id = var.using_arf_hosted_zone ? data.aws_route53_zone.ndr_zone[0].zone_id : aws_route53_zone.ndr_zone[0].zone_id
4460
}

infrastructure/route53.tf

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,20 @@ module "route53_fargate_ui" {
99
api_gateway_subdomain_name = local.api_gateway_subdomain_name
1010
api_gateway_full_domain_name = aws_api_gateway_domain_name.custom_api_domain.regional_domain_name
1111
api_gateway_zone_id = aws_api_gateway_domain_name.custom_api_domain.regional_zone_id
12+
create_fargate_record = true
13+
create_gateway_api_record = true
1214
}
1315

1416
module "route53_mtls_api" {
15-
source = "./modules/route53"
16-
environment = var.environment
17-
owner = var.owner
18-
domain = var.domain
19-
using_arf_hosted_zone = true
20-
dns_name = local.mtls_api_gateway_subdomain_name
21-
api_gateway_subdomain_name = local.mtls_api_gateway_subdomain_name
22-
api_gateway_full_domain_name = aws_api_gateway_domain_name.mtls_custom_api_domain.regional_domain_name
23-
api_gateway_zone_id = aws_api_gateway_domain_name.mtls_custom_api_domain.regional_zone_id
17+
source = "./modules/route53"
18+
environment = var.environment
19+
owner = var.owner
20+
domain = var.domain
21+
using_arf_hosted_zone = true
22+
dns_name = local.mtls_api_gateway_subdomain_name
23+
24+
api_gateway_subdomain_name = local.mtls_api_gateway_subdomain_name
25+
api_gateway_full_domain_name = aws_api_gateway_domain_name.mtls_custom_api_domain.regional_domain_name
26+
api_gateway_zone_id = aws_api_gateway_domain_name.mtls_custom_api_domain.regional_zone_id
27+
create_mtls_gateway_api_record = true
2428
}

infrastructure/route53_records.tf

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)