Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 5 additions & 7 deletions internal/deployer/deployer.go
Original file line number Diff line number Diff line change
Expand Up @@ -388,22 +388,20 @@ func (d *Deployer) SetCombinedOverrideFile(overrideFile string) error {
func setOverrideSetExpressions(overrides map[string]interface{}, prefix string, overrideSetExpressions []string) ([]string, error) {
remainingSetExpressions := make([]string, 0)
for _, expr := range overrideSetExpressions {
// TODO(#91): would https://pkg.go.dev/strings#Cut work instead?
parts := splitAtFirstEquals(expr)
if len(parts) != 2 {
key, yamlValue, found := strings.Cut(expr, "=")
if !found {
return nil, fmt.Errorf("invalid override expression '%s': expected format 'key.path=value'", expr)
}
key := parts[0]
if prefix != "" {
if !strings.HasPrefix(parts[0], prefix) {
if !strings.HasPrefix(key, prefix) {
remainingSetExpressions = append(remainingSetExpressions, expr)
continue
}
key = strings.TrimPrefix(key, prefix+".")
}
var val interface{}
if err := yaml.Unmarshal([]byte(parts[1]), &val); err != nil {
return nil, fmt.Errorf("failed to unmarshal value '%s' for key '%s': %w", parts[1], key, err)
if err := yaml.Unmarshal([]byte(yamlValue), &val); err != nil {
return nil, fmt.Errorf("failed to unmarshal value '%s' for key '%s': %w", yamlValue, key, err)
}
if err := setNestedValue(overrides, key, val); err != nil {
return nil, fmt.Errorf("failed to set value for key '%s': %w", key, err)
Expand Down
10 changes: 0 additions & 10 deletions internal/deployer/override.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,6 @@ import (
"strings"
)

// splitAtFirstEquals splits a string at the first '=' character
// Returns [key, value] or just [expr] if no '=' found
func splitAtFirstEquals(expr string) []string {
idx := strings.Index(expr, "=")
if idx == -1 {
return []string{expr}
}
return []string{expr[:idx], expr[idx+1:]}
}

// setNestedValue sets a value at a nested path in a map
// The path is a dot-separated string like "foo.bar.baz"
// Creates intermediate maps as needed
Expand Down
Loading