Skip to content

Commit

Permalink
refactor: Replaced github.com/pkg/errors with errors (#460)
Browse files Browse the repository at this point in the history
  • Loading branch information
Fank committed Aug 21, 2022
1 parent e3f4abd commit c6e6022
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 13 deletions.
11 changes: 4 additions & 7 deletions error.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ import (
"fmt"
"io"
"strings"

"github.com/pkg/errors"
)

// Error message from Jira
Expand All @@ -21,27 +19,26 @@ type Error struct {
// NewJiraError creates a new jira Error
func NewJiraError(resp *Response, httpError error) error {
if resp == nil {
return errors.Wrap(httpError, "No response returned")
return fmt.Errorf("no response returned: %w", httpError)
}

defer resp.Body.Close()
body, err := io.ReadAll(resp.Body)
if err != nil {
return errors.Wrap(err, httpError.Error())
return fmt.Errorf("%s: %w", httpError.Error(), err)
}
jerr := Error{HTTPError: httpError}
contentType := resp.Header.Get("Content-Type")
if strings.HasPrefix(contentType, "application/json") {
err = json.Unmarshal(body, &jerr)
if err != nil {
httpError = errors.Wrap(errors.New("could not parse JSON"), httpError.Error())
return errors.Wrap(err, httpError.Error())
return fmt.Errorf("%s: could not parse JSON: %w", httpError.Error(), err)
}
} else {
if httpError == nil {
return fmt.Errorf("got response status %s:%s", resp.Status, string(body))
}
return errors.Wrap(httpError, fmt.Sprintf("%s: %s", resp.Status, string(body)))
return fmt.Errorf("%s: %s: %w", resp.Status, string(body), httpError)
}

return &jerr
Expand Down
1 change: 0 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ require (
github.com/golang-jwt/jwt/v4 v4.4.2
github.com/google/go-cmp v0.5.8
github.com/google/go-querystring v1.1.0
github.com/pkg/errors v0.9.1
github.com/trivago/tgo v1.0.7
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d
)
Expand Down
2 changes: 0 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/trivago/tgo v1.0.7 h1:uaWH/XIy9aWYWpjm2CU3RpcqZXmX2ysQ9/Go+d9gyrM=
github.com/trivago/tgo v1.0.7/go.mod h1:w4dpD+3tzNIIiIfkWWa85w5/B77tlvdZckQ+6PkFnhc=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
Expand Down
5 changes: 2 additions & 3 deletions jira.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import (

jwt "github.com/golang-jwt/jwt/v4"
"github.com/google/go-querystring/query"
"github.com/pkg/errors"
)

// httpClient defines an interface for an http.Client implementation so that alternative
Expand Down Expand Up @@ -483,7 +482,7 @@ func (t *CookieAuthTransport) RoundTrip(req *http.Request) (*http.Response, erro
if t.SessionObject == nil {
err := t.setSessionObject()
if err != nil {
return nil, errors.Wrap(err, "cookieauth: no session object has been set")
return nil, fmt.Errorf("cookieauth: no session object has been set: %w", err)
}
}

Expand Down Expand Up @@ -598,7 +597,7 @@ func (t *JWTAuthTransport) RoundTrip(req *http.Request) (*http.Response, error)

jwtStr, err := token.SignedString(t.Secret)
if err != nil {
return nil, errors.Wrap(err, "jwtAuth: error signing JWT")
return nil, fmt.Errorf("jwtAuth: error signing JWT: %w", err)
}

req2.Header.Set("Authorization", fmt.Sprintf("JWT %s", jwtStr))
Expand Down

0 comments on commit c6e6022

Please sign in to comment.