Skip to content

Commit

Permalink
fix: check for OK response + don't create empty labels selector objec…
Browse files Browse the repository at this point in the history
…t when empty when upserting Advanced Config (#299)

* fix: check for OK response when upserting Advanced Config

* fix: don't create empty labels selector object when empty

* fixup! fix: check for OK response when upserting Advanced Config
  • Loading branch information
jansyk13 authored Apr 22, 2024
1 parent ecf6f19 commit b4afda9
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 18 deletions.
8 changes: 6 additions & 2 deletions castai/resource_eviction_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -214,9 +214,9 @@ func upsertEvictionConfigs(ctx context.Context, data *schema.ResourceData, meta
"application/json",
bytes.NewReader(evictorAdvancedConfigJson),
)
if err != nil || resp.JSON200 == nil {
if checkErr := sdk.CheckOKResponse(resp, err); checkErr != nil {
log.Printf("[ERROR] Failed to upsert evictor advanced config: %v", err)
return err
return checkErr
}
err = data.Set(FieldEvictorAdvancedConfig, flattenEvictionConfig(resp.JSON200.EvictionConfig))
if err != nil {
Expand Down Expand Up @@ -421,6 +421,10 @@ func toPodSelector(in interface{}) (*sdk.CastaiEvictorV1PodSelector, error) {
return nil, err
}

if mls == nil || len(mls.AdditionalProperties) == 0 {
continue
}

if out.LabelSelector == nil {
out.LabelSelector = &sdk.CastaiEvictorV1LabelSelector{}
}
Expand Down
2 changes: 1 addition & 1 deletion castai/resource_rebalancing_job.go
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ func getRebalancingJobByScheduleName(ctx context.Context, client *sdk.ClientWith
return nil, fmt.Errorf("getting schedule: %w", err)
}

resp, err := client.ScheduledRebalancingAPIListRebalancingJobsWithResponse(ctx, clusterID)
resp, err := client.ScheduledRebalancingAPIListRebalancingJobsWithResponse(ctx, clusterID, &sdk.ScheduledRebalancingAPIListRebalancingJobsParams{})
if checkErr := sdk.CheckOKResponse(resp, err); checkErr != nil {
return nil, checkErr
}
Expand Down
5 changes: 5 additions & 0 deletions castai/sdk/api.gen.go

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

34 changes: 27 additions & 7 deletions castai/sdk/client.gen.go

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

16 changes: 8 additions & 8 deletions castai/sdk/mock/client.go

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

0 comments on commit b4afda9

Please sign in to comment.