From e7202a9902b63d962e860ad1ca10bf5bd71cd555 Mon Sep 17 00:00:00 2001 From: "alexander.miehe" Date: Fri, 27 Dec 2024 11:50:19 +0100 Subject: [PATCH] PLT-0 - Drop support for version parameter https://github.com/cloudflare/terraform-provider-cloudflare/pull/4697 --- .github/workflows/lint.yml | 2 +- .github/workflows/test.yml | 2 +- README.md | 7 +++---- main.tf | 3 +-- variables.tf | 3 +-- versions.tf | 2 +- 6 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index b087fbe..8123d6c 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -59,4 +59,4 @@ jobs: git diff --quiet || { echo "Build Changes"; git diff; git status; false; } env: TARGET: ${{ matrix.target }} - RETRIES: 20 + RETRIES: 1 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b888ae3..9cb714a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -47,4 +47,4 @@ jobs: } retry make test env: - RETRIES: 20 + RETRIES: 1 diff --git a/README.md b/README.md index 60f9a35..9203077 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ This Terraform module manages Cloudflare Rulesets. | Name | Version | |------|---------| -| [cloudflare](#provider\_cloudflare) | ~> 4.20 | +| [cloudflare](#provider\_cloudflare) | ~> 4.48 | @@ -28,7 +28,7 @@ This Terraform module manages Cloudflare Rulesets. | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | ~> 1.3 | -| [cloudflare](#requirement\_cloudflare) | ~> 4.20 | +| [cloudflare](#requirement\_cloudflare) | ~> 4.48 | @@ -114,8 +114,7 @@ list(object({ ruleset = optional(string) # phase: http_request_firewall_managed, action: block, challenge, js_challenge, log, managed_challenge, skip - id = optional(string) - version = optional(string) + id = optional(string) overrides = optional(object({ action = optional(string) categories = optional(list(object({ diff --git a/main.tf b/main.tf index 64d48e6..63c5d78 100644 --- a/main.tf +++ b/main.tf @@ -49,8 +49,7 @@ resource "cloudflare_ruleset" "this" { products = action_parameters.value.products # http_request_firewall_managed - id = action_parameters.value.id - version = action_parameters.value.version + id = action_parameters.value.id dynamic "overrides" { for_each = rules.value.action_parameters.overrides[*] content { diff --git a/variables.tf b/variables.tf index 477a01e..8066522 100644 --- a/variables.tf +++ b/variables.tf @@ -75,8 +75,7 @@ variable "rules" { ruleset = optional(string) # phase: http_request_firewall_managed, action: block, challenge, js_challenge, log, managed_challenge, skip - id = optional(string) - version = optional(string) + id = optional(string) overrides = optional(object({ action = optional(string) categories = optional(list(object({ diff --git a/versions.tf b/versions.tf index f85bdd9..5daff77 100644 --- a/versions.tf +++ b/versions.tf @@ -2,7 +2,7 @@ terraform { required_providers { cloudflare = { source = "cloudflare/cloudflare" - version = "~> 4.20" + version = "~> 4.48" } } required_version = "~> 1.3"