Merge pull request #5873 from zakcutner/ruleset/logging

Reduce drift for `cloudflare_resource` rule logging attribute

Author: vaishakdinesh

internal/services/ruleset/model.go

@@ -35,12 +35,11 @@ type RulesetRulesModel struct {
 	ID                     types.String                                                      `tfsdk:"id" json:"id,computed"`
 	Action                 types.String                                                      `tfsdk:"action" json:"action,optional"`
 	ActionParameters       customfield.NestedObject[RulesetRulesActionParametersModel]       `tfsdk:"action_parameters" json:"action_parameters,optional"`
-	Categories             customfield.List[types.String]                                    `tfsdk:"categories" json:"categories,optional"`
 	Description            types.String                                                      `tfsdk:"description" json:"description,optional"`
 	Enabled                types.Bool                                                        `tfsdk:"enabled" json:"enabled,computed_optional"`
 	ExposedCredentialCheck customfield.NestedObject[RulesetRulesExposedCredentialCheckModel] `tfsdk:"exposed_credential_check" json:"exposed_credential_check,optional"`
 	Expression             types.String                                                      `tfsdk:"expression" json:"expression,optional"`
-	Logging                customfield.NestedObject[RulesetRulesLoggingModel]                `tfsdk:"logging" json:"logging,optional"`
+	Logging                customfield.NestedObject[RulesetRulesLoggingModel]                `tfsdk:"logging" json:"logging,computed_optional"`
 	Ratelimit              customfield.NestedObject[RulesetRulesRatelimitModel]              `tfsdk:"ratelimit" json:"ratelimit,optional"`
 	Ref                    types.String                                                      `tfsdk:"ref" json:"ref,computed_optional"`
 }
@@ -303,7 +302,7 @@ type RulesetRulesExposedCredentialCheckModel struct {
 }
 
 type RulesetRulesLoggingModel struct {
-	Enabled types.Bool `tfsdk:"enabled" json:"enabled,required"`
+	Enabled types.Bool `tfsdk:"enabled" json:"enabled,computed_optional"`
 }
 
 type RulesetRulesRatelimitModel struct {

internal/services/ruleset/resource.go

@@ -304,17 +304,17 @@ func (r *RulesetResource) ModifyPlan(ctx context.Context, req resource.ModifyPla
 		return
 	}
 
-	ruleIDsByRef := make(map[string]types.String)
+	rulesByRef := make(map[string]*RulesetRulesModel)
 
 	stateRules, diags := state.Rules.AsStructSliceT(ctx)
 	resp.Diagnostics.Append(diags...)
 	if resp.Diagnostics.HasError() {
 		return
 	}
 
-	for _, rule := range stateRules {
-		if ref := rule.Ref.ValueString(); ref != "" {
-			ruleIDsByRef[ref] = rule.ID
+	for i := range stateRules {
+		if ref := stateRules[i].Ref.ValueString(); ref != "" {
+			rulesByRef[ref] = &stateRules[i]
 		}
 	}
 
@@ -324,17 +324,21 @@ func (r *RulesetResource) ModifyPlan(ctx context.Context, req resource.ModifyPla
 		return
 	}
 
-	for i, rule := range planRules {
-		// Do nothing if the rule's ID is a known planned value.
-		if !rule.ID.IsUnknown() {
-			continue
-		}
-
-		// If the rule's ref matches a rule in the state, populate the planned
-		// value of its ID with the corresponding ID from the state.
-		if ref := rule.Ref.ValueString(); ref != "" {
-			if id, ok := ruleIDsByRef[ref]; ok {
-				planRules[i].ID = id
+	for i := range planRules {
+		if ref := planRules[i].Ref.ValueString(); ref != "" {
+			if stateRule, ok := rulesByRef[ref]; ok {
+				// If the rule's ref matches a rule from the state, populate its
+				// planned ID using the matching rule.
+				if planRules[i].ID.IsUnknown() {
+					planRules[i].ID = stateRule.ID
+				}
+
+				// If the rule's action is unchanged, populate its planned
+				// logging attribute using the matching rule from the state.
+				if planRules[i].Logging.IsUnknown() &&
+					stateRule.Action.Equal(planRules[i].Action) {
+					planRules[i].Logging = stateRule.Logging
+				}
 			}
 		}
 	}