Skip to content

Fix displaying of errors in 'src batch validate' #620

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
merged 1 commit into from
Sep 20, 2021
Merged

Fix displaying of errors in 'src batch validate' #620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions cmd/src/batch_common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,8 +229,9 @@ func executeBatchSpec(ctx context.Context, opts executeBatchSpecOpts) (err error
opts.ui.ParsingBatchSpec()
batchSpec, rawSpec, err := parseBatchSpec(&opts.flags.file, svc)
if err != nil {
if merr, ok := err.(*multierror.Error); ok {
opts.ui.ParsingBatchSpecFailure(merr)
var multiErr *multierror.Error
if errors.As(err, &multiErr) {
opts.ui.ParsingBatchSpecFailure(multiErr)
return cmderrors.ExitCode(2, nil)
} else {
// This shouldn't happen; let's just punt and let the normal
Expand Down
5 changes: 3 additions & 2 deletions cmd/src/batch_exec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,9 @@ func executeBatchSpecInWorkspaces(ctx context.Context, opts executeBatchSpecOpts
opts.ui.ParsingBatchSpec()
batchSpec, err := svc.ParseBatchSpec([]byte(input.RawSpec))
if err != nil {
if merr, ok := err.(*multierror.Error); ok {
opts.ui.ParsingBatchSpecFailure(merr)
var multiErr *multierror.Error
if errors.As(err, &multiErr) {
opts.ui.ParsingBatchSpecFailure(multiErr)
return cmderrors.ExitCode(2, nil)
} else {
// This shouldn't happen; let's just punt and let the normal
Expand Down
6 changes: 4 additions & 2 deletions cmd/src/batch_validate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,19 @@ Examples:
return cmderrors.Usage("additional arguments not allowed")
}

out := output.NewOutput(flagSet.Output(), output.OutputOpts{Verbose: *verbose})
ui := &ui.TUI{Out: out}
svc := service.New(&service.Opts{
Client: cfg.apiClient(apiFlags, flagSet.Output()),
})

if err := svc.DetermineFeatureFlags(ctx); err != nil {
ui.ExecutionError(err)
return err
}

out := output.NewOutput(flagSet.Output(), output.OutputOpts{Verbose: *verbose})
if _, _, err := parseBatchSpec(fileFlag, svc); err != nil {
(&ui.TUI{Out: out}).ParsingBatchSpecFailure(err)
ui.ParsingBatchSpecFailure(err)
return err
}

Expand Down
11 changes: 7 additions & 4 deletions internal/batches/ui/tui.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,16 @@ func (ui *TUI) ParsingBatchSpecSuccess() {
}

func (ui *TUI) ParsingBatchSpecFailure(err error) {
if merr, ok := err.(*multierror.Error); ok {
block := ui.Out.Block(output.Line("\u274c", output.StyleWarning, "Batch spec failed validation."))
defer block.Close()
block := ui.Out.Block(output.Line("\u274c", output.StyleWarning, "Batch spec failed validation."))
defer block.Close()

for i, err := range merr.Errors {
var multiErr *multierror.Error
if errors.As(err, &multiErr) {
for i, err := range multiErr.Errors {
block.Writef("%d. %s", i+1, err)
}
} else {
block.Writef("1. %s", err)
}
}

Expand Down