Skip to content

Commit

Permalink
Update cloudflare/cloudflare requirement from ~> 3.0.0 to ~> 4.26.0 (#64
Browse files Browse the repository at this point in the history 
)

Updates the requirements on
[cloudflare/cloudflare](https://github.com/cloudflare/terraform-provider-cloudflare)
to permit the latest version.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/cloudflare/terraform-provider-cloudflare/releases">cloudflare/cloudflare's
releases</a>.</em></p>
<blockquote>
<h2>v4.26.0</h2>
<p>FEATURES:</p>
<ul>
<li><strong>New Data Source:</strong>
<code>cloudflare_dlp_datasets</code> (<a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3135">#3135</a>)</li>
</ul>
<p>ENHANCEMENTS:</p>
<ul>
<li>resource/cloudflare_access_application: adds
<code>name_id_transform_jsonata</code> to SaaS applications (<a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3132">#3132</a>)</li>
</ul>
<p>BUG FIXES:</p>
<ul>
<li>resource/cloudflare_access_application: Fix issue with sending
allow_authenticate_via_warp on updates when it is not provided (<a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3140">#3140</a>)</li>
</ul>
<p>DEPENDENCIES:</p>
<ul>
<li>provider: bump <code>github.com/aws/aws-sdk-go-v2/config</code> from
1.27.1 to 1.27.2 (<a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3136">#3136</a>)</li>
<li>provider: bump <code>github.com/aws/aws-sdk-go-v2/config</code> from
1.27.2 to 1.27.3 (<a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3138">#3138</a>)</li>
<li>provider: bump <code>github.com/aws/aws-sdk-go-v2/config</code> from
1.27.3 to 1.27.4 (<a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3141">#3141</a>)</li>
<li>provider: bump <code>github.com/aws/aws-sdk-go-v2/config</code> from
1.27.4 to 1.27.5 (<a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3159">#3159</a>)</li>
<li>provider: bump <code>github.com/aws/aws-sdk-go-v2/config</code> from
1.27.5 to 1.27.6 (<a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3161">#3161</a>)</li>
<li>provider: bump <code>github.com/aws/aws-sdk-go-v2/credentials</code>
from 1.17.1 to 1.17.2 (<a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3136">#3136</a>)</li>
<li>provider: bump <code>github.com/aws/aws-sdk-go-v2/credentials</code>
from 1.17.2 to 1.17.3 (<a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3138">#3138</a>)</li>
<li>provider: bump <code>github.com/aws/aws-sdk-go-v2/credentials</code>
from 1.17.3 to 1.17.4 (<a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3141">#3141</a>)</li>
<li>provider: bump <code>github.com/aws/aws-sdk-go-v2/credentials</code>
from 1.17.4 to 1.17.5 (<a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3159">#3159</a>)</li>
<li>provider: bump <code>github.com/aws/aws-sdk-go-v2/credentials</code>
from 1.17.5 to 1.17.6 (<a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3161">#3161</a>)</li>
<li>provider: bump <code>github.com/aws/aws-sdk-go-v2/service/s3</code>
from 1.50.2 to 1.50.3 (<a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3136">#3136</a>)</li>
<li>provider: bump <code>github.com/aws/aws-sdk-go-v2/service/s3</code>
from 1.50.3 to 1.51.0 (<a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3138">#3138</a>)</li>
<li>provider: bump <code>github.com/aws/aws-sdk-go-v2/service/s3</code>
from 1.51.0 to 1.51.1 (<a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3141">#3141</a>)</li>
<li>provider: bump <code>github.com/aws/aws-sdk-go-v2/service/s3</code>
from 1.51.1 to 1.51.2 (<a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3159">#3159</a>)</li>
<li>provider: bump <code>github.com/aws/aws-sdk-go-v2/service/s3</code>
from 1.51.2 to 1.51.3 (<a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3161">#3161</a>)</li>
<li>provider: bump <code>github.com/aws/aws-sdk-go-v2</code> from 1.25.0
to 1.25.1 (<a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3136">#3136</a>)</li>
<li>provider: bump <code>github.com/aws/aws-sdk-go-v2</code> from 1.25.1
to 1.25.2 (<a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3141">#3141</a>)</li>
<li>provider: bump github.com/cloudflare/cloudflare-go from 0.88.0 to
0.89.0 (<a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3148">#3148</a>)</li>
<li>provider: bump github.com/hashicorp/terraform-plugin-go from 0.21.0
to 0.22.0 (<a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3139">#3139</a>)</li>
<li>provider: bump github.com/stretchr/testify from 1.8.4 to 1.9.0 (<a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3157">#3157</a>)</li>
<li>provider: bump golang.org/x/net from 0.21.0 to 0.22.0 (<a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3160">#3160</a>)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/cloudflare/terraform-provider-cloudflare/blob/master/CHANGELOG.md">cloudflare/cloudflare's
changelog</a>.</em></p>
<blockquote>
<h2>4.26.0 (March 6th, 2024)</h2>
<p>FEATURES:</p>
<ul>
<li><strong>New Data Source:</strong>
<code>cloudflare_dlp_datasets</code> (<a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3135">#3135</a>)</li>
</ul>
<p>ENHANCEMENTS:</p>
<ul>
<li>resource/cloudflare_access_application: adds
<code>name_id_transform_jsonata</code> to SaaS applications (<a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3132">#3132</a>)</li>
</ul>
<p>BUG FIXES:</p>
<ul>
<li>resource/cloudflare_access_application: Fix issue with sending
allow_authenticate_via_warp on updates when it is not provided (<a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3140">#3140</a>)</li>
</ul>
<p>DEPENDENCIES:</p>
<ul>
<li>provider: bump <code>github.com/aws/aws-sdk-go-v2/config</code> from
1.27.1 to 1.27.2 (<a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3136">#3136</a>)</li>
<li>provider: bump <code>github.com/aws/aws-sdk-go-v2/config</code> from
1.27.2 to 1.27.3 (<a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3138">#3138</a>)</li>
<li>provider: bump <code>github.com/aws/aws-sdk-go-v2/config</code> from
1.27.3 to 1.27.4 (<a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3141">#3141</a>)</li>
<li>provider: bump <code>github.com/aws/aws-sdk-go-v2/config</code> from
1.27.4 to 1.27.5 (<a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3159">#3159</a>)</li>
<li>provider: bump <code>github.com/aws/aws-sdk-go-v2/config</code> from
1.27.5 to 1.27.6 (<a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3161">#3161</a>)</li>
<li>provider: bump <code>github.com/aws/aws-sdk-go-v2/credentials</code>
from 1.17.1 to 1.17.2 (<a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3136">#3136</a>)</li>
<li>provider: bump <code>github.com/aws/aws-sdk-go-v2/credentials</code>
from 1.17.2 to 1.17.3 (<a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3138">#3138</a>)</li>
<li>provider: bump <code>github.com/aws/aws-sdk-go-v2/credentials</code>
from 1.17.3 to 1.17.4 (<a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3141">#3141</a>)</li>
<li>provider: bump <code>github.com/aws/aws-sdk-go-v2/credentials</code>
from 1.17.4 to 1.17.5 (<a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3159">#3159</a>)</li>
<li>provider: bump <code>github.com/aws/aws-sdk-go-v2/credentials</code>
from 1.17.5 to 1.17.6 (<a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3161">#3161</a>)</li>
<li>provider: bump <code>github.com/aws/aws-sdk-go-v2/service/s3</code>
from 1.50.2 to 1.50.3 (<a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3136">#3136</a>)</li>
<li>provider: bump <code>github.com/aws/aws-sdk-go-v2/service/s3</code>
from 1.50.3 to 1.51.0 (<a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3138">#3138</a>)</li>
<li>provider: bump <code>github.com/aws/aws-sdk-go-v2/service/s3</code>
from 1.51.0 to 1.51.1 (<a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3141">#3141</a>)</li>
<li>provider: bump <code>github.com/aws/aws-sdk-go-v2/service/s3</code>
from 1.51.1 to 1.51.2 (<a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3159">#3159</a>)</li>
<li>provider: bump <code>github.com/aws/aws-sdk-go-v2/service/s3</code>
from 1.51.2 to 1.51.3 (<a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3161">#3161</a>)</li>
<li>provider: bump <code>github.com/aws/aws-sdk-go-v2</code> from 1.25.0
to 1.25.1 (<a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3136">#3136</a>)</li>
<li>provider: bump <code>github.com/aws/aws-sdk-go-v2</code> from 1.25.1
to 1.25.2 (<a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3141">#3141</a>)</li>
<li>provider: bump github.com/cloudflare/cloudflare-go from 0.88.0 to
0.89.0 (<a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3148">#3148</a>)</li>
<li>provider: bump github.com/hashicorp/terraform-plugin-go from 0.21.0
to 0.22.0 (<a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3139">#3139</a>)</li>
<li>provider: bump github.com/hashicorp/terraform-plugin-mux from 0.14.0
to 0.15.0 (<a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3149">#3149</a>)</li>
<li>provider: bump github.com/hashicorp/terraform-plugin-sdk/v2 from
2.32.0 to 2.33.0 (<a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3142">#3142</a>)</li>
<li>provider: bump github.com/hashicorp/terraform-plugin-sdk/v2 from
2.32.0 to 2.33.0 (<a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3147">#3147</a>)</li>
<li>provider: bump github.com/hashicorp/terraform-plugin-testing from
1.6.0 to 1.7.0 (<a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3162">#3162</a>)</li>
<li>provider: bump github.com/stretchr/testify from 1.8.4 to 1.9.0 (<a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3157">#3157</a>)</li>
<li>provider: bump golang.org/x/net from 0.21.0 to 0.22.0 (<a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3160">#3160</a>)</li>
</ul>
<h2>4.25.0 (February 21st, 2024)</h2>
<p>BREAKING CHANGES:</p>
<ul>
<li>resource/cloudflare_custom_pages: Removed the
<code>always_online</code> variant. This page is never generated
anymore, if a requested page is unavailable in the archive the error
page that would have been shown if always online wasn't enabled is
shown. (<a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3117">#3117</a>)</li>
</ul>
<p>ENHANCEMENTS:</p>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/cloudflare/terraform-provider-cloudflare/commit/0f01dcbd4ab01f95e06ce2b1dafce00dfa636733"><code>0f01dcb</code></a>
Merge pull request <a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3164">#3164</a>
from cloudflare/revert-3162-dependabot/go_modules/gi...</li>
<li><a
href="https://github.com/cloudflare/terraform-provider-cloudflare/commit/3ec5cffe09d0bf6c48d05907a36a3b34d5237ff1"><code>3ec5cff</code></a>
Revert &quot;build(deps): bump
github.com/hashicorp/terraform-plugin-testing from ...</li>
<li><a
href="https://github.com/cloudflare/terraform-provider-cloudflare/commit/dcd0c9801d544a042f9bc9d368e34f93b13f782e"><code>dcd0c98</code></a>
Update CHANGELOG.md</li>
<li><a
href="https://github.com/cloudflare/terraform-provider-cloudflare/commit/3d1001d370a92edb222052e9e4b637262575bb54"><code>3d1001d</code></a>
Update CHANGELOG.md for <a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3162">#3162</a></li>
<li><a
href="https://github.com/cloudflare/terraform-provider-cloudflare/commit/8389cdd4f6f8df3dbfbeca65bf4cc80923968da5"><code>8389cdd</code></a>
Merge pull request <a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3162">#3162</a>
from cloudflare/dependabot/go_modules/github.com/has...</li>
<li><a
href="https://github.com/cloudflare/terraform-provider-cloudflare/commit/ca468f33bff91f74091c975b122b99c3757d108c"><code>ca468f3</code></a>
Update CHANGELOG.md for <a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3161">#3161</a></li>
<li><a
href="https://github.com/cloudflare/terraform-provider-cloudflare/commit/0542a331fa6cd7a2e79d0d1f18bdcb9470414f3d"><code>0542a33</code></a>
Merge pull request <a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3161">#3161</a>
from cloudflare/dependabot/go_modules/aws-f5b39c608e</li>
<li><a
href="https://github.com/cloudflare/terraform-provider-cloudflare/commit/8d96f608edb6cedc8faf69216012d0f29d97ee84"><code>8d96f60</code></a>
Merge pull request <a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3132">#3132</a>
from khiller-cf/master</li>
<li><a
href="https://github.com/cloudflare/terraform-provider-cloudflare/commit/4b36aa80cd6dcaa8c1b581b4e3d85edf7f0f8142"><code>4b36aa8</code></a>
add CHANGELOG for <a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3162">#3162</a></li>
<li><a
href="https://github.com/cloudflare/terraform-provider-cloudflare/commit/ebc415116cbe0da057ba639c4a024ed8df043a9f"><code>ebc4151</code></a>
add CHANGELOG for <a
href="https://redirect.github.com/cloudflare/terraform-provider-cloudflare/issues/3161">#3161</a></li>
<li>Additional commits viewable in <a
href="https://github.com/cloudflare/terraform-provider-cloudflare/compare/v3.0.0...v4.26.0">compare
view</a></li>
</ul>
</details>
<br />


Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>
  • Loading branch information
@OJFord
OJFord authored Mar 12, 2024
2 parents 3d17486 + b73f96e commit 270536e
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .terraform-version
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
min-required
1.7.4
5 changes: 3 additions & 2 deletions mta-sts.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ locals {
resource "cloudflare_worker_script" "mta-sts" {
for_each = local.email_domain_zones

name = "mta-sts-${replace(each.value.zone, ".", "-")}"
content = <<EOC
account_id = var.cloudflare_account_id
name = "mta-sts-${replace(each.value.zone, ".", "-")}"
content = <<EOC
async function handleRequest(request) {
return new Response(`${local.mta_sts_content}`, {
headers: {
Expand Down
4 changes: 4 additions & 0 deletions variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ variable "aws_iam_path_prefix" {
default = ""
}

variable "cloudflare_account_id" {
type = string
}

# Remove once https://github.com/cloudflare/terraform-provider-cloudflare/issues/1921
variable "cloudflare_workers_subdomain" {
description = "Cloudflare account <subdomain>.workers.dev - https://dash.cloudflare.com/workers/subdomain"
Expand Down
4 changes: 2 additions & 2 deletions versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ terraform {
}
cloudflare = {
source = "cloudflare/cloudflare"
version = "~> 3.0.0"
version = "~> 4.26.0"
}
random = {
source = "hashicorp/random"
}
}
required_version = "~> 1.0"
required_version = "~> 1.7"
}

0 comments on commit 270536e

Please sign in to comment.