Merge pull request #107 from answerdigital/cloudflare-zone-fix

cmbuckley · web-flow · commit 3d63579b623b · 2024-12-10T15:54:19.000Z
Fix the zone_id output when not creating the zone internally
diff --git a/modules/cloudflare/dns/dns.tf b/modules/cloudflare/dns/dns.tf
@@ -1,15 +1,15 @@
 data "cloudflare_zones" "lookup" {
-  count = var.create_zone ? 0 : 1
+  for_each = toset(var.create_zone ? [] : [var.domain])
 
   filter {
-    name       = var.domain
+    name       = each.value
     account_id = var.account_id
   }
 }
 
 resource "cloudflare_zone" "dns" {
-  count      = var.create_zone ? 1 : 0
-  zone       = var.domain
+  for_each   = toset(var.create_zone ? [var.domain] : [])
+  zone       = each.value
   account_id = var.account_id
 }
 
diff --git a/modules/cloudflare/dns/locals.tf b/modules/cloudflare/dns/locals.tf
@@ -1,5 +1,5 @@
 locals {
-  zone_id = var.create_zone ? cloudflare_zone.dns[0].id : data.cloudflare_zones.lookup[0].id
+  zone_id = var.create_zone ? cloudflare_zone.dns[var.domain].id : data.cloudflare_zones.lookup[var.domain].zones[0].id
 
   security_contact = var.security_contact != null ? var.security_contact : format("security@%s", var.domain)
 }

Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,15 @@`
`1`	`1`	`data "cloudflare_zones" "lookup" {`
`2`		`- count = var.create_zone ? 0 : 1`
	`2`	`+ for_each = toset(var.create_zone ? [] : [var.domain])`
`3`	`3`
`4`	`4`	`filter {`
`5`		`- name = var.domain`
	`5`	`+ name = each.value`
`6`	`6`	`account_id = var.account_id`
`7`	`7`	`}`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`resource "cloudflare_zone" "dns" {`
`11`		`- count = var.create_zone ? 1 : 0`
`12`		`- zone = var.domain`
	`11`	`+ for_each = toset(var.create_zone ? [var.domain] : [])`
	`12`	`+ zone = each.value`
`13`	`13`	`account_id = var.account_id`
`14`	`14`	`}`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`locals {`
`2`		`- zone_id = var.create_zone ? cloudflare_zone.dns[0].id : data.cloudflare_zones.lookup[0].id`
	`2`	`+ zone_id = var.create_zone ? cloudflare_zone.dns[var.domain].id : data.cloudflare_zones.lookup[var.domain].zones[0].id`
`3`	`3`
`4`	`4`	`security_contact = var.security_contact != null ? var.security_contact : format("security@%s", var.domain)`
`5`	`5`	`}`