Merge 173e9ba38f23b77e8205e67bdc89010d4923f814 into b7c059886c0898436db90b4615a27cfb4d93ce34

internal/multierror/multierror.go

@@ -31,9 +31,6 @@ type joinError struct {
 }
 
 func (e *joinError) Error() string {
-	if len(e.errs) == 1 {
-		return strings.TrimSpace(e.errs[0].Error())
-	}
 	stringErrs := make([]string, 0, len(e.errs))
 	for _, subErr := range e.errs {
 		stringErrs = append(stringErrs, strings.Replace(subErr.Error(), "\n", "\n\t", -1))

internal/multierror/multierror_test.go

@@ -10,10 +10,12 @@ import (
 
 func TestErrorJoin(t *testing.T) {
 	t.Run("single", func(t *testing.T) {
-		err := Join(fmt.Errorf("invalid config: %w", Join(errors.New("foo"))))
-		const expected = `invalid config: foo`
+		err := fmt.Errorf("invalid config:\n%w", Join(errors.New("foo")))
+		const expected = `invalid config:
+* foo`
 		assert.Equal(t, err.Error(), expected)
 	})
+
 	t.Run("multiple", func(t *testing.T) {
 		err := Join(errors.New("foobar"), fmt.Errorf("invalid config: \n%w", Join(errors.New("foo"), errors.New("bar"))))
 		const expected = `* foobar