Simplify wrapError

bitrise-io · May 15, 2024 · ba15e33 · ba15e33
1 parent d60e4f9
commit ba15e33
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/command/command.go b/command/command.go
@@ -168,14 +168,14 @@ func printableCommandArgs(isQuoteFirst bool, fullCommandArgs []string) string {
 func (c command) wrapError(err error) error {
 	var exitErr *exec.ExitError
 	if errors.As(err, &exitErr) {
-		if c.errorCollector != nil && len(c.errorCollector.errorLines) > 0 {
-			reason := fmt.Errorf("command failed with exit status %d (%s): %w", exitErr.ExitCode(), c.PrintableCommandArgs(), errors.New(strings.Join(c.errorCollector.errorLines, "\n")))
-			return NewExitStatusError(reason, exitErr)
+		errorLines := []string{}
+		if c.errorCollector != nil {
+			errorLines = c.errorCollector.errorLines
 		}
 
-		reason := fmt.Errorf("command failed with exit status %d (%s): %w", exitErr.ExitCode(), c.PrintableCommandArgs(), errors.New("check the command's output for details"))
-		return NewExitStatusError(reason, exitErr)
+		return NewExitStatusError(c.PrintableCommandArgs(), exitErr, errorLines)
 	}
+
 	return fmt.Errorf("executing command failed (%s): %w", c.PrintableCommandArgs(), err)
 }
 

diff --git a/command/errors.go b/command/errors.go
@@ -1,6 +1,11 @@
 package command
 
-import "os/exec"
+import (
+	"errors"
+	"fmt"
+	"os/exec"
+	"strings"
+)
 
 // ExitStatusError ...
 type ExitStatusError struct {
@@ -9,12 +14,15 @@ type ExitStatusError struct {
 }
 
 // NewExitStatusError ...
-func NewExitStatusError(reasonErr error, originalExitErr *exec.ExitError) error {
-	if reasonErr.Error() == "" {
-		panic("reason must not be empty")
+func NewExitStatusError(printableCmdArgs string, exitErr *exec.ExitError, errorLines []string) error {
+	reasonMsg := fmt.Sprintf("command failed with exit status %d (%s)", exitErr.ExitCode(), printableCmdArgs)
+	if len(errorLines) == 0 {
+		reasonErr := fmt.Errorf("%s: %w", reasonMsg, errors.New("check the command's output for details"))
+		return &ExitStatusError{readableReason: reasonErr, originalCommandErr: exitErr}
 	}
 
-	return &ExitStatusError{readableReason: reasonErr, originalCommandErr: originalExitErr}
+	reasonErr := fmt.Errorf("%s: %w", reasonMsg, errors.New(strings.Join(errorLines, "\n")))
+	return &ExitStatusError{readableReason: reasonErr, originalCommandErr: exitErr}
 }
 
 // Error returns the formatted error message. Does not include the original error message (`exit status 1`).