Merge pull request weaveworks#292 from weaveworks/grpc-is-canceled

bboreham · web-flow · commit 22cda1cdbe0a · 2023-07-13T12:03:58.000+01:00
grpc: use errors.Is to check if error is Canceled
diff --git a/grpc/cancel.go b/grpc/cancel.go
@@ -2,14 +2,15 @@ package grpc
 
 import (
 	"context"
+	"errors"
 
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 )
 
 // IsCanceled checks whether an error comes from an operation being canceled
 func IsCanceled(err error) bool {
-	if err == context.Canceled {
+	if errors.Is(err, context.Canceled) {
 		return true
 	}
 	s, ok := status.FromError(err)

Original file line number	Diff line number	Diff line change
`@@ -2,14 +2,15 @@ package grpc`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"context"`
	`5`	`+ "errors"`
`5`	`6`
`6`	`7`	`"google.golang.org/grpc/codes"`
`7`	`8`	`"google.golang.org/grpc/status"`
`8`	`9`	`)`
`9`	`10`
`10`	`11`	`// IsCanceled checks whether an error comes from an operation being canceled`
`11`	`12`	`func IsCanceled(err error) bool {`
`12`		`- if err == context.Canceled {`
	`13`	`+ if errors.Is(err, context.Canceled) {`
`13`	`14`	`return true`
`14`	`15`	`}`
`15`	`16`	`s, ok := status.FromError(err)`