Merge pull request #4814 from guineveresaenger/fix-nil-dereference-se…

…rvestale
cloudflare · Dec 26, 2024 · b45c0b9 · b45c0b9
2 parents 1ef0bed + ff0305a
commit b45c0b9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/.changelog/4814.txt b/.changelog/4814.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+resource/cloudflare_ruleset: handle when `disable_stale_while_updating` is an empty object but not nil
+```
diff --git a/internal/framework/service/rulesets/resource.go b/internal/framework/service/rulesets/resource.go
@@ -623,9 +623,11 @@ func toRulesetResourceModel(ctx context.Context, zoneID, accountID basetypes.Str
 			}
 
 			if ruleResponse.ActionParameters.ServeStale != nil {
-				rule.ActionParameters[0].ServeStale = []*ActionParameterServeStaleModel{{
-					DisableStaleWhileUpdating: types.BoolValue(*ruleResponse.ActionParameters.ServeStale.DisableStaleWhileUpdating),
-				}}
+				if ruleResponse.ActionParameters.ServeStale.DisableStaleWhileUpdating != nil {
+					rule.ActionParameters[0].ServeStale = []*ActionParameterServeStaleModel{{
+						DisableStaleWhileUpdating: types.BoolValue(*ruleResponse.ActionParameters.ServeStale.DisableStaleWhileUpdating),
+					}}
+				}
 			}
 
 			if ruleResponse.ActionParameters.FromList != nil {