Skip to content

Commit bac7b49

Browse files
authored
Improve error when target override fails (#2760)
## Changes Add prefixes with context for errors in target override. ## Why Saw an error that looks like ``` Error: invalid path '.' ``` The error was caused by some other breaking changes, so I don't have a test, but still, if users ever see that it's not very helpful (e.g. path does not refer to file system but it is related to dyn.Value). ## Tests Existing tests.
1 parent d46edf0 commit bac7b49

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

acceptance/bundle/variables/env_overrides/output.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Found 1 error
2222
Exit code: 1
2323

2424
>>> errcode [CLI] bundle validate -t env-using-an-undefined-variable
25-
Error: variable c is not defined but is assigned a value
25+
Error: failed to perform target override for target=env-using-an-undefined-variable: variable c is not defined but is assigned a value
2626

2727
Name: test bundle
2828

bundle/config/mutator/select_target.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func (m *selectTarget) Apply(_ context.Context, b *bundle.Bundle) diag.Diagnosti
4040
// Merge specified target into root configuration structure.
4141
err := b.Config.MergeTargetOverrides(m.name)
4242
if err != nil {
43-
return diag.FromErr(err)
43+
return diag.FromErr(fmt.Errorf("failed to perform target override for target=%s: %w", m.name, err))
4444
}
4545

4646
// Store specified target in configuration for reference.

bundle/config/root.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ func (r *Root) MergeTargetOverrides(name string) error {
320320
"presets",
321321
} {
322322
if root, err = mergeField(root, target, f); err != nil {
323-
return err
323+
return fmt.Errorf("failed to merge target=%s field=%s: %w", name, f, err)
324324
}
325325
}
326326

0 commit comments

Comments
 (0)