Tidy up dependencies, deprecations

bulk/bulk.go

@@ -2,9 +2,10 @@ package bulk
 
 import (
 	"context"
+	"errors"
+	"fmt"
 
 	"github.com/namely/go-sfdc/v3/session"
-	"github.com/pkg/errors"
 )
 
 type BulkEndpoint string
@@ -29,7 +30,7 @@ func NewResource(ctx context.Context, endpoint BulkEndpoint, session session.Ser
 
 	err := session.Refresh(ctx)
 	if err != nil {
-		return nil, errors.Wrap(err, "session refresh")
+		return nil, fmt.Errorf("session refresh: %w", err)
 	}
 
 	return &Resource{

bulk/v1/batch_test.go

@@ -2,7 +2,7 @@ package bulkv1
 
 import (
 	"context"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"strings"
 	"testing"
@@ -47,7 +47,7 @@ func TestBatch_response(t *testing.T) {
 							return &http.Response{
 								StatusCode: http.StatusOK,
 								Status:     "OK",
-								Body:       ioutil.NopCloser(strings.NewReader(resp)),
+								Body:       io.NopCloser(strings.NewReader(resp)),
 								Header:     make(http.Header),
 							}
 						},
@@ -81,7 +81,7 @@ func TestBatch_response(t *testing.T) {
 						return &http.Response{
 							StatusCode: http.StatusBadRequest,
 							Status:     "Bad",
-							Body:       ioutil.NopCloser(strings.NewReader(resp)),
+							Body:       io.NopCloser(strings.NewReader(resp)),
 							Header:     make(http.Header),
 						}
 					}),
@@ -147,7 +147,7 @@ func TestBatch_fetchInfo(t *testing.T) {
 							return &http.Response{
 								StatusCode: http.StatusOK,
 								Status:     "OK",
-								Body:       ioutil.NopCloser(strings.NewReader(resp)),
+								Body:       io.NopCloser(strings.NewReader(resp)),
 								Header:     make(http.Header),
 							}
 						},
@@ -224,7 +224,7 @@ func TestBatch_create(t *testing.T) {
 							return &http.Response{
 								StatusCode: http.StatusCreated,
 								Status:     "OK",
-								Body:       ioutil.NopCloser(strings.NewReader(resp)),
+								Body:       io.NopCloser(strings.NewReader(resp)),
 								Header:     make(http.Header),
 							}
 						},
@@ -302,7 +302,7 @@ func TestBatch_Results(t *testing.T) {
 									return &http.Response{
 										StatusCode: http.StatusOK,
 										Status:     "OK",
-										Body:       ioutil.NopCloser(strings.NewReader(resp)),
+										Body:       io.NopCloser(strings.NewReader(resp)),
 										Header:     make(http.Header),
 									}
 								},
@@ -316,7 +316,7 @@ func TestBatch_Results(t *testing.T) {
 									return &http.Response{
 										StatusCode: http.StatusOK,
 										Status:     "OK",
-										Body:       ioutil.NopCloser(strings.NewReader(resp)),
+										Body:       io.NopCloser(strings.NewReader(resp)),
 										Header:     make(http.Header),
 									}
 								},
@@ -388,7 +388,7 @@ func TestBatch_Results(t *testing.T) {
 							return &http.Response{
 								StatusCode: http.StatusOK,
 								Status:     "OK",
-								Body:       ioutil.NopCloser(strings.NewReader(resp)),
+								Body:       io.NopCloser(strings.NewReader(resp)),
 								Header:     make(http.Header),
 							}
 						},

bulk/v1/bulk.go

@@ -2,11 +2,11 @@ package bulkv1
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"strings"
 
 	"github.com/namely/go-sfdc/v3/session"
-	"github.com/pkg/errors"
 )
 
 func bulkEndpoint(session session.ServiceFormatter, path ...string) string {
@@ -32,7 +32,7 @@ func NewResource(ctx context.Context, session session.ServiceFormatter) (*Resour
 
 	err := session.Refresh(ctx)
 	if err != nil {
-		return nil, errors.Wrap(err, "session refresh")
+		return nil, fmt.Errorf("session refresh: %w", err)
 	}
 
 	return &Resource{

composite/batch/batch.go

@@ -4,11 +4,12 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
+	"errors"
+	"fmt"
 	"net/http"
 
 	"github.com/namely/go-sfdc/v3"
 	"github.com/namely/go-sfdc/v3/session"
-	"github.com/pkg/errors"
 )
 
 // Subrequester provides the composite batch API requests.
@@ -59,7 +60,7 @@ func NewResource(ctx context.Context, session session.ServiceFormatter) (*Resour
 
 	err := session.Refresh(ctx)
 	if err != nil {
-		return nil, errors.Wrap(err, "session refresh")
+		return nil, fmt.Errorf("session refresh: %w", err)
 	}
 
 	return &Resource{

composite/batch/error.go

@@ -2,9 +2,9 @@ package batch
 
 import (
 	"encoding/json"
+	"errors"
 
 	"github.com/namely/go-sfdc/v3"
-	"github.com/pkg/errors"
 )
 
 func HandleSubrequestError(result Subvalue) error {

composite/composite.go

@@ -4,12 +4,13 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
+	"errors"
+	"fmt"
 	"net/http"
 
 	"github.com/namely/go-sfdc/v3"
 	"github.com/namely/go-sfdc/v3/composite/batch"
 	"github.com/namely/go-sfdc/v3/session"
-	"github.com/pkg/errors"
 )
 
 var (
@@ -70,7 +71,7 @@ func NewResource(ctx context.Context, session session.ServiceFormatter) (*Resour
 
 	err := session.Refresh(ctx)
 	if err != nil {
-		return nil, errors.Wrap(err, "session refresh")
+		return nil, fmt.Errorf("session refresh: %w", err)
 	}
 
 	return &Resource{

error.go

@@ -2,12 +2,11 @@ package sfdc
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"strings"
-
-	"github.com/pkg/errors"
 )
 
 // Error is the error structure defined by the Salesforce API.
@@ -87,13 +86,13 @@ func (e Errors) Error() string {
 // HandleError makes an error from http.Response.
 // It is the caller's responsibility to close resp.Body.
 func HandleError(resp *http.Response) error {
-	return errors.Wrap(newErrorFromBody(resp), resp.Status)
+	return fmt.Errorf("%s: %w", resp.Status, newErrorFromBody(resp))
 }
 
 func newErrorFromBody(resp *http.Response) error {
-	body, err := ioutil.ReadAll(resp.Body)
+	body, err := io.ReadAll(resp.Body)
 	if err != nil {
-		return errors.Wrap(err, "could not read the body with error")
+		return fmt.Errorf("could not read the body with error: %w", err)
 	}
 
 	errs := Errors{}

go.mod

@@ -1,11 +1,10 @@
 module github.com/namely/go-sfdc/v3
 
-go 1.19
+go 1.20
 
 require (
-	github.com/cenkalti/backoff/v4 v4.2.0
-	github.com/pkg/errors v0.9.1
-	github.com/stretchr/testify v1.8.1
+	github.com/cenkalti/backoff/v4 v4.2.1
+	github.com/stretchr/testify v1.8.4
 )
 
 require (

go.sum

@@ -1,21 +1,12 @@
-github.com/cenkalti/backoff/v4 v4.2.0 h1:HN5dHm3WBOgndBH6E8V0q2jIYIR3s9yglV8k/+MN3u4=
-github.com/cenkalti/backoff/v4 v4.2.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=
+github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
 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/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/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 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.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

session/session.go

@@ -4,14 +4,14 @@ package session
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"net/http"
 	"sync"
 	"time"
 
 	"github.com/namely/go-sfdc/v3"
 	"github.com/namely/go-sfdc/v3/credentials"
-	"github.com/pkg/errors"
 )
 
 const (
@@ -130,7 +130,7 @@ func passwordSessionResponse(request *http.Request, client *http.Client) (*sessi
 	defer response.Body.Close()
 
 	if response.StatusCode != http.StatusOK {
-		return nil, errors.Wrap(sfdc.HandleError(response), "session response")
+		return nil, fmt.Errorf("session response: %w", sfdc.HandleError(response))
 	}
 
 	var sessionResponse sessionPasswordResponse

sobject/collections/collections.go

@@ -5,6 +5,7 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
 	"net/http"
@@ -14,7 +15,6 @@ import (
 	"github.com/namely/go-sfdc/v3"
 	"github.com/namely/go-sfdc/v3/session"
 	"github.com/namely/go-sfdc/v3/sobject"
-	"github.com/pkg/errors"
 )
 
 const (
@@ -53,7 +53,7 @@ func NewResources(ctx context.Context, session session.ServiceFormatter) (*Resou
 
 	err := session.Refresh(ctx)
 	if err != nil {
-		return nil, errors.Wrap(err, "session refresh")
+		return nil, fmt.Errorf("session refresh: %w", err)
 	}
 
 	return &Resource{
@@ -123,7 +123,7 @@ func (r *Resource) Query(ctx context.Context, sobject string, records []sobject.
 		return nil, err
 	}
 
-	if matching == false {
+	if !matching {
 		return nil, fmt.Errorf("collection resource: %s is not a valid sobject", sobject)
 	}
 

sobject/framework.go

@@ -2,13 +2,13 @@ package sobject
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"regexp"
 	"time"
 
 	"github.com/namely/go-sfdc/v3"
 	"github.com/namely/go-sfdc/v3/session"
-	"github.com/pkg/errors"
 )
 
 // ObjectURLs is the URL for the SObject metadata.
@@ -48,7 +48,7 @@ func NewResources(ctx context.Context, session session.ServiceFormatter) (*Resou
 
 	err := session.Refresh(ctx)
 	if err != nil {
-		return nil, errors.Wrap(err, "session refresh")
+		return nil, fmt.Errorf("session refresh: %w", err)
 	}
 
 	return &Resources{

sobject/framework_test.go

@@ -2,13 +2,13 @@ package sobject
 
 import (
 	"context"
+	"errors"
 	"reflect"
 	"testing"
 	"time"
 
 	"github.com/namely/go-sfdc/v3"
 	"github.com/namely/go-sfdc/v3/session"
-	"github.com/pkg/errors"
 )
 
 func TestSalesforceAPI_Metadata(t *testing.T) {

sobject/tree/tree.go

@@ -4,13 +4,13 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"net/http"
 	"regexp"
 
 	"github.com/namely/go-sfdc/v3"
 	"github.com/namely/go-sfdc/v3/session"
-	"github.com/pkg/errors"
 )
 
 // Inserter is used to define the SObject and it's records for the
@@ -48,7 +48,7 @@ func NewResource(ctx context.Context, session session.ServiceFormatter) (*Resour
 
 	err := session.Refresh(ctx)
 	if err != nil {
-		return nil, errors.Wrap(err, "session refresh")
+		return nil, fmt.Errorf("session refresh: %w", err)
 	}
 
 	return &Resource{

soql/query.go

@@ -3,11 +3,12 @@ package soql
 import (
 	"context"
 	"encoding/json"
+	"errors"
+	"fmt"
 	"net/http"
 
 	"github.com/namely/go-sfdc/v3"
 	"github.com/namely/go-sfdc/v3/session"
-	"github.com/pkg/errors"
 )
 
 // Resource is the structure for the Salesforce
@@ -80,7 +81,7 @@ func NewResource(ctx context.Context, session session.ServiceFormatter) (*Resour
 
 	err := session.Refresh(ctx)
 	if err != nil {
-		return nil, errors.Wrap(err, "session refresh")
+		return nil, fmt.Errorf("session refresh: %w", err)
 	}
 
 	return &Resource{