beckermj/vaguerent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix nil dereference bug in new error handling logic

Browse Source 
Found this while running `./vagrant box` with no args to get the help
output. It turns out you can have an empty RunResult but also a nil
error. I took the occasion to unwind the conditional tree a bit which
hopefully makes it a bit easier to read.
This commit is contained in:
Paul Hinze 2022-03-30 15:24:43 -05:00
parent 1341bfe0af
commit 73a1be95fe
No known key found for this signature in database
GPG Key ID: B69DEDF2D55501C0
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
internal/cli/dynamic.go
View File

@ -95,10 +95,9 @@ func (c *DynamicCommand) Run(args []string) int {
modifier,
)
if err != nil {
cl.UI().Output("Running of task "+c.name+" failed unexpectedly\n", terminal.WithErrorStyle())
cl.UI().Output("Error: "+err.Error(), terminal.WithErrorStyle())
} else if !r.RunResult {
// If nothing failed but we didn't get a Result back, something may
// have gone wrong on the far side so we need to interpret the error.
if err == nil && !r.RunResult {
runErrorStatus := status.FromProto(r.RunError)
details := runErrorStatus.Details()
userError := false
@ -112,16 +111,21 @@ func (c *DynamicCommand) Run(args []string) int {
// All user-facing errors from Ruby use a 1 exit code. See
// Vagrant::Errors::VagrantError.
r.ExitCode = 1
}
}
// If there wasn't a user-facing error, just assign the returned
// error (if any) from the response and assign that back out so it
// can be displayed as an unexpected error.
if !userError {
runErr := status.FromProto(r.RunError)
err = runErr.Err()
cl.UI().Output("Unexpected Error: "+err.Error()+"\n", terminal.WithErrorStyle())
err = runErrorStatus.Err()
}
}
if err != nil {
cl.UI().Output("Running of task "+c.name+" failed unexpectedly\n", terminal.WithErrorStyle())
cl.UI().Output("Error: "+err.Error(), terminal.WithErrorStyle())
}
c.Log.Debug("result from operation", "task", c.name, "result", r)
return err