From c6e60229db4d4f9bccc0aca9e36d1f21e38235fa Mon Sep 17 00:00:00 2001
From: Florian Kinder <florian.kinder@fankserver.com>
Date: Sun, 21 Aug 2022 18:07:23 +0200
Subject: [PATCH] refactor: Replaced github.com/pkg/errors with errors (#460)

---
 error.go | 11 ++++-------
 go.mod   |  1 -
 go.sum   |  2 --
 jira.go  |  5 ++---
 4 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/error.go b/error.go
index c0496422..f4cf3de5 100644
--- a/error.go
+++ b/error.go
@@ -6,8 +6,6 @@ import (
 	"fmt"
 	"io"
 	"strings"
-
-	"github.com/pkg/errors"
 )
 
 // Error message from Jira
@@ -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
diff --git a/go.mod b/go.mod
index 0a13bf00..e5ebce3d 100644
--- a/go.mod
+++ b/go.mod
@@ -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
 )
diff --git a/go.sum b/go.sum
index 10f2c320..7f282ab5 100644
--- a/go.sum
+++ b/go.sum
@@ -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=
diff --git a/jira.go b/jira.go
index c86a3088..28e0cccc 100644
--- a/jira.go
+++ b/jira.go
@@ -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
@@ -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)
 		}
 	}
 
@@ -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))