util: errwrap: Add a function for joining

This is like the Append function but for a list.
This commit is contained in:
James Shubin
2025-07-16 23:32:37 -04:00
parent 71e4282d3f
commit 299b49bb17
2 changed files with 101 additions and 0 deletions

View File

@@ -57,6 +57,21 @@ func Append(reterr, err error) error {
return multierror.Append(reterr, err) return multierror.Append(reterr, err)
} }
// Join takes a list of errors and combines them into a multierror with Append.
func Join(errs []error) error {
if len(errs) == 0 {
return nil
}
if len(errs) == 1 {
return errs[0]
}
var reterr error
for _, e := range errs {
reterr = Append(reterr, e)
}
return reterr
}
// String returns a string representation of the error. In particular, if the // String returns a string representation of the error. In particular, if the
// error is nil, it returns an empty string instead of panicking. // error is nil, it returns an empty string instead of panicking.
func String(err error) string { func String(err error) string {

View File

@@ -77,6 +77,92 @@ func TestAppendErr3(t *testing.T) {
} }
} }
func TestJoinErr1(t *testing.T) {
if reterr := Join(nil); reterr != nil {
t.Errorf("expected nil result")
}
}
func TestJoinErr2(t *testing.T) {
if reterr := Join([]error{}); reterr != nil {
t.Errorf("expected nil result")
}
}
func TestJoinErr3(t *testing.T) {
err := fmt.Errorf("err")
if reterr := Join([]error{err}); reterr != err {
t.Errorf("expected err")
}
}
func TestJoinErr4(t *testing.T) {
err := fmt.Errorf("err")
if reterr := Join([]error{err, nil}); reterr != err {
t.Errorf("expected err")
}
}
func TestJoinErr5(t *testing.T) {
err := fmt.Errorf("err")
if reterr := Join([]error{nil, err}); reterr != err {
t.Errorf("expected err")
}
}
func TestJoinErr6(t *testing.T) {
err1 := fmt.Errorf("err1")
err2 := fmt.Errorf("err2")
if reterr := Join([]error{err1, err2}); reterr.Error() != Append(err1, err2).Error() {
t.Errorf("expected err")
}
}
func TestJoinErr7(t *testing.T) {
err1 := fmt.Errorf("err1")
err2 := fmt.Errorf("err2")
err3 := fmt.Errorf("err3")
if reterr := Join([]error{err1, err2, err3}); reterr.Error() != Append(err1, Append(err2, err3)).Error() {
t.Errorf("expected err")
}
if reterr := Join([]error{err1, err2, err3}); reterr.Error() != Append(Append(err1, err2), err3).Error() {
t.Errorf("expected err")
}
}
func TestJoinErr8(t *testing.T) {
err1 := fmt.Errorf("err1")
var err2 error // nil
err3 := fmt.Errorf("err3")
if reterr := Join([]error{err1, err2, err3}); reterr.Error() != Append(err1, Append(err2, err3)).Error() {
t.Errorf("expected err")
}
if reterr := Join([]error{err1, err2, err3}); reterr.Error() != Append(Append(err1, err2), err3).Error() {
t.Errorf("expected err")
}
}
func TestJoinErr9(t *testing.T) {
var err1 error // nil
var err2 error // nil
err3 := fmt.Errorf("err3")
if reterr := Join([]error{err1, err2, err3}); reterr.Error() != Append(err1, Append(err2, err3)).Error() {
t.Errorf("expected err")
}
if reterr := Join([]error{err1, err2, err3}); reterr.Error() != Append(Append(err1, err2), err3).Error() {
t.Errorf("expected err")
}
}
func TestJoinErr10(t *testing.T) {
var err1 error // nil
var err2 error // nil
var err3 error // nil
if reterr := Join([]error{err1, err2, err3}); reterr != nil {
t.Errorf("expected nil result")
}
}
func TestString1(t *testing.T) { func TestString1(t *testing.T) {
var err error var err error
if String(err) != "" { if String(err) != "" {