Merge pull request #5837 from cloudflare/release-please--branches--main--changes--next

release: 5.8.2

Author: vaishakdinesh

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "5.8.1"
+  ".": "5.8.2"
 }

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## 5.8.2 (2025-08-01)
+
+Full Changelog: [v5.8.1...v5.8.2](https://github.com/cloudflare/terraform-provider-cloudflare/compare/v5.8.1...v5.8.2)
+
+### Features
+
+* **api:** api update ([54b3c10](https://github.com/cloudflare/terraform-provider-cloudflare/commit/54b3c1027b30ae9ad6f388a64ea04941faea6774))
+* **api:** api update ([8666096](https://github.com/cloudflare/terraform-provider-cloudflare/commit/8666096e375e55731b286f30f3b722ad70761c1e))
+
+
+### Chores
+
+* update model for zt gateway settings ([a084e1b](https://github.com/cloudflare/terraform-provider-cloudflare/commit/a084e1bfbf36e6fe1b3799d585d20542f792c0f0))
+
 ## 5.8.1 (2025-08-01)
 
 Full Changelog: [v5.8.0...v5.8.1](https://github.com/cloudflare/terraform-provider-cloudflare/compare/v5.8.0...v5.8.1)

README.md

@@ -20,7 +20,7 @@ terraform {
   required_providers {
     cloudflare = {
       source  = "cloudflare/cloudflare"
-      version = "~> 5.8.1"
+      version = "~> 5.8.2"
     }
   }
 }

cmd/migrate/.gitignore

@@ -0,0 +1 @@
+migrate

cmd/migrate/go.mod

@@ -0,0 +1,25 @@
+module github.com/cloudflare/terraform-provider-cloudflare/cmd/migrate
+
+go 1.23.0
+
+toolchain go1.23.11
+
+require (
+	github.com/hashicorp/hcl/v2 v2.24.0
+	github.com/stretchr/testify v1.10.0
+	github.com/zclconf/go-cty v1.16.3
+)
+
+require (
+	github.com/agext/levenshtein v1.2.2 // indirect
+	github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/google/go-cmp v0.7.0 // indirect
+	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	golang.org/x/mod v0.25.0 // indirect
+	golang.org/x/sync v0.15.0 // indirect
+	golang.org/x/text v0.25.0 // indirect
+	golang.org/x/tools v0.34.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)

cmd/migrate/go.sum

@@ -0,0 +1,34 @@
+github.com/agext/levenshtein v1.2.2 h1:0S/Yg6LYmFJ5stwQeRp6EeOcCbj7xiqQSdNelsXvaqE=
+github.com/agext/levenshtein v1.2.2/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
+github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew1u1fNQOlOtuGxQY=
+github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68=
+github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
+github.com/hashicorp/hcl/v2 v2.24.0 h1:2QJdZ454DSsYGoaE6QheQZjtKZSUs9Nh2izTWiwQxvE=
+github.com/hashicorp/hcl/v2 v2.24.0/go.mod h1:oGoO1FIQYfn/AgyOhlg9qLC6/nOJPX3qGbkZpYAcqfM=
+github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0=
+github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/zclconf/go-cty v1.16.3 h1:osr++gw2T61A8KVYHoQiFbFd1Lh3JOCXc/jFLJXKTxk=
+github.com/zclconf/go-cty v1.16.3/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=
+github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6ZMSMNJFMOjqrGHynW3DIBuR2H9j0ug+Mo=
+github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmBdvvj3nqzfzJ6nTCIwDTPZ56aVGvDrmztiO5g3qrM=
+golang.org/x/mod v0.25.0 h1:n7a+ZbQKQA/Ysbyb0/6IbB1H/X41mKgbhfv7AfG/44w=
+golang.org/x/mod v0.25.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
+golang.org/x/sync v0.15.0 h1:KWH3jNZsfyT6xfAfKiz6MRNmd46ByHDYaZ7KSkCtdW8=
+golang.org/x/sync v0.15.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
+golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
+golang.org/x/tools v0.34.0 h1:qIpSLOxeCYGg9TrcJokLBG4KFA6d795g0xkBkiESGlo=
+golang.org/x/tools v0.34.0/go.mod h1:pAP9OwEaY1CAW3HOmg3hLZC5Z0CCmzjAF2UQMSqNARg=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

cmd/migrate/grit.go

@@ -0,0 +1,72 @@
+package main
+
+import (
+	"fmt"
+	"os"
+	"os/exec"
+	"strings"
+)
+
+// checkGritInstalled checks if grit is installed and available
+func checkGritInstalled() error {
+	cmd := exec.Command("grit", "--help")
+	cmd.Stdout = nil // Suppress output during check
+	cmd.Stderr = nil
+	if err := cmd.Run(); err != nil {
+		return fmt.Errorf("grit is not installed. Please install it with: npm install -g @getgrit/cli")
+	}
+	return nil
+}
+
+// runGritMigrations runs the grit migrations for Cloudflare Terraform provider v5
+func runGritMigrations(configDir string, stateFile string, dryRun bool) error {
+	// Define the grit patterns to apply
+	patterns := []struct {
+		pattern string
+		target  string
+	}{
+		{"github.com/cloudflare/terraform-provider-cloudflare#cloudflare_terraform_v5", "config"},
+		{"github.com/cloudflare/terraform-provider-cloudflare#cloudflare_terraform_v5_attribute_renames_state", "state"},
+		{"github.com/cloudflare/terraform-provider-cloudflare#cloudflare_terraform_v5_resource_renames_configuration", "config"},
+		{"github.com/cloudflare/terraform-provider-cloudflare#cloudflare_terraform_v5_resource_renames_state", "state"},
+	}
+
+	for _, p := range patterns {
+		// Determine the target path based on pattern type
+		targetPath := configDir
+		if p.target == "state" && stateFile != "" {
+			targetPath = stateFile
+		}
+
+		// Skip config patterns if no config directory is specified
+		if p.target == "config" && configDir == "" {
+			fmt.Printf("Skipping %s (config transformations disabled)\n", p.pattern)
+			continue
+		}
+
+		// Skip state patterns if no state file is specified
+		if p.target == "state" && stateFile == "" {
+			fmt.Printf("Skipping %s (state transformations disabled)\n", p.pattern)
+			continue
+		}
+
+		args := []string{"apply"}
+		if dryRun {
+			args = append(args, "--dry-run")
+		}
+		args = append(args, "--verbose")
+		args = append(args, p.pattern)
+		args = append(args, targetPath)
+
+		fmt.Printf("grit %s\n", strings.Join(args, " "))
+		cmd := exec.Command("grit", args...)
+		cmd.Stdout = os.Stdout
+		cmd.Stderr = os.Stderr
+
+		if err := cmd.Run(); err != nil {
+			return fmt.Errorf("failed to run grit pattern %s: %w", p.pattern, err)
+		}
+	}
+
+	return nil
+}

cmd/migrate/helpers.go

@@ -0,0 +1,79 @@
+package main
+
+import (
+	"github.com/hashicorp/hcl/v2/hclsyntax"
+	"github.com/hashicorp/hcl/v2/hclwrite"
+)
+
+// AttributeInfo holds an attribute name and its corresponding Attribute object
+type AttributeInfo struct {
+	Name      string
+	Attribute *hclwrite.Attribute
+}
+
+// AttributesOrdered returns attributes from a body in their original order
+func AttributesOrdered(body *hclwrite.Body) []AttributeInfo {
+	// Get all attributes as a map for lookup
+	attrMap := body.Attributes()
+	
+	// Get tokens to find the original order
+	tokens := body.BuildTokens(nil)
+	
+	var orderedAttrs []AttributeInfo
+	seenAttrs := make(map[string]bool)
+	
+	// Scan through tokens to find attribute names in order
+	for i := 0; i < len(tokens); i++ {
+		token := tokens[i]
+		
+		// Look for identifier tokens that could be attribute names
+		if token.Type == hclsyntax.TokenIdent && i+1 < len(tokens) {
+			// Check if the next token is an equals sign
+			nextToken := tokens[i+1]
+			if nextToken.Type == hclsyntax.TokenEqual {
+				attrName := string(token.Bytes)
+				
+				// Check if this is actually an attribute and we haven't seen it yet
+				if attr, exists := attrMap[attrName]; exists && !seenAttrs[attrName] {
+					orderedAttrs = append(orderedAttrs, AttributeInfo{
+						Name:      attrName,
+						Attribute: attr,
+					})
+					seenAttrs[attrName] = true
+				}
+			}
+		}
+	}
+	
+	return orderedAttrs
+}
+
+// buildTemplateStringTokens creates tokens for a template string like "${expr}/literal"
+func buildTemplateStringTokens(exprTokens hclwrite.Tokens, suffix string) hclwrite.Tokens {
+	tokens := hclwrite.Tokens{
+		{Type: hclsyntax.TokenOQuote, Bytes: []byte{'"'}},
+		{Type: hclsyntax.TokenTemplateInterp, Bytes: []byte("${")},
+	}
+	
+	tokens = append(tokens, exprTokens...)
+	tokens = append(tokens,
+		&hclwrite.Token{Type: hclsyntax.TokenTemplateSeqEnd, Bytes: []byte{'}'}},
+	)
+	
+	if suffix != "" {
+		tokens = append(tokens, &hclwrite.Token{Type: hclsyntax.TokenTemplateControl, Bytes: []byte(suffix)})
+	}
+	
+	tokens = append(tokens, &hclwrite.Token{Type: hclsyntax.TokenCQuote, Bytes: []byte{'"'}})
+	
+	return tokens
+}
+
+// buildResourceReference creates tokens for a resource reference like "type.name"
+func buildResourceReference(resourceType, resourceName string) hclwrite.Tokens {
+	return hclwrite.Tokens{
+		{Type: hclsyntax.TokenIdent, Bytes: []byte(resourceType)},
+		{Type: hclsyntax.TokenDot, Bytes: []byte{'.'}},
+		{Type: hclsyntax.TokenIdent, Bytes: []byte(resourceName)},
+	}
+}