Skip to content

Commit 7e89e9b

Browse files
author
Om Sharma
authored
Merge pull request #14 from clouddrove/fix/locals
Fix: 🐛 Updated local condition to prevent error if enabled is false.
2 parents 7195861 + 5ecfc7f commit 7e89e9b

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

_example/public-hostedzone/example.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ module "route53" {
1919
type = "A"
2020
alias = {
2121
name = "d130easdflja734js.cloudfront.net" # name/DNS of attached cloudfront.
22-
zone_id = "Z2XXXXHXTXXXX4" # A valid zone ID of cloudfront you are trying to create alias of.
22+
zone_id = "Z2XXXXHXTXXXX4" # A valid zone ID of cloudfront you are trying to create alias of.
2323
}
2424
},
2525
{

_example/vpc-association/example.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ module "route53" {
1010
environment = "test"
1111
label_order = ["environment", "name"]
1212
private_enabled = true
13-
record_enabled = false
13+
record_enabled = false
1414

1515
domain_name = "clouddrove.com"
1616
vpc_id = "vpc-xxxxxxxxxxxxxx"
1717

18-
secondary_vpc_id = "vpc-xxxxxxxxxxxxxx"
18+
secondary_vpc_id = "vpc-xxxxxxxxxxxxxx"
1919
}

main.tf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ locals {
1212
## Convert `records` from list to map with unique keys
1313
##-----------------------------------------------------------------------------
1414
recordsets = { for rs in local.records : try(rs.key, join(" ", compact(["${rs.name} ${rs.type}", try(rs.set_identifier, "")]))) => rs }
15-
zone_id = var.zone_id != "" ? var.zone_id : (var.private_enabled ? aws_route53_zone.private.*.zone_id[0] : aws_route53_zone.public.*.zone_id[0])
15+
zone_id = var.enabled ? (var.zone_id != "" ? var.zone_id : (var.private_enabled ? aws_route53_zone.private.*.zone_id[0] : aws_route53_zone.public.*.zone_id[0])) : ""
1616
}
1717

1818
##-----------------------------------------------------------------------------
@@ -63,7 +63,7 @@ resource "aws_route53_zone" "public" {
6363
## Terraform module to create Route53 record sets resource on AWS.
6464
##-----------------------------------------------------------------------------
6565
resource "aws_route53_record" "this" {
66-
for_each = { for k, v in local.recordsets : k => v if var.enabled && var.record_enabled && ( var.zone_id != null || var.public_enabled != null || var.private_enabled != null || var.domain_name != null) }
66+
for_each = { for k, v in local.recordsets : k => v if var.enabled && var.record_enabled && (var.zone_id != null || var.public_enabled != null || var.private_enabled != null || var.domain_name != null) }
6767

6868
zone_id = local.zone_id
6969

@@ -119,8 +119,8 @@ resource "aws_route53_record" "this" {
119119
subdivision = lookup(each.value.geolocation_routing_policy, "subdivision", null)
120120
}
121121
}
122-
depends_on = [
123-
aws_route53_zone.public,
122+
depends_on = [
123+
aws_route53_zone.public,
124124
aws_route53_zone.private
125125
]
126126
}

0 commit comments

Comments
 (0)