From bb2126b7c6eaf50f4937d421faef3ecc0f3a5306 Mon Sep 17 00:00:00 2001 From: David Fifield Date: Fri, 2 Aug 2024 04:05:54 +0000 Subject: [PATCH] Use %w, not %v, in fmt.Errorf, so errors can be unwrapped. https://go.dev/blog/go1.13-errors#wrapping-errors-with-w --- client/lib/rendezvous.go | 2 +- server/lib/http.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/lib/rendezvous.go b/client/lib/rendezvous.go index 1c5ebbd..91ba088 100644 --- a/client/lib/rendezvous.go +++ b/client/lib/rendezvous.go @@ -79,7 +79,7 @@ func newBrokerChannelFromConfig(config ClientConfig) (*BrokerChannel, error) { if config.UTLSClientID != "" { utlsClientHelloID, err := utlsutil.NameToUTLSID(config.UTLSClientID) if err != nil { - return nil, fmt.Errorf("unable to create broker channel: %v", err) + return nil, fmt.Errorf("unable to create broker channel: %w", err) } utlsConfig := &utls.Config{ RootCAs: certs.GetRootCAs(), diff --git a/server/lib/http.go b/server/lib/http.go index 1a765c2..403aeb1 100644 --- a/server/lib/http.go +++ b/server/lib/http.go @@ -147,7 +147,7 @@ func (handler *httpHandler) turbotunnelMode(conn net.Conn, addr net.Addr) error var clientID turbotunnel.ClientID _, err := io.ReadFull(conn, clientID[:]) if err != nil { - return fmt.Errorf("reading ClientID: %v", err) + return fmt.Errorf("reading ClientID: %w", err) } // Store a short-term mapping from the ClientID to the client IP