From 2fa1fc1420825874eb00c000983237b1a09c9b98 Mon Sep 17 00:00:00 2001 From: Yifeng Wu Date: Wed, 13 Sep 2023 14:37:51 -0700 Subject: [PATCH] use %w in fmt.Errorf() --- trino/trino.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/trino/trino.go b/trino/trino.go index 454807b..4f3ae31 100644 --- a/trino/trino.go +++ b/trino/trino.go @@ -278,7 +278,7 @@ var ( func newConn(dsn string) (*Conn, error) { serverURL, err := url.Parse(dsn) if err != nil { - return nil, fmt.Errorf("trino: malformed dsn: %v", err) + return nil, fmt.Errorf("trino: malformed dsn: %w", err) } query := serverURL.Query() @@ -290,13 +290,13 @@ func newConn(dsn string) (*Conn, error) { if kerberosEnabled { kt, err := keytab.Load(query.Get(kerberosKeytabPathConfig)) if err != nil { - return nil, fmt.Errorf("trino: Error loading Keytab: %v", err) + return nil, fmt.Errorf("trino: Error loading Keytab: %w", err) } kerberosClient = client.NewClientWithKeytab(query.Get(kerberosPrincipalConfig), query.Get(kerberosRealmConfig), kt) conf, err := config.Load(query.Get(kerberosConfigPathConfig)) if err != nil { - return nil, fmt.Errorf("trino: Error loading krb config: %v", err) + return nil, fmt.Errorf("trino: Error loading krb config: %w", err) } kerberosClient.WithConfig(conf) @@ -320,7 +320,7 @@ func newConn(dsn string) (*Conn, error) { if certPath := query.Get(SSLCertPathConfig); certPath != "" { cert, err = ioutil.ReadFile(certPath) if err != nil { - return nil, fmt.Errorf("trino: Error loading SSL Cert File: %v", err) + return nil, fmt.Errorf("trino: Error loading SSL Cert File: %w", err) } } @@ -451,13 +451,13 @@ func (c *Conn) Close() error { func (c *Conn) newRequest(method, url string, body io.Reader, hs http.Header) (*http.Request, error) { req, err := http.NewRequest(method, url, body) if err != nil { - return nil, fmt.Errorf("trino: %v", err) + return nil, fmt.Errorf("trino: %w", err) } if c.kerberosEnabled { err = c.kerberosClient.SetSPNEGOHeader(req, "trino/"+req.URL.Hostname()) if err != nil { - return nil, fmt.Errorf("error setting client SPNEGO header: %v", err) + return nil, fmt.Errorf("error setting client SPNEGO header: %w", err) } } @@ -831,7 +831,7 @@ func (st *driverStmt) exec(ctx context.Context, args []driver.NamedValue) (*stmt d.UseNumber() err = d.Decode(&sr) if err != nil { - return nil, fmt.Errorf("trino: %v", err) + return nil, fmt.Errorf("trino: %w", err) } st.doneCh = make(chan struct{}) @@ -886,7 +886,7 @@ func (st *driverStmt) exec(ctx context.Context, args []driver.NamedValue) (*stmt d.UseNumber() err = d.Decode(&qresp) if err != nil { - st.errors <- fmt.Errorf("trino: %v", err) + st.errors <- fmt.Errorf("trino: %w", err) return } err = resp.Body.Close()