Merge branch 'master' into feat/cross-account

bryantbiggs · web-flow · commit 7c0e179b0e17 · 2025-09-25T12:24:25.000-05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file.
 
+## [6.0.2](https://github.com/terraform-aws-modules/terraform-aws-route53/compare/v6.0.1...v6.0.2) (2025-09-25)
+
+
+### Bug Fixes
+
+* Catch error and fall back when `records.name` is not provided ([#127](https://github.com/terraform-aws-modules/terraform-aws-route53/issues/127)) ([6391f1b](https://github.com/terraform-aws-modules/terraform-aws-route53/commit/6391f1b7c44c4e854f31c776b78868d5194c668b))
+
 ## [6.0.1](https://github.com/terraform-aws-modules/terraform-aws-route53/compare/v6.0.0...v6.0.1) (2025-09-23)
 
 
diff --git a/main.tf b/main.tf
@@ -211,7 +211,7 @@ resource "aws_route53_record" "this" {
   }
 
   multivalue_answer_routing_policy = each.value.multivalue_answer_routing_policy
-  name                             = coalesce(each.value.full_name, "${each.value.name}.${local.zone_name}", "${each.key}.${local.zone_name}")
+  name                             = coalesce(each.value.full_name, try("${each.value.name}.${local.zone_name}", "${each.key}.${local.zone_name}"))
   records                          = each.value.records
   set_identifier                   = each.value.set_identifier
   ttl                              = each.value.ttl

Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,7 @@ resource "aws_route53_record" "this" {`
`211`	`211`	`}`
`212`	`212`
`213`	`213`	`multivalue_answer_routing_policy = each.value.multivalue_answer_routing_policy`
`214`		`- name = coalesce(each.value.full_name, "${each.value.name}.${local.zone_name}", "${each.key}.${local.zone_name}")`
	`214`	`+ name = coalesce(each.value.full_name, try("${each.value.name}.${local.zone_name}", "${each.key}.${local.zone_name}"))`
`215`	`215`	`records = each.value.records`
`216`	`216`	`set_identifier = each.value.set_identifier`
`217`	`217`	`ttl = each.value.ttl`