fix more scenarios with conditionsets

Author: EliMoshkovich

internal/provider/conditionsets/client.go

@@ -45,10 +45,22 @@ func (c *ConditionSetClient) Read(ctx context.Context, data ConditionSetModel) (
 		return ConditionSetModel{}, err
 	}
 
-	var resourceKey string
-
+	// Handle resource: if API returns null, keep it null to maintain consistency
+	var resource types.String
 	if conditionSet.Resource != nil {
-		resourceKey = conditionSet.Resource.Key
+		resource = types.StringValue(conditionSet.Resource.Key)
+	} else {
+		resource = types.StringPointerValue(nil)
+	}
+
+	// Handle description: if API returns null and state is null, keep it null
+	// This ensures consistency for omitted description fields
+	var description types.String
+	if conditionSet.Description != nil {
+		description = types.StringPointerValue(conditionSet.Description)
+	} else {
+		// API returned null - explicitly set to null to maintain consistency
+		description = types.StringPointerValue(nil)
 	}
 
 	state := ConditionSetModel{
@@ -58,8 +70,8 @@ func (c *ConditionSetClient) Read(ctx context.Context, data ConditionSetModel) (
 		EnvironmentId:  types.StringValue(conditionSet.EnvironmentId),
 		Key:            types.StringValue(conditionSet.Key),
 		Name:           types.StringValue(conditionSet.Name),
-		Description:    types.StringPointerValue(conditionSet.Description),
-		Resource:       types.StringValue(resourceKey),
+		Description:    description,
+		Resource:       resource,
 		Conditions:     types.StringValue(string(conditionsMarshalled)),
 	}
 

internal/provider/conditionsets/description_plan_modifier.go

@@ -0,0 +1,33 @@
+package conditionsets
+
+import (
+	"context"
+	"github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier"
+	"github.com/hashicorp/terraform-plugin-framework/types"
+)
+
+// normalizeEmptyStringToNull is a plan modifier that treats empty strings as null
+// This ensures consistency between the API behavior and Terraform state
+type normalizeEmptyStringToNull struct{}
+
+func (m normalizeEmptyStringToNull) Description(ctx context.Context) string {
+	return "Normalizes empty strings to null for consistency with API behavior"
+}
+
+func (m normalizeEmptyStringToNull) MarkdownDescription(ctx context.Context) string {
+	return "Normalizes empty strings to null for consistency with API behavior"
+}
+
+func (m normalizeEmptyStringToNull) PlanModifyString(ctx context.Context, req planmodifier.StringRequest, resp *planmodifier.StringResponse) {
+	// If the planned value is an empty string, change it to null
+	if !req.PlanValue.IsNull() && !req.PlanValue.IsUnknown() {
+		if req.PlanValue.ValueString() == "" {
+			resp.PlanValue = types.StringNull()
+		}
+	}
+}
+
+// NormalizeEmptyStringToNull returns a plan modifier that normalizes empty strings to null
+func NormalizeEmptyStringToNull() planmodifier.String {
+	return normalizeEmptyStringToNull{}
+}