Skip to content

Cloudflare provider update to 5.1.0 #110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cmbuckley merged 4 commits into from
Feb 13, 2025
Merged

Cloudflare provider update to 5.1.0 #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
67687d3
Cloudflare provider update to 5.0.0
cmbuckley Jan 29, 2025
1d78e56
Update documentation & dependabot entries
github-actions[bot] Feb 12, 2025
2756b19
CAA flags now uses a number as of v5.1.0 - see cloudflare/terraform-p…
cmbuckley Feb 13, 2025
5bcf045
Update documentation & dependabot entries
github-actions[bot] Feb 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions modules/cloudflare/dns/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,21 @@ The module also simplifies a few boilerplate records at the apex for security pu
| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | ~> 1.3 |
| <a name="requirement_cloudflare"></a> [cloudflare](#requirement\_cloudflare) | >= 4.39.0, < 5.0.0 |
| <a name="requirement_cloudflare"></a> [cloudflare](#requirement\_cloudflare) | >= 5.1.0 |

## Providers

| Name | Version |
|------|---------|
| <a name="provider_cloudflare"></a> [cloudflare](#provider\_cloudflare) | >= 4.39.0, < 5.0.0 |
| <a name="provider_cloudflare"></a> [cloudflare](#provider\_cloudflare) | >= 5.1.0 |

## Resources

| Name | Type |
|------|------|
| [cloudflare_record.apex_txt](https://registry.terraform.io/providers/cloudflare/cloudflare/latest/docs/resources/record) | resource |
| [cloudflare_record.caa](https://registry.terraform.io/providers/cloudflare/cloudflare/latest/docs/resources/record) | resource |
| [cloudflare_record.dns](https://registry.terraform.io/providers/cloudflare/cloudflare/latest/docs/resources/record) | resource |
| [cloudflare_dns_record.apex_txt](https://registry.terraform.io/providers/cloudflare/cloudflare/latest/docs/resources/dns_record) | resource |
| [cloudflare_dns_record.caa](https://registry.terraform.io/providers/cloudflare/cloudflare/latest/docs/resources/dns_record) | resource |
| [cloudflare_dns_record.dns](https://registry.terraform.io/providers/cloudflare/cloudflare/latest/docs/resources/dns_record) | resource |
| [cloudflare_zone.dns](https://registry.terraform.io/providers/cloudflare/cloudflare/latest/docs/resources/zone) | resource |
| [cloudflare_zones.lookup](https://registry.terraform.io/providers/cloudflare/cloudflare/latest/docs/data-sources/zones) | data source |

Expand Down
26 changes: 14 additions & 12 deletions modules/cloudflare/dns/dns.tf
View file
Open in desktop
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,14 +40,15 @@ 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 {
flags = "0"
data = {
flags = 0
tag = "issue"
value = each.value
}
Expand Down
2 changes: 1 addition & 1 deletion modules/cloudflare/dns/locals.tf
View file
Open in desktop
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
View file
Open in desktop
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.1.0"
}
}
}