Skip to content
Open
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
24 changes: 18 additions & 6 deletions pkg/kbagent/service/action_utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -110,17 +110,29 @@ func blockingCallAction(ctx context.Context, action *kbaproto.Action, parameters
err = result.err
if err != nil {
var exitErr *exec.ExitError
if errors.As(err, &exitErr) {
stderrMsg := result.stderr.String()

switch {
case errors.As(err, &exitErr):
errMsg := fmt.Sprintf("exit code: %d", exitErr.ExitCode())
if stderrMsg := result.stderr.String(); len(stderrMsg) > 0 {
if len(stderrMsg) > 0 {
errMsg += fmt.Sprintf(", stderr: %s", stderrMsg)
}
return nil, errors.Wrapf(kbaproto.ErrFailed, "%s", errMsg)
case errors.Is(err, kbaproto.ErrTimedOut):
var errMsg string
if stdoutMsg := result.stdout.String(); len(stdoutMsg) > 0 {
errMsg = fmt.Sprintf("stdout: %s", stdoutMsg)
}
if len(stderrMsg) > 0 {
errMsg += fmt.Sprintf(", stderr: %s", stderrMsg)
}
return nil, errors.Wrapf(kbaproto.ErrTimedOut, "%s", errMsg)
case len(stderrMsg) > 0:
return nil, errors.Wrapf(err, "%s", stderrMsg)
default:
return nil, err
}
if errMsg := result.stderr.String(); len(errMsg) > 0 {
return nil, errors.Wrapf(err, "%s", errMsg)
}
return nil, err
}
return result.stdout.Bytes(), nil
}
Expand Down