Skip to content

Commit

Permalink
Cloudflare provider update to 5.0.0
Browse files Browse the repository at this point in the history
Version 5.0.0 is a major rewrite of the provider. Migration guide here:
https://registry.terraform.io/providers/cloudflare/cloudflare/latest/docs/guides/version-5-upgrade
  • Loading branch information
cmbuckley committed Feb 12, 2025
1 parent 52e6291 commit 6c4646a
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 13 deletions.
24 changes: 13 additions & 11 deletions modules/cloudflare/dns/dns.tf
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
data "cloudflare_zones" "lookup" {
for_each = toset(var.create_zone ? [] : [var.domain])

filter {
name = each.value
account_id = var.account_id
name = each.value
account = {
id = var.account_id
}
}

resource "cloudflare_zone" "dns" {
for_each = toset(var.create_zone ? [var.domain] : [])
zone = each.value
account_id = var.account_id
for_each = toset(var.create_zone ? [var.domain] : [])
name = each.value
account = {
id = var.account_id
}
}

resource "cloudflare_record" "dns" {
resource "cloudflare_dns_record" "dns" {
for_each = var.records

zone_id = local.zone_id
Expand All @@ -25,7 +26,7 @@ resource "cloudflare_record" "dns" {
proxied = each.value.proxied
}

resource "cloudflare_record" "apex_txt" {
resource "cloudflare_dns_record" "apex_txt" {
for_each = toset(concat(var.apex_txt, [
format("security_contact=mailto:%s", local.security_contact),
replace("v=spf1 ${join(" ", var.spf)} -all", " ", " ")
Expand All @@ -39,13 +40,14 @@ resource "cloudflare_record" "apex_txt" {
proxied = false
}

resource "cloudflare_record" "caa" {
resource "cloudflare_dns_record" "caa" {
for_each = toset(var.caa_issuers)
zone_id = local.zone_id
name = "@"
ttl = var.default_ttl
type = "CAA"

data {
data = {
flags = "0"
tag = "issue"
value = each.value
Expand Down
2 changes: 1 addition & 1 deletion modules/cloudflare/dns/locals.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
locals {
zone_id = var.create_zone ? cloudflare_zone.dns[var.domain].id : data.cloudflare_zones.lookup[var.domain].zones[0].id
zone_id = var.create_zone ? cloudflare_zone.dns[var.domain].id : data.cloudflare_zones.lookup[var.domain].result[0].id

security_contact = var.security_contact != null ? var.security_contact : format("security@%s", var.domain)
}
2 changes: 1 addition & 1 deletion modules/cloudflare/dns/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ terraform {
required_providers {
cloudflare = {
source = "cloudflare/cloudflare"
version = ">= 4.39.0, < 5.0.0"
version = ">= 5.0.0"
}
}
}

0 comments on commit 6c4646a

Please sign in to comment.