Skip to content

fix-force-recreate-conditionsets #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RazcoDev merged 3 commits into from
Sep 17, 2025
Merged

fix-force-recreate-conditionsets #48

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
588a3c0
fix-force-recreate-conditionsets
EliMoshkovich Sep 16, 2025
b39c585
fix more scenarios with conditionsets
EliMoshkovich Sep 16, 2025
cf76652
wip
EliMoshkovich Sep 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 25 additions & 7 deletions internal/provider/conditionsets/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand All @@ -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)),
}

Expand Down Expand Up @@ -100,7 +112,10 @@ func (c *ConditionSetClient) Create(ctx context.Context, conditionSetType models
return err
}

conditionSetPlan.Description = types.StringPointerValue(conditionSetRead.Description)
// Only update description if API returns one, otherwise preserve the plan value
if conditionSetRead.Description != nil {
conditionSetPlan.Description = types.StringPointerValue(conditionSetRead.Description)
}
conditionSetPlan.Id = types.StringValue(conditionSetRead.Id)
conditionSetPlan.OrganizationId = types.StringValue(conditionSetRead.OrganizationId)
conditionSetPlan.ProjectId = types.StringValue(conditionSetRead.ProjectId)
Expand Down Expand Up @@ -136,7 +151,10 @@ func (c *ConditionSetClient) Update(ctx context.Context, conditionSetPlan *Condi
}

conditionSetPlan.Name = types.StringValue(conditionSetRead.Name)
conditionSetPlan.Description = types.StringPointerValue(conditionSetRead.Description)
// Only update description if API returns one, otherwise preserve the plan value
if conditionSetRead.Description != nil {
conditionSetPlan.Description = types.StringPointerValue(conditionSetRead.Description)
}
conditionSetPlan.EnvironmentId = types.StringValue(conditionSetRead.EnvironmentId)
conditionSetPlan.ProjectId = types.StringValue(conditionSetRead.ProjectId)
conditionSetPlan.Id = types.StringValue(conditionSetRead.Id)
Expand Down
Loading