Merge pull request #5 from fastbill/go-update

update Go, linter, deps and remove errors pkg

Author: junedev

.travis.yml

@@ -1,11 +1,11 @@
 language: go
 
 go:
-  - 1.13.x
+  - 1.15.x
 
 install:
   - go mod vendor
-  - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s v1.19.1
+  - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.33.0
 
 script:
   - go test -race -cover ./...

go.mod

@@ -1,10 +1,9 @@
 module github.com/fastbill/go-request/v2
 
-go 1.13
+go 1.15
 
 require (
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/fastbill/go-httperrors/v2 v2.0.0
-	github.com/pkg/errors v0.8.1
-	github.com/stretchr/testify v1.3.0
+	github.com/fastbill/go-httperrors/v2 v2.0.1
+	github.com/stretchr/testify v1.6.1
+	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
 )

go.sum

@@ -1,14 +1,18 @@
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/fastbill/go-httperrors/v2 v2.0.0 h1:kjfmGJkl2JFMXwxBrkWbldB1ctFIPISHTGBTaTBL/V0=
-github.com/fastbill/go-httperrors/v2 v2.0.0/go.mod h1:0Jg7Xs67H09XjGpyQndBYTaOTGfyALE0YNVBgW7iy+8=
-github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/fastbill/go-httperrors/v2 v2.0.1 h1:xNGkGjEEH6TVNvsilVwAaztElS3p6bpH05HyyIzZe1g=
+github.com/fastbill/go-httperrors/v2 v2.0.1/go.mod h1:euMbEiWfbXkgQUp4wunua3Aj8bvNuSS7e1LxtzRKZSA=
 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/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.1.4/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ=
+gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

request.go

@@ -10,7 +10,6 @@ import (
 	"time"
 
 	"github.com/fastbill/go-httperrors/v2"
-	"github.com/pkg/errors"
 )
 
 // cachedClient is the global client instance.
@@ -55,13 +54,13 @@ type Params struct {
 func Do(params Params, responseBody interface{}) (returnErr error) {
 	req, err := createRequest(params)
 	if err != nil {
-		return err
+		return fmt.Errorf("failed to create request: %w", err)
 	}
 
 	client := selectClient(params.Timeout)
 	res, err := client.Do(req)
 	if err != nil {
-		return errors.Wrap(err, "failed to send request")
+		return fmt.Errorf("failed to send request: %w", err)
 	}
 
 	defer func() {
@@ -93,7 +92,7 @@ func DoWithStringResponse(params Params) (result string, returnErr error) {
 	client := selectClient(params.Timeout)
 	res, err := client.Do(req)
 	if err != nil {
-		return "", errors.Wrap(err, "failed to send request")
+		return "", fmt.Errorf("failed to send request: %w", err)
 	}
 
 	defer func() {
@@ -123,7 +122,7 @@ func createRequest(params Params) (*http.Request, error) {
 
 	req, err := http.NewRequest(params.Method, params.URL, reader)
 	if err != nil {
-		return nil, errors.Wrap(err, "failed to create request")
+		return nil, fmt.Errorf("failed to create request: %w", err)
 	}
 	req.Header.Set("Accept", "application/json")
 	req.Header.Set("Content-Type", "application/json")
@@ -165,7 +164,7 @@ func convertToReader(body interface{}) (io.Reader, error) {
 	buffer := &bytes.Buffer{}
 	err := json.NewEncoder(buffer).Encode(body)
 	if err != nil {
-		return nil, errors.Wrap(err, "failed to parse request body to json")
+		return nil, fmt.Errorf("failed to parse request body to json: %w", err)
 	}
 
 	return buffer, nil

request_test.go

@@ -154,7 +154,7 @@ func TestDoSuccessful(t *testing.T) {
 
 		err := Do(params, nil)
 		if assert.Error(t, err) {
-			assert.Contains(t, err.Error(), "request canceled")
+			assert.Contains(t, err.Error(), "Client.Timeout exceeded")
 		}
 	})