Skip to content

Commit 45b5164

Browse files
committed
refactor: merging code for readability mv to private func
1 parent bab2548 commit 45b5164

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

kubectl-plugin/pkg/util/generation/generation.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,12 +449,20 @@ func ParseConfigFile(filePath string) (*RayClusterConfig, error) {
449449
if err := yaml.UnmarshalStrict(data, &overrideConfig); err != nil {
450450
return nil, fmt.Errorf("failed to parse YAML: %w", err)
451451
}
452+
config, err := mergeWithDefaultConfig(&overrideConfig)
453+
if err != nil {
454+
return nil, err
455+
}
456+
return config, nil
457+
}
458+
459+
func mergeWithDefaultConfig(overrideConfig *RayClusterConfig) (*RayClusterConfig, error) {
452460
// detach worker groups from default config
453461
overrideConfigWG := overrideConfig.WorkerGroups
454462
overrideConfig.WorkerGroups = nil
455463

456464
config := newRayClusterConfigWithDefaults()
457-
err = mergo.Merge(config, &overrideConfig, mergo.WithOverride)
465+
err := mergo.Merge(config, overrideConfig, mergo.WithOverride)
458466
if err != nil {
459467
return nil, fmt.Errorf("failed to merge config with defaults: %w", err)
460468
}

0 commit comments

Comments
 (0)