Skip to content

Commit

Permalink
minor: remove use of github.com/pkg/errors
Browse files Browse the repository at this point in the history
  • Loading branch information
jpts committed Jun 22, 2023
1 parent 6a3ed7b commit 31451d7
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
8 changes: 4 additions & 4 deletions cmd/websocket.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package cmd
import (
"bytes"
"encoding/json"
"errors"
"fmt"
"io"
"io/ioutil"
Expand All @@ -13,7 +14,6 @@ import (

"github.com/gorilla/websocket"
"github.com/moby/term"
"github.com/pkg/errors"
"k8s.io/klog/v2"
)

Expand All @@ -38,13 +38,13 @@ func (d *WebsocketRoundTripper) RoundTrip(r *http.Request) (*http.Response, erro
var msg ApiServerError
jerr := json.NewDecoder(resp.Body).Decode(&msg)
if jerr != nil {
return nil, errors.Wrap(err, "Error from server, unable to decode response")
return nil, fmt.Errorf("Error from server, unable to decode response: %w", err)
}
return nil, fmt.Errorf("Error from server (%s): %s", msg.Reason, msg.Message)
} else {
body, ioerr := ioutil.ReadAll(resp.Body)
if ioerr != nil {
return nil, errors.Wrap(err, "Server Error, unable to read body")
return nil, fmt.Errorf("Server Error, unable to read body: %w", err)
}
resp.Body.Close()

Expand Down Expand Up @@ -208,7 +208,7 @@ func parseStreamErr(buf []byte) error {
var msg streamError
jerr := json.Unmarshal(buf, &msg)
if jerr != nil {
return errors.Wrap(jerr, "Error from server, unable to decode response")
return fmt.Errorf("Error from server, unable to decode response: %w", jerr)
}

if msg.Status == "Success" {
Expand Down
1 change: 0 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ go 1.18
require (
github.com/gorilla/websocket v1.5.0
github.com/moby/term v0.5.0
github.com/pkg/errors v0.9.1
github.com/spf13/cobra v1.7.0
k8s.io/api v0.26.4
k8s.io/apimachinery v0.26.4
Expand Down
2 changes: 0 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,6 @@ github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWb
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
github.com/onsi/ginkgo/v2 v2.4.0 h1:+Ig9nvqgS5OBSACXNk15PLdp0U9XPYROt9CFzVdFGIs=
github.com/onsi/gomega v1.23.0 h1:/oxKu9c2HVap+F3PfKort2Hw5DEU+HGlW8n+tguWsys=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
Expand Down

0 comments on commit 31451d7

Please sign in to comment.