Merge pull request #1385 from ydb-platform/xerrors-join-skip-nil-err

Skipped nil errors in `xerrors.Join(errs)`

Author: asmyasnikov

internal/xerrors/join.go

@@ -3,12 +3,24 @@ package xerrors
 import (
 	"fmt"
 
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xslices"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xstring"
 )
 
-func Join(errs ...error) *joinError {
-	return &joinError{
-		errs: errs,
+func Join(errs ...error) error {
+	errs = xslices.Filter(errs, func(err error) bool {
+		return err != nil
+	})
+
+	switch len(errs) {
+	case 0:
+		return nil
+	case 1:
+		return errs[0]
+	default:
+		return &joinError{
+			errs: errs,
+		}
 	}
 }
 

internal/xerrors/join_test.go

@@ -10,35 +10,45 @@ import (
 
 func TestJoin(t *testing.T) {
 	for _, tt := range []struct {
-		err *joinError
-		iss []error
-		ass []interface{}
-		s   string
+		join error
+		iss  []error
+		ass  []interface{}
+		s    string
 	}{
 		{
-			err: Join(context.Canceled),
-			iss: []error{context.Canceled},
-			ass: nil,
-			s:   "[\"context canceled\"]",
+			join: Join(context.Canceled),
+			iss:  []error{context.Canceled},
+			ass:  nil,
+			s:    "context canceled",
 		},
 		{
-			err: Join(context.Canceled, context.DeadlineExceeded, Operation()),
-			iss: []error{context.Canceled, context.DeadlineExceeded},
+			join: Join(context.Canceled, context.DeadlineExceeded, Operation()),
+			iss:  []error{context.Canceled, context.DeadlineExceeded},
 			ass: []interface{}{func() interface{} {
 				var i isYdbError
 
 				return &i
 			}()},
 			s: "[\"context canceled\",\"context deadline exceeded\",\"operation/STATUS_CODE_UNSPECIFIED (code = 0)\"]",
 		},
+		{
+			join: Join(context.Canceled, context.DeadlineExceeded, nil),
+			iss:  []error{context.Canceled, context.DeadlineExceeded},
+			s:    "[\"context canceled\",\"context deadline exceeded\"]",
+		},
+		{
+			join: Join(nil, context.DeadlineExceeded, nil),
+			iss:  []error{context.DeadlineExceeded},
+			s:    "context deadline exceeded",
+		},
 	} {
 		t.Run("", func(t *testing.T) {
-			require.Equal(t, tt.s, tt.err.Error())
+			require.Equal(t, tt.s, tt.join.Error())
 			if len(tt.iss) > 0 {
-				require.True(t, Is(tt.err, tt.iss...))
+				require.True(t, Is(tt.join, tt.iss...))
 			}
 			if len(tt.ass) > 0 {
-				require.True(t, As(tt.err, tt.ass...))
+				require.True(t, As(tt.join, tt.ass...))
 			}
 		})
 	}
@@ -48,7 +58,7 @@ func TestUnwrapJoined(t *testing.T) {
 	err1 := context.Canceled
 	err2 := context.DeadlineExceeded
 
-	var joined error = Join(err1, err2)
+	joined := Join(err1, err2)
 
 	unwrappable := joined.(interface{ Unwrap() []error }) //nolint:errorlint
 	inners := unwrappable.Unwrap()