Merge pull request #4787 from WowVeryLogin/denis/FLPROD-1439

cloudflare · Jan 29, 2025 · 96f73b4 · 96f73b4
2 parents 4aa2e65 + a4a4a4a
commit 96f73b4
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 20 deletions.
diff --git a/.changelog/4787.txt b/.changelog/4787.txt
@@ -0,0 +1,5 @@
+```release-note:enhancement
+resource/snippets-rules: make terraform consistent with the API and do not require "enabled" and "description" fields
+resource/snippets: use list instead of set
+resource/cloud_connector_rules: use list instead of set
+```
diff --git a/internal/framework/service/cloud_connector_rules/schema.go b/internal/framework/service/cloud_connector_rules/schema.go
@@ -7,7 +7,7 @@ import (
 	"github.com/MakeNowJust/heredoc/v2"
 	"github.com/cloudflare/terraform-provider-cloudflare/internal/consts"
 	"github.com/cloudflare/terraform-provider-cloudflare/internal/utils"
-	"github.com/hashicorp/terraform-plugin-framework-validators/setvalidator"
+	"github.com/hashicorp/terraform-plugin-framework-validators/listvalidator"
 	"github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
@@ -33,11 +33,11 @@ func (r *CloudConnectorRulesResource) Schema(ctx context.Context, req resource.S
 			},
 		},
 		Blocks: map[string]schema.Block{
-			"rules": schema.SetNestedBlock{
+			"rules": schema.ListNestedBlock{
 				MarkdownDescription: "List of Cloud Connector Rules",
-				Validators: []validator.Set{
-					setvalidator.SizeAtLeast(1),
-					setvalidator.IsRequired(),
+				Validators: []validator.List{
+					listvalidator.SizeAtLeast(1),
+					listvalidator.IsRequired(),
 				},
 				NestedObject: schema.NestedBlockObject{
 					Attributes: map[string]schema.Attribute{

diff --git a/internal/framework/service/snippet_rules/resource_test.go b/internal/framework/service/snippet_rules/resource_test.go
@@ -64,7 +64,7 @@ func TestAccCloudflareSnippetRules(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "rules.0.%", "4"),
 					resource.TestCheckResourceAttr(resourceName, "rules.0.enabled", "true"),
 					resource.TestCheckResourceAttr(resourceName, "rules.0.expression", "true"),
-					resource.TestCheckResourceAttr(resourceName, "rules.0.description", "some description 1"),
+					resource.TestCheckResourceAttr(resourceName, "rules.0.description", ""),
 					resource.TestCheckResourceAttr(resourceName, "rules.0.snippet_name", "test_snippet_0"),
 
 					resource.TestCheckResourceAttr(resourceName, "rules.1.%", "4"),
@@ -100,9 +100,7 @@ func testAccCheckCloudflareSnippetRules(rnd, zoneID string) string {
   resource "cloudflare_snippet_rules" "%[1]s" {
 		zone_id  = "%[2]s"
 		rules {
-			enabled = true
 			expression = "true"
-			description = "some description 1"
 			snippet_name = "test_snippet_0"
 		}
 

diff --git a/internal/framework/service/snippet_rules/schema.go b/internal/framework/service/snippet_rules/schema.go
@@ -5,7 +5,8 @@ import (
 
 	"github.com/MakeNowJust/heredoc/v2"
 	"github.com/cloudflare/terraform-provider-cloudflare/internal/consts"
-	"github.com/hashicorp/terraform-plugin-framework-validators/setvalidator"
+	"github.com/cloudflare/terraform-provider-cloudflare/internal/framework/modifiers/defaults"
+	"github.com/hashicorp/terraform-plugin-framework-validators/listvalidator"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier"
@@ -30,16 +31,20 @@ func (r *SnippetRulesResource) Schema(ctx context.Context, req resource.SchemaRe
 			},
 		},
 		Blocks: map[string]schema.Block{
-			"rules": schema.SetNestedBlock{
+			"rules": schema.ListNestedBlock{
 				MarkdownDescription: "List of Snippet Rules",
-				Validators: []validator.Set{
-					setvalidator.SizeAtLeast(1),
-					setvalidator.IsRequired(),
+				Validators: []validator.List{
+					listvalidator.SizeAtLeast(1),
+					listvalidator.IsRequired(),
 				},
 				NestedObject: schema.NestedBlockObject{
 					Attributes: map[string]schema.Attribute{
 						"enabled": schema.BoolAttribute{
-							Optional:            true,
+							Optional: true,
+							Computed: true,
+							PlanModifiers: []planmodifier.Bool{
+								defaults.DefaultBool(true),
+							},
 							MarkdownDescription: "Whether the headers rule is active.",
 						},
 						"expression": schema.StringAttribute{
@@ -51,7 +56,11 @@ func (r *SnippetRulesResource) Schema(ctx context.Context, req resource.SchemaRe
 							MarkdownDescription: "Name of the snippet invoked by this rule.",
 						},
 						"description": schema.StringAttribute{
-							Optional:            true,
+							Optional: true,
+							Computed: true,
+							PlanModifiers: []planmodifier.String{
+								stringplanmodifier.UseStateForUnknown(),
+							},
 							MarkdownDescription: "Brief summary of the snippet rule and its intended use.",
 						},
 					},

diff --git a/internal/framework/service/snippets/schema.go b/internal/framework/service/snippets/schema.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/MakeNowJust/heredoc/v2"
 	"github.com/cloudflare/terraform-provider-cloudflare/internal/consts"
-	"github.com/hashicorp/terraform-plugin-framework-validators/setvalidator"
+	"github.com/hashicorp/terraform-plugin-framework-validators/listvalidator"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier"
@@ -41,11 +41,11 @@ func (r *SnippetResource) Schema(ctx context.Context, req resource.SchemaRequest
 			},
 		},
 		Blocks: map[string]schema.Block{
-			"files": schema.SetNestedBlock{
+			"files": schema.ListNestedBlock{
 				MarkdownDescription: "List of Snippet Files",
-				Validators: []validator.Set{
-					setvalidator.SizeAtLeast(1),
-					setvalidator.IsRequired(),
+				Validators: []validator.List{
+					listvalidator.SizeAtLeast(1),
+					listvalidator.IsRequired(),
 				},
 				NestedObject: schema.NestedBlockObject{
 					Attributes: map[string]schema.Attribute{