treewide: replace error comparisons and assertions with errors.Is
Change-Id: Id2424eb155f2c6842c72c5fafd124d428ef901f2
Reviewed-on: https://review.monogon.dev/c/monogon/+/2994
Tested-by: Jenkins CI
Reviewed-by: Serge Bazanski <serge@monogon.tech>
diff --git a/cloud/apigw/server/server.go b/cloud/apigw/server/server.go
index 98f3b92..902b4e0 100644
--- a/cloud/apigw/server/server.go
+++ b/cloud/apigw/server/server.go
@@ -2,6 +2,7 @@
import (
"context"
+ "errors"
"flag"
"net"
"net/http"
@@ -37,9 +38,9 @@
}
// Server runs the apigw server. It listens on two interfaces:
-// - Internal gRPC, which is authenticated using TLS and authorized by CA. This
-// is to be used for internal RPCs, eg. management/debug.
-// - Public gRPC-Web, which is currently unauthenticated.
+// - Internal gRPC, which is authenticated using TLS and authorized by CA. This
+// is to be used for internal RPCs, eg. management/debug.
+// - Public gRPC-Web, which is currently unauthenticated.
type Server struct {
Config Config
@@ -66,7 +67,7 @@
klog.Infof("Internal gRPC listening on %s", s.ListenGRPC)
go func() {
err := g.Serve(lis)
- if err != ctx.Err() {
+ if !errors.Is(err, ctx.Err()) {
klog.Exitf("Internal gRPC serve failed: %v", err)
}
}()
@@ -91,7 +92,7 @@
klog.Infof("Public API listening on %s", s.ListenPublic)
go func() {
err := server.Serve(lis)
- if err != ctx.Err() {
+ if !errors.Is(err, ctx.Err()) {
klog.Exitf("Public API serve failed: %v", err)
}
}()