chore: Fixes in the tests to cover more cases

Author: vdekrijger

internal/resource/core/helpers.go

@@ -80,3 +80,14 @@ func Int32SetPreserveEmpty(ctx context.Context, values []int32, currentModel typ
 	}
 	return types.SetNull(types.Int32Type), diags
 }
+
+// ShouldClearString returns true if the plan value is null but state has a value,
+// indicating the user wants to clear the field by sending an empty string.
+func ShouldClearString(plan, state types.String) bool {
+	return plan.IsNull() && !state.IsNull()
+}
+
+// StringPtr returns a pointer to the given string.
+func StringPtr(s string) *string {
+	return &s
+}

internal/resource/core/helpers_test.go

@@ -318,3 +318,44 @@ func TestInt32SetPreserveEmpty(t *testing.T) {
 		})
 	}
 }
+
+func TestShouldClearString(t *testing.T) {
+	tests := map[string]struct {
+		plan  types.String
+		state types.String
+		want  bool
+	}{
+		"plan null, state has value - should clear": {
+			plan:  types.StringNull(),
+			state: types.StringValue("existing"),
+			want:  true,
+		},
+		"plan null, state null - nothing to clear": {
+			plan:  types.StringNull(),
+			state: types.StringNull(),
+			want:  false,
+		},
+		"plan has value, state has value - no clearing needed": {
+			plan:  types.StringValue("new"),
+			state: types.StringValue("old"),
+			want:  false,
+		},
+		"plan has value, state null - no clearing needed": {
+			plan:  types.StringValue("new"),
+			state: types.StringNull(),
+			want:  false,
+		},
+		"plan unknown, state has value - unknown handled elsewhere": {
+			plan:  types.StringUnknown(),
+			state: types.StringValue("existing"),
+			want:  false,
+		},
+	}
+
+	for name, tc := range tests {
+		t.Run(name, func(t *testing.T) {
+			got := ShouldClearString(tc.plan, tc.state)
+			assert.Equal(t, tc.want, got)
+		})
+	}
+}

internal/resource/dashboard.go

@@ -107,9 +107,9 @@ func (o DashboardOps) BuildCreateRequest(ctx context.Context, model DashboardRes
 func (o DashboardOps) BuildUpdateRequest(ctx context.Context, plan, state DashboardResourceTFModel) (httpclient.DashboardRequest, diag.Diagnostics) {
 	req, diags := o.BuildCreateRequest(ctx, plan)
 
-	if plan.Description.IsNull() && !state.Description.IsNull() {
-		empty := ""
-		req.Description = &empty
+	// Clear description if removed from config
+	if core.ShouldClearString(plan.Description, state.Description) {
+		req.Description = core.StringPtr("")
 	}
 
 	if !plan.Deleted.IsNull() {

internal/resource/insight.go

@@ -161,9 +161,14 @@ func (o InsightOps) BuildCreateRequest(ctx context.Context, model InsightResourc
 	return input, diags
 }
 
-func (o InsightOps) BuildUpdateRequest(ctx context.Context, plan, _ InsightResourceTFModel) (httpclient.InsightRequest, diag.Diagnostics) {
+func (o InsightOps) BuildUpdateRequest(ctx context.Context, plan, state InsightResourceTFModel) (httpclient.InsightRequest, diag.Diagnostics) {
 	req, diags := o.BuildCreateRequest(ctx, plan)
 
+	// Clear description if removed from config
+	if core.ShouldClearString(plan.Description, state.Description) {
+		req.Description = core.StringPtr("")
+	}
+
 	if !plan.Deleted.IsNull() {
 		deleted := plan.Deleted.ValueBool()
 		req.Deleted = &deleted

tests/dashboard_test.go

@@ -244,15 +244,13 @@ func TestDashboard_EmptyDescription(t *testing.T) {
 				Config: testAccDashboardBasic(rName),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr("posthog_dashboard.test", "name", rName),
-					resource.TestCheckResourceAttr("posthog_dashboard.test", "description", ""),
+					resource.TestCheckNoResourceAttr("posthog_dashboard.test", "description"),
 				),
 			},
 		},
 	})
 }
 
-// Config generators
-
 func testAccDashboardBasic(name string) string {
 	return fmt.Sprintf(`
 provider "posthog" {}

tests/feature_flag_test.go

@@ -1,6 +1,7 @@
 package tests
 
 import (
+	"encoding/json"
 	"fmt"
 	"testing"
 
@@ -124,13 +125,37 @@ func TestFeatureFlag_FiltersWithRollout(t *testing.T) {
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr("posthog_feature_flag.test", "key", rKey),
 					resource.TestCheckResourceAttrSet("posthog_feature_flag.test", "filters"),
-					resource.TestCheckResourceAttr("posthog_feature_flag.test", "filters.groups[0].rollout_percentage", "75"),
+					testCheckFiltersRolloutPercentage("posthog_feature_flag.test", 0, 75),
 				),
 			},
 		},
 	})
 }
 
+// testCheckFiltersRolloutPercentage verifies the rollout_percentage in a filters JSON attribute.
+func testCheckFiltersRolloutPercentage(resourceName string, groupIndex int, expected float64) resource.TestCheckFunc {
+	return resource.TestCheckResourceAttrWith(resourceName, "filters", func(value string) error {
+		var filters struct {
+			Groups []struct {
+				RolloutPercentage *float64 `json:"rollout_percentage"`
+			} `json:"groups"`
+		}
+		if err := json.Unmarshal([]byte(value), &filters); err != nil {
+			return fmt.Errorf("failed to parse filters JSON: %w", err)
+		}
+		if groupIndex >= len(filters.Groups) {
+			return fmt.Errorf("group index %d out of range (have %d groups)", groupIndex, len(filters.Groups))
+		}
+		if filters.Groups[groupIndex].RolloutPercentage == nil {
+			return fmt.Errorf("rollout_percentage is nil for group %d", groupIndex)
+		}
+		if *filters.Groups[groupIndex].RolloutPercentage != expected {
+			return fmt.Errorf("expected rollout_percentage %v, got %v", expected, *filters.Groups[groupIndex].RolloutPercentage)
+		}
+		return nil
+	})
+}
+
 // TestFeatureFlag_Update tests updating each field individually.
 func TestFeatureFlag_Update(t *testing.T) {
 	skipIfNotAcceptance(t)

tests/insight_test.go

@@ -325,7 +325,7 @@ func TestInsight_EmptyDescription(t *testing.T) {
 				Config: testAccInsightBasic(rName),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr("posthog_insight.test", "name", rName),
-					resource.TestCheckNoResourceAttr("posthog_dashboard.test", "description"),
+					resource.TestCheckNoResourceAttr("posthog_insight.test", "description"),
 				),
 			},
 		},