Skip to content

feat: Suppress diff for default value of memory_event: apply_type: "immediate" #573

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
maaarcelino merged 4 commits into from
Sep 30, 2025
Merged

feat: Suppress diff for default value of memory_event: apply_type: "immediate" #573

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7ed1359
suppress diffs for immediate apply type of memory events
Sep 29, 2025
ccb1911
Merge remote-tracking branch 'origin/master' into feat/suppress-apply…
Sep 29, 2025
1bc6a3f
gen sdk
Sep 29, 2025
6d32f6c
remove function arg
Sep 30, 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
50 changes: 34 additions & 16 deletions castai/resource_workload_scaling_policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ const (
minNumeratorValue = 0.0
maxExponentValue = 1.
minExponentValue = 0.
defaultApplyType = "IMMEDIATE"
)

const (
Expand All @@ -47,6 +48,8 @@ const (
FieldRolloutBehaviorNoDisruptionType = "NO_DISRUPTION"
FieldRolloutBehaviorPreferOneByOneType = "prefer_one_by_one"
FieldPredictiveScaling = "predictive_scaling"
FieldMemoryEvent = "memory_event"
FieldApplyType = "apply_type"
FieldConfidenceThreshold = "threshold"
DeprecatedFieldApplyThreshold = "apply_threshold"
FieldApplyThresholdStrategy = "apply_threshold_strategy"
Expand Down Expand Up @@ -156,7 +159,7 @@ It can be either:
Description: "Scaling policy name",
ValidateDiagFunc: validation.ToDiagFunc(validation.StringMatch(k8sNameRegex, "name must adhere to the format guidelines of Kubernetes labels/annotations")),
},
"apply_type": {
FieldApplyType: {
Type: schema.TypeString,
Required: true,
Description: `Recommendation apply type.
Expand Down Expand Up @@ -225,7 +228,7 @@ It can be either:
MaxItems: 1,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"apply_type": {
FieldApplyType: {
Type: schema.TypeString,
Optional: true,
Description: `Defines the apply type to be used when downscaling.
Expand All @@ -236,13 +239,16 @@ It can be either:
},
},
},
"memory_event": {
FieldMemoryEvent: {
Type: schema.TypeList,
Optional: true,
DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
return suppressApplyTypeDefaultValueDiff(FieldMemoryEvent, old, new, d)
},
MaxItems: 1,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"apply_type": {
FieldApplyType: {
Type: schema.TypeString,
Optional: true,
Description: `Defines the apply type to be used when applying recommendation for memory related event.
Expand Down Expand Up @@ -548,7 +554,7 @@ func resourceWorkloadScalingPolicyCreate(ctx context.Context, d *schema.Resource
clusterID := d.Get(FieldClusterID).(string)
req := sdk.WorkloadOptimizationAPICreateWorkloadScalingPolicyJSONRequestBody{
Name: d.Get("name").(string),
ApplyType: sdk.WorkloadoptimizationV1ApplyType(d.Get("apply_type").(string)),
ApplyType: sdk.WorkloadoptimizationV1ApplyType(d.Get(FieldApplyType).(string)),
RecommendationPolicies: sdk.WorkloadoptimizationV1RecommendationPolicies{
ManagementOption: sdk.WorkloadoptimizationV1ManagementOption(d.Get("management_option").(string)),
},
Expand Down Expand Up @@ -686,7 +692,7 @@ func fetchScalingPolicy(ctx context.Context, d *schema.ResourceData, meta any) (
if err := d.Set("name", sp.Name); err != nil {
return nil, fmt.Errorf("setting name: %w", err)
}
if err := d.Set("apply_type", sp.ApplyType); err != nil {
if err := d.Set(FieldApplyType, sp.ApplyType); err != nil {
return nil, fmt.Errorf("setting apply type: %w", err)
}
if err := d.Set("management_option", sp.RecommendationPolicies.ManagementOption); err != nil {
Expand Down Expand Up @@ -745,7 +751,7 @@ func resourceWorkloadScalingPolicyUpdate(ctx context.Context, d *schema.Resource
func updateScalingPolicy(ctx context.Context, d *schema.ResourceData, meta any) (sdk.Response, error) {
if !d.HasChanges(
"name",
"apply_type",
FieldApplyType,
"management_option",
"cpu",
"memory",
Expand Down Expand Up @@ -779,7 +785,7 @@ func updateScalingPolicy(ctx context.Context, d *schema.ResourceData, meta any)

req := sdk.WorkloadOptimizationAPIUpdateWorkloadScalingPolicyJSONRequestBody{
Name: d.Get("name").(string),
ApplyType: sdk.WorkloadoptimizationV1ApplyType(d.Get("apply_type").(string)),
ApplyType: sdk.WorkloadoptimizationV1ApplyType(d.Get(FieldApplyType).(string)),
AssignmentRules: ar,
RecommendationPolicies: sdk.WorkloadoptimizationV1RecommendationPolicies{
ManagementOption: sdk.WorkloadoptimizationV1ManagementOption(d.Get("management_option").(string)),
Expand Down Expand Up @@ -1015,9 +1021,8 @@ func mapApplyStrategyBasedOnPreviousConfig(
// we will supress diff.
func suppressThresholdStrategyDefaultValueDiff(resource, oldValue, newValue string, d *schema.ResourceData) bool {
resourcePath := fmt.Sprintf("%s.0", resource)
isApplyThresholdStrategyUnset := newValue == "0" || newValue == ""
isApplyThresholdUnset := d.Get(fmt.Sprintf("%s.%s", resourcePath, DeprecatedFieldApplyThreshold)) == 0.
if isApplyThresholdStrategyUnset && isApplyThresholdUnset {
if isEmpty(newValue) && isApplyThresholdUnset {
applyThresholdFromStrategy := d.Get(fmt.Sprintf("%s.%s.0.%s", resourcePath, FieldApplyThresholdStrategy, FieldApplyThresholdStrategyPercentage))
// Suppress diff if configuration saved from API equals to default
return applyThresholdFromStrategy == defaultApplyThresholdPercentage
Expand All @@ -1027,8 +1032,7 @@ func suppressThresholdStrategyDefaultValueDiff(resource, oldValue, newValue stri
}

func suppressConfidenceThresholdDefaultValueDiff(resource, oldValue, newValue string, d *schema.ResourceData) bool {
isConfidenceUnset := newValue == "0" || newValue == ""
if isConfidenceUnset {
if isEmpty(newValue) {
confidenceThreshold := d.Get(fmt.Sprintf("%s.0.%s", resource, FieldConfidenceThreshold))
// Suppress diff if configuration saved from API equals to default
return confidenceThreshold == defaultConfidenceThreshold
Expand All @@ -1037,6 +1041,20 @@ func suppressConfidenceThresholdDefaultValueDiff(resource, oldValue, newValue st
return oldValue == newValue
}

func suppressApplyTypeDefaultValueDiff(resource, oldValue, newValue string, d *schema.ResourceData) bool {
if isEmpty(newValue) {
applyType := d.Get(fmt.Sprintf("%s.0.%s", resource, FieldApplyType))
Copy link
Copy Markdown
Contributor

@UOndro UOndro Sep 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this will give you resource.apply_type, you probably want resource.memory_event.apply_type

Copy link
Copy Markdown
Contributor

@UOndro UOndro Sep 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see resource has different meaning here. I don't think you need to pass it, just use FieldMemoryEvent

The reason why it was use in other function is that parent field is dynamic it can be either memory or cpu, in your case is static

Copy link
Copy Markdown
Contributor Author

@maaarcelino maaarcelino Sep 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No because this translates into d.Get("memory_event.0.apply_type") of the scaling policy resource

// Suppress diff if apply type saved from API equals to default
return applyType == defaultApplyType
}

return oldValue == newValue
}

func isEmpty(value string) bool {
return value == "" || value == "0"
}

func toWorkloadResourceLimit(obj map[string]any) (*sdk.WorkloadoptimizationV1ResourceLimitStrategy, error) {
if len(obj) == 0 {
return nil, nil
Expand Down Expand Up @@ -1213,7 +1231,7 @@ func toDownscaling(downscaling map[string]any) *sdk.WorkloadoptimizationV1Downsc

result := &sdk.WorkloadoptimizationV1DownscalingSettings{}

if v, ok := downscaling["apply_type"].(string); ok && v != "" {
if v, ok := downscaling[FieldApplyType].(string); ok && v != "" {
result.ApplyType = lo.ToPtr(sdk.WorkloadoptimizationV1ApplyType(v))
}

Expand All @@ -1228,7 +1246,7 @@ func toDownscalingMap(s *sdk.WorkloadoptimizationV1DownscalingSettings) []map[st
m := map[string]any{}

if s.ApplyType != nil {
m["apply_type"] = string(*s.ApplyType)
m[FieldApplyType] = string(*s.ApplyType)
}

if len(m) == 0 {
Expand All @@ -1245,7 +1263,7 @@ func toMemoryEvent(memoryEvent map[string]any) *sdk.WorkloadoptimizationV1Memory

result := &sdk.WorkloadoptimizationV1MemoryEventSettings{}

if v, ok := memoryEvent["apply_type"].(string); ok && v != "" {
if v, ok := memoryEvent[FieldApplyType].(string); ok && v != "" {
result.ApplyType = lo.ToPtr(sdk.WorkloadoptimizationV1ApplyType(v))
}

Expand All @@ -1260,7 +1278,7 @@ func toMemoryEventMap(s *sdk.WorkloadoptimizationV1MemoryEventSettings) []map[st
m := map[string]any{}

if s.ApplyType != nil {
m["apply_type"] = string(*s.ApplyType)
m[FieldApplyType] = string(*s.ApplyType)
}

if len(m) == 0 {
Expand Down
82 changes: 74 additions & 8 deletions castai/sdk/api.gen.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading