Merge pull request #1 from terraform-modules/feature-zone-id

add variable zone_id
terraform-modules · Mar 7, 2025 · 56036d4 · 56036d4
2 parents cff57ed + bc6229c
commit 56036d4
Show file tree

Hide file tree

Showing 13 changed files with 22 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,4 @@ logs
 common/README.md
 
 OLD/
+X
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,3 +15,6 @@
 
 * 1.0.4 -- 2024-03-07
   - update heritage_tags to pass the value
+
+* 1.1.0 -- 2024-10-17
+  - add zone_id to allow it to take a zone id directly vs from a lookup
diff --git a/a/README.md b/a/README.md
@@ -180,6 +180,7 @@ module "db_cname" {
 | <a name="input_ttl"></a> [ttl](#input\_ttl) | DNS RR Time To Live (ttl).  Default 900s (15m). | `number` | `900` | no |
 | <a name="input_values"></a> [values](#input\_values) | DNS value to set for the name.  May be a string or list of strings (like multiple IP addresses) | `any` | n/a | yes |
 | <a name="input_zone"></a> [zone](#input\_zone) | DNS Zone into which to create the record.  By default, it will extract this from the name after the first dot. | `string` | `null` | no |
+| <a name="input_zone_id"></a> [zone\_id](#input\_zone\_id) | DNS Zone ID into which to create the record. | `string` | `null` | no |
 
 ## Outputs
 

diff --git a/a/entry.tf b/a/entry.tf
@@ -1,6 +1,6 @@
 resource "aws_route53_record" "entry" {
   count   = length(local.ipv4_hosts) > 0 ? 1 : 0
-  zone_id = data.aws_route53_zone.zone.zone_id
+  zone_id = var.zone_id != null ? data.aws_route53_zone.zone[0].zone_id : var.zone_id
   name    = var.name
   type    = local.rr_type
   ttl     = var.ttl

diff --git a/aaaa/README.md b/aaaa/README.md
@@ -170,6 +170,7 @@ No modules.
 | <a name="input_ttl"></a> [ttl](#input\_ttl) | DNS RR Time To Live (ttl).  Default 900s (15m). | `number` | `900` | no |
 | <a name="input_values"></a> [values](#input\_values) | DNS value to set for the name.  May be a string or list of strings (like multiple IP addresses) | `any` | n/a | yes |
 | <a name="input_zone"></a> [zone](#input\_zone) | DNS Zone into which to create the record.  By default, it will extract this from the name after the first dot. | `string` | `null` | no |
+| <a name="input_zone_id"></a> [zone\_id](#input\_zone\_id) | DNS Zone ID into which to create the record. | `string` | `null` | no |
 
 ## Outputs
 

diff --git a/aaaa/entry.tf b/aaaa/entry.tf
@@ -1,6 +1,6 @@
 resource "aws_route53_record" "entry" {
   count   = length(local.ipv6_hosts) > 0 ? 1 : 0
-  zone_id = data.aws_route53_zone.zone.zone_id
+  zone_id = var.zone_id != null ? data.aws_route53_zone.zone[0].zone_id : var.zone_id
   name    = var.name
   type    = local.rr_type
   ttl     = var.ttl

diff --git a/common/entry.tf b/common/entry.tf
@@ -1,5 +1,5 @@
 resource "aws_route53_record" "entry" {
-  zone_id = data.aws_route53_zone.zone.zone_id
+  zone_id = var.zone_id != null ? data.aws_route53_zone.zone[0].zone_id : var.zone_id
   name    = var.name
   type    = local.rr_type
   ttl     = var.ttl

diff --git a/common/entry_heritage.tf b/common/entry_heritage.tf
@@ -1,6 +1,6 @@
 resource "aws_route53_record" "entry_heritage" {
   count   = var.enable_heritage ? 1 : 0
-  zone_id = data.aws_route53_zone.zone.zone_id
+  zone_id = var.zone_id != null ? data.aws_route53_zone.zone[0].zone_id : var.zone_id
   name    = format("%v%v", local.default_heritage_prefix, var.name)
 
   type    = "TXT"

diff --git a/common/variables.tf b/common/variables.tf
@@ -4,6 +4,12 @@ variable "zone" {
   default     = null
 }
 
+variable "zone_id" {
+  description = "DNS Zone ID into which to create the record."
+  type        = string
+  default     = null
+}
+
 variable "name" {
   description = "FQDN DNS name to create.  If the zone (everything after the first dot) does not exist or is not associated to the VPC, this creation will fail."
   type        = string

diff --git a/common/version.tf b/common/version.tf
@@ -1,3 +1,3 @@
 locals {
-  _module_version = "1.0.4"
+  _module_version = "1.1.0"
 }
diff --git a/common/zone_forward.tf b/common/zone_forward.tf
@@ -1,5 +1,7 @@
 # if the zone grab fails here, it either doesn't exist or it is not associated with this VPC
+# if zone_id passed, do not try to use the zone
 data "aws_route53_zone" "zone" {
+  count        = var.zone_id != null ? 1 : 0
   name         = local.zone
   private_zone = local.private_zone
 }
diff --git a/host/README.md b/host/README.md
@@ -178,6 +178,7 @@ module "db_cname" {
 | <a name="input_ttl"></a> [ttl](#input\_ttl) | DNS RR Time To Live (ttl).  Default 900s (15m). | `number` | `900` | no |
 | <a name="input_values"></a> [values](#input\_values) | DNS value to set for the name.  May be a string or list of strings (like multiple IP addresses) | `any` | n/a | yes |
 | <a name="input_zone"></a> [zone](#input\_zone) | DNS Zone into which to create the record.  By default, it will extract this from the name after the first dot. | `string` | `null` | no |
+| <a name="input_zone_id"></a> [zone\_id](#input\_zone\_id) | DNS Zone ID into which to create the record. | `string` | `null` | no |
 
 ## Outputs
 

diff --git a/host/entry.tf b/host/entry.tf
@@ -1,6 +1,6 @@
 resource "aws_route53_record" "entry_ipv4" {
   count   = length(local.ipv4_hosts) > 0 ? 1 : 0
-  zone_id = data.aws_route53_zone.zone.zone_id
+  zone_id = var.zone_id != null ? data.aws_route53_zone.zone[0].zone_id : var.zone_id
   name    = var.name
   type    = "A"
   ttl     = var.ttl
@@ -9,7 +9,7 @@ resource "aws_route53_record" "entry_ipv4" {
 
 resource "aws_route53_record" "entry_ipv6" {
   count   = length(local.ipv6_hosts) > 0 ? 1 : 0
-  zone_id = data.aws_route53_zone.zone.zone_id
+  zone_id = var.zone_id != null ? data.aws_route53_zone.zone[0].zone_id : var.zone_id
   name    = var.name
   type    = "AAAA"
   ttl     = var.ttl