From badb3dc0d608e8585db50da8070a17a8c1f1df42 Mon Sep 17 00:00:00 2001 From: Jacob Bednarz Date: Thu, 27 Jun 2024 11:49:09 +1000 Subject: [PATCH] docs: update WAF deprecation date to 2024-01-15 --- docs/resources/filter.md | 4 ++-- docs/resources/firewall_rule.md | 4 ++-- docs/resources/rate_limit.md | 4 ++-- .../sdkv2provider/resource_cloudflare_filter.go | 10 +++++----- .../resource_cloudflare_firewall_rule.go | 13 +++++++------ .../sdkv2provider/resource_cloudflare_rate_limit.go | 10 +++++----- templates/resources/filter.md.tmpl | 4 ++-- templates/resources/firewall_rule.md.tmpl | 4 ++-- templates/resources/rate_limit.md.tmpl | 4 ++-- 9 files changed, 29 insertions(+), 28 deletions(-) diff --git a/docs/resources/filter.md b/docs/resources/filter.md index 8dbe976149..b17bc92490 100644 --- a/docs/resources/filter.md +++ b/docs/resources/filter.md @@ -13,8 +13,8 @@ Filter expressions that can be referenced across multiple features, e.g. Firewall Rules. See [what is a filter](https://developers.cloudflare.com/firewall/api/cf-filters/what-is-a-filter/) for more details and available fields and operators. -~> `cloudflare_filter` is in a deprecation phase that will last for 14 months - (July 1st, 2024). During this time period, this resource is still fully +~> `cloudflare_filter` is in a deprecation phase until January 15th, 2025. + During this time period, this resource is still fully supported but you are strongly advised to move to the `cloudflare_ruleset` resource. Full details can be found in the [developer documentation](https://developers.cloudflare.com/waf/reference/migration-guides/firewall-rules-to-custom-rules/#relevant-changes-for-terraform-users). diff --git a/docs/resources/firewall_rule.md b/docs/resources/firewall_rule.md index e1d03333be..3a42b92e20 100644 --- a/docs/resources/firewall_rule.md +++ b/docs/resources/firewall_rule.md @@ -20,8 +20,8 @@ rule creation. Filter expressions needs to be created first before using Firewall Rule. -~> `cloudflare_firewall_rule` is in a deprecation phase that will last for 14 - months (July 1st, 2024). During this time period, this resource is still +~> `cloudflare_firewall_rule` is in a deprecation phase until January 15th, 2025. + During this time period, this resource is still fully supported but you are strongly advised to move to the `cloudflare_ruleset` resource. Full details can be found in the [developer documentation](https://developers.cloudflare.com/waf/reference/migration-guides/firewall-rules-to-custom-rules/#relevant-changes-for-terraform-users). diff --git a/docs/resources/rate_limit.md b/docs/resources/rate_limit.md index 141e114cf4..3b38f9430b 100644 --- a/docs/resources/rate_limit.md +++ b/docs/resources/rate_limit.md @@ -13,8 +13,8 @@ Provides a Cloudflare rate limit resource for a given zone. This can be used to limit the traffic you receive zone-wide, or matching more specific types of requests/responses. -~> `cloudflare_rate_limit` is in a deprecation phase that will last for 14 - months (July 1st, 2024). During this time period, this resource is still +~> `cloudflare_rate_limit` is in a deprecation phase until January 15th, 2025. + During this time period, this resource is still fully supported but you are strongly advised to move to the `cloudflare_ruleset` resource. Full details can be found in the [developer documentation](https://developers.cloudflare.com/waf/reference/migration-guides/old-rate-limiting-deprecation/#relevant-changes-for-terraform-users). diff --git a/internal/sdkv2provider/resource_cloudflare_filter.go b/internal/sdkv2provider/resource_cloudflare_filter.go index 688f434534..0916199b30 100644 --- a/internal/sdkv2provider/resource_cloudflare_filter.go +++ b/internal/sdkv2provider/resource_cloudflare_filter.go @@ -30,11 +30,11 @@ func resourceCloudflareFilter() *schema.Resource { for more details and available fields and operators. `), DeprecationMessage: heredoc.Doc(fmt.Sprintf(` - %s resource is in a deprecation phase that will - last for 14 months (July 1st, 2024). During this time period, this - resource is still fully supported but you are strongly advised - to move to the %s resource. For more information, see - https://developers.cloudflare.com/waf/reference/migration-guides/firewall-rules-to-custom-rules/#relevant-changes-for-terraform-users. + %s resource is in a deprecation phase until January 15th, 2025. + During this time period, this resource is still fully supported + but you are strongly advised to move to the %s resource. + + For more information, see https://developers.cloudflare.com/waf/reference/migration-guides/firewall-rules-to-custom-rules/#relevant-changes-for-terraform-users. `, "`cloudflare_filter`", "`cloudflare_ruleset`")), } } diff --git a/internal/sdkv2provider/resource_cloudflare_firewall_rule.go b/internal/sdkv2provider/resource_cloudflare_firewall_rule.go index 38c08e5a0e..7758e7d5dc 100644 --- a/internal/sdkv2provider/resource_cloudflare_firewall_rule.go +++ b/internal/sdkv2provider/resource_cloudflare_firewall_rule.go @@ -4,9 +4,10 @@ import ( "context" "errors" "fmt" - "github.com/MakeNowJust/heredoc/v2" "strings" + "github.com/MakeNowJust/heredoc/v2" + cloudflare "github.com/cloudflare/cloudflare-go" "github.com/cloudflare/terraform-provider-cloudflare/internal/consts" "github.com/hashicorp/terraform-plugin-log/tflog" @@ -34,11 +35,11 @@ func resourceCloudflareFirewallRule() *schema.Resource { Rule. `), DeprecationMessage: heredoc.Doc(fmt.Sprintf(` - %s resource is in a deprecation phase that will - last for 14 months (July 1st, 2024). During this time period, this - resource is still fully supported but you are strongly advised - to move to the %s resource. For more information, see - https://developers.cloudflare.com/waf/reference/migration-guides/firewall-rules-to-custom-rules/#relevant-changes-for-terraform-users. + %s resource is in a deprecation phase until January 15th, 2025. + During this time period, this resource is still fully supported + but you are strongly advised to move to the %s resource. + + For more information, see https://developers.cloudflare.com/waf/reference/migration-guides/firewall-rules-to-custom-rules/#relevant-changes-for-terraform-users. `, "`cloudflare_firewall_rule`", "`cloudflare_ruleset`")), } } diff --git a/internal/sdkv2provider/resource_cloudflare_rate_limit.go b/internal/sdkv2provider/resource_cloudflare_rate_limit.go index 3775d7e24c..8b9994dafe 100644 --- a/internal/sdkv2provider/resource_cloudflare_rate_limit.go +++ b/internal/sdkv2provider/resource_cloudflare_rate_limit.go @@ -30,11 +30,11 @@ func resourceCloudflareRateLimit() *schema.Resource { specific types of requests/responses. `), DeprecationMessage: heredoc.Doc(fmt.Sprintf(` - %s resource is in a deprecation phase that will - last for 14 months (July 1st, 2024). During this time period, this - resource is still fully supported but you are strongly advised - to move to the %s resource. For more information, see - https://developers.cloudflare.com/waf/reference/migration-guides/old-rate-limiting-deprecation/#relevant-changes-for-terraform-users. + %s resource is in a deprecation phase until January 15th, 2025. + During this time period, this resource is still fully supported + but you are strongly advised to move to the %s resource. + + For more information, see https://developers.cloudflare.com/waf/reference/migration-guides/old-rate-limiting-deprecation/#relevant-changes-for-terraform-users. `, "`cloudflare_rate_limit`", "`cloudflare_ruleset`")), } } diff --git a/templates/resources/filter.md.tmpl b/templates/resources/filter.md.tmpl index 27b5ee7154..39f7167092 100644 --- a/templates/resources/filter.md.tmpl +++ b/templates/resources/filter.md.tmpl @@ -9,8 +9,8 @@ description: |- {{ .Description | trimspace }} -~> `cloudflare_filter` is in a deprecation phase that will last for 14 months - (July 1st, 2024). During this time period, this resource is still fully +~> `cloudflare_filter` is in a deprecation phase until January 15th, 2025. + During this time period, this resource is still fully supported but you are strongly advised to move to the `cloudflare_ruleset` resource. Full details can be found in the [developer documentation](https://developers.cloudflare.com/waf/reference/migration-guides/firewall-rules-to-custom-rules/#relevant-changes-for-terraform-users). diff --git a/templates/resources/firewall_rule.md.tmpl b/templates/resources/firewall_rule.md.tmpl index 2602a5793a..286338e7bf 100644 --- a/templates/resources/firewall_rule.md.tmpl +++ b/templates/resources/firewall_rule.md.tmpl @@ -9,8 +9,8 @@ description: |- {{ .Description | trimspace }} -~> `cloudflare_firewall_rule` is in a deprecation phase that will last for 14 - months (July 1st, 2024). During this time period, this resource is still +~> `cloudflare_firewall_rule` is in a deprecation phase until January 15th, 2025. + During this time period, this resource is still fully supported but you are strongly advised to move to the `cloudflare_ruleset` resource. Full details can be found in the [developer documentation](https://developers.cloudflare.com/waf/reference/migration-guides/firewall-rules-to-custom-rules/#relevant-changes-for-terraform-users). diff --git a/templates/resources/rate_limit.md.tmpl b/templates/resources/rate_limit.md.tmpl index d59f14fad7..1ee9912082 100644 --- a/templates/resources/rate_limit.md.tmpl +++ b/templates/resources/rate_limit.md.tmpl @@ -9,8 +9,8 @@ description: |- {{ .Description | trimspace }} -~> `cloudflare_rate_limit` is in a deprecation phase that will last for 14 - months (July 1st, 2024). During this time period, this resource is still +~> `cloudflare_rate_limit` is in a deprecation phase until January 15th, 2025. + During this time period, this resource is still fully supported but you are strongly advised to move to the `cloudflare_ruleset` resource. Full details can be found in the [developer documentation](https://developers.cloudflare.com/waf/reference/migration-guides/old-rate-limiting-deprecation/#relevant-changes-for-terraform-users).