chore(ci): buildtools update addon command fails (#3102)

emosbaugh · web-flow · commit 0d70c075f816 · 2025-10-23T17:26:34.000Z
diff --git a/pkg/helpers/command.go b/pkg/helpers/command.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"io"
 	"os/exec"
+	"strings"
 
 	"github.com/sirupsen/logrus"
 )
@@ -53,8 +54,8 @@ func (h *Helpers) RunCommandWithOptions(opts RunCommandOptions, bin string, args
 		if ctx.Err() != nil {
 			return ctx.Err()
 		}
-		if stderr.String() != "" {
-			return fmt.Errorf("%w: %s", err, stderr.String())
+		if errStr := strings.TrimSpace(stderr.String()); errStr != "" {
+			return fmt.Errorf("%w: %s", err, errStr)
 		}
 		return err
 	}

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ import (`
`6`	`6`	`"fmt"`
`7`	`7`	`"io"`
`8`	`8`	`"os/exec"`
	`9`	`+ "strings"`
`9`	`10`
`10`	`11`	`"github.com/sirupsen/logrus"`
`11`	`12`	`)`
`@@ -53,8 +54,8 @@ func (h *Helpers) RunCommandWithOptions(opts RunCommandOptions, bin string, args`
`53`	`54`	`if ctx.Err() != nil {`
`54`	`55`	`return ctx.Err()`
`55`	`56`	`}`
`56`		`- if stderr.String() != "" {`
`57`		`- return fmt.Errorf("%w: %s", err, stderr.String())`
	`57`	`+ if errStr := strings.TrimSpace(stderr.String()); errStr != "" {`
	`58`	`+ return fmt.Errorf("%w: %s", err, errStr)`
`58`	`59`	`}`
`59`	`60`	`return err`
`60`	`61`	`}`