Use errors.Is() (#3541)

Author: tchssk

grpc/middleware/xray/middleware.go

@@ -2,6 +2,7 @@ package xray
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"io"
 	"net"
@@ -232,7 +233,7 @@ func (c *xrayStreamClientWrapper) recordErrorAndClose(err error) {
 	defer c.mu.Unlock()
 	if !c.finished {
 		// io.EOF is normal grpc stream close, not error.
-		if err == io.EOF {
+		if errors.Is(err, io.EOF) {
 			c.s.RecordResponse(nil)
 		} else {
 			c.s.RecordError(err)

grpc/middleware/xray/middleware_test.go

@@ -4,6 +4,7 @@ package xray
 
 import (
 	"context"
+	"errors"
 	"io"
 	"net"
 	"testing"
@@ -551,7 +552,7 @@ func TestStreamClient(t *testing.T) {
 				if err == nil {
 					var msg any
 					err2 := cs.RecvMsg(msg)
-					closed := err2 == io.EOF
+					closed := errors.Is(err2, io.EOF)
 					if tc.StreamClosed != closed {
 						t.Errorf("expected stream closed to be %v, got %v", tc.StreamClosed, closed)
 					}

middleware/xray/xray_test.go

@@ -42,7 +42,7 @@ func TestConnect(t *testing.T) {
 		_, err := Connect(context.Background(), time.Millisecond, func() (net.Conn, error) {
 			return nil, dialErr
 		})
-		if err != dialErr {
+		if !errors.Is(err, dialErr) {
 			t.Fatalf("Unexpected err, got %q, expected %q", err, dialErr)
 		}
 	})

pkg/validation_test.go

@@ -96,7 +96,7 @@ func TestValidateFormat(t *testing.T) {
 
 	for k, tc := range cases {
 		actual := ValidateFormat(tc.name, tc.val, tc.format)
-		if actual != tc.expected {
+		if !errors.Is(actual, tc.expected) {
 			// Compare only the messages because the error has always a new error ID.
 			if actual == nil || tc.expected == nil || actual.Error() != tc.expected.Error() {
 				t.Errorf("%s: got %#v, expected %#v", k, actual, tc.expected)
@@ -124,7 +124,7 @@ func TestValidatePattern(t *testing.T) {
 
 	for k, tc := range cases {
 		actual := ValidatePattern(tc.name, tc.val, tc.pattern)
-		if actual != tc.expected {
+		if !errors.Is(actual, tc.expected) {
 			// Compare only the messages because the error has always a new error ID.
 			if actual.Error() != tc.expected.Error() {
 				t.Errorf("%s: got %#v, expected %#v", k, actual, tc.expected)