swap to stblib errors

Updates error handling to use built in methods instead of external package. - use the `errors` import in favour of `github.com/pkg/errors` - `errors.Wrap` => `errors.Errof("...: %w", err)` - `errors.Errorf` => `fmt.Errorf` Closes cloudflare#968
section · Jul 4, 2022 · 7c5d7f8 · 7c5d7f8
1 parent 44f0966
commit 7c5d7f8
Show file tree

Hide file tree

Showing 93 changed files with 590 additions and 686 deletions.
diff --git a/access_application.go b/access_application.go
@@ -6,8 +6,6 @@ import (
 	"fmt"
 	"net/http"
 	"time"
-
-	"github.com/pkg/errors"
 )
 
 // AccessApplicationType represents the application type.
@@ -137,7 +135,7 @@ func (api *API) accessApplications(ctx context.Context, id string, pageOpts Pagi
 	var accessApplicationListResponse AccessApplicationListResponse
 	err = json.Unmarshal(res, &accessApplicationListResponse)
 	if err != nil {
-		return []AccessApplication{}, ResultInfo{}, errors.Wrap(err, errUnmarshalError)
+		return []AccessApplication{}, ResultInfo{}, fmt.Errorf("%s: %w", errUnmarshalError, err)
 	}
 
 	return accessApplicationListResponse.Result, accessApplicationListResponse.ResultInfo, nil
@@ -175,7 +173,7 @@ func (api *API) accessApplication(ctx context.Context, id, applicationID string,
 	var accessApplicationDetailResponse AccessApplicationDetailResponse
 	err = json.Unmarshal(res, &accessApplicationDetailResponse)
 	if err != nil {
-		return AccessApplication{}, errors.Wrap(err, errUnmarshalError)
+		return AccessApplication{}, fmt.Errorf("%s: %w", errUnmarshalError, err)
 	}
 
 	return accessApplicationDetailResponse.Result, nil
@@ -206,7 +204,7 @@ func (api *API) createAccessApplication(ctx context.Context, id string, accessAp
 	var accessApplicationDetailResponse AccessApplicationDetailResponse
 	err = json.Unmarshal(res, &accessApplicationDetailResponse)
 	if err != nil {
-		return AccessApplication{}, errors.Wrap(err, errUnmarshalError)
+		return AccessApplication{}, fmt.Errorf("%s: %w", errUnmarshalError, err)
 	}
 
 	return accessApplicationDetailResponse.Result, nil
@@ -228,7 +226,7 @@ func (api *API) UpdateZoneLevelAccessApplication(ctx context.Context, zoneID str
 
 func (api *API) updateAccessApplication(ctx context.Context, id string, accessApplication AccessApplication, routeRoot RouteRoot) (AccessApplication, error) {
 	if accessApplication.ID == "" {
-		return AccessApplication{}, errors.Errorf("access application ID cannot be empty")
+		return AccessApplication{}, fmt.Errorf("access application ID cannot be empty")
 	}
 
 	uri := fmt.Sprintf(
@@ -246,7 +244,7 @@ func (api *API) updateAccessApplication(ctx context.Context, id string, accessAp
 	var accessApplicationDetailResponse AccessApplicationDetailResponse
 	err = json.Unmarshal(res, &accessApplicationDetailResponse)
 	if err != nil {
-		return AccessApplication{}, errors.Wrap(err, errUnmarshalError)
+		return AccessApplication{}, fmt.Errorf("%s: %w", errUnmarshalError, err)
 	}
 
 	return accessApplicationDetailResponse.Result, nil

diff --git a/access_audit_log.go b/access_audit_log.go
@@ -8,8 +8,6 @@ import (
 	"net/url"
 	"strconv"
 	"time"
-
-	"github.com/pkg/errors"
 )
 
 // AccessAuditLogRecord is the structure of a single Access Audit Log entry.
@@ -56,7 +54,7 @@ func (api *API) AccessAuditLogs(ctx context.Context, accountID string, opts Acce
 	var accessAuditLogListResponse AccessAuditLogListResponse
 	err = json.Unmarshal(res, &accessAuditLogListResponse)
 	if err != nil {
-		return []AccessAuditLogRecord{}, errors.Wrap(err, errUnmarshalError)
+		return []AccessAuditLogRecord{}, fmt.Errorf("%s: %w", errUnmarshalError, err)
 	}
 
 	return accessAuditLogListResponse.Result, nil

diff --git a/access_bookmark.go b/access_bookmark.go
@@ -6,8 +6,6 @@ import (
 	"fmt"
 	"net/http"
 	"time"
-
-	"github.com/pkg/errors"
 )
 
 // AccessBookmark represents an Access bookmark application.
@@ -61,7 +59,7 @@ func (api *API) accessBookmarks(ctx context.Context, id string, pageOpts Paginat
 	var accessBookmarkListResponse AccessBookmarkListResponse
 	err = json.Unmarshal(res, &accessBookmarkListResponse)
 	if err != nil {
-		return []AccessBookmark{}, ResultInfo{}, errors.Wrap(err, errUnmarshalError)
+		return []AccessBookmark{}, ResultInfo{}, fmt.Errorf("%s: %w", errUnmarshalError, err)
 	}
 
 	return accessBookmarkListResponse.Result, accessBookmarkListResponse.ResultInfo, nil
@@ -99,7 +97,7 @@ func (api *API) accessBookmark(ctx context.Context, id, bookmarkID string, route
 	var accessBookmarkDetailResponse AccessBookmarkDetailResponse
 	err = json.Unmarshal(res, &accessBookmarkDetailResponse)
 	if err != nil {
-		return AccessBookmark{}, errors.Wrap(err, errUnmarshalError)
+		return AccessBookmark{}, fmt.Errorf("%s: %w", errUnmarshalError, err)
 	}
 
 	return accessBookmarkDetailResponse.Result, nil
@@ -130,7 +128,7 @@ func (api *API) createAccessBookmark(ctx context.Context, id string, accessBookm
 	var accessBookmarkDetailResponse AccessBookmarkDetailResponse
 	err = json.Unmarshal(res, &accessBookmarkDetailResponse)
 	if err != nil {
-		return AccessBookmark{}, errors.Wrap(err, errUnmarshalError)
+		return AccessBookmark{}, fmt.Errorf("%s: %w", errUnmarshalError, err)
 	}
 
 	return accessBookmarkDetailResponse.Result, nil
@@ -152,7 +150,7 @@ func (api *API) UpdateZoneLevelAccessBookmark(ctx context.Context, zoneID string
 
 func (api *API) updateAccessBookmark(ctx context.Context, id string, accessBookmark AccessBookmark, routeRoot RouteRoot) (AccessBookmark, error) {
 	if accessBookmark.ID == "" {
-		return AccessBookmark{}, errors.Errorf("access bookmark ID cannot be empty")
+		return AccessBookmark{}, fmt.Errorf("access bookmark ID cannot be empty")
 	}
 
 	uri := fmt.Sprintf(
@@ -170,7 +168,7 @@ func (api *API) updateAccessBookmark(ctx context.Context, id string, accessBookm
 	var accessBookmarkDetailResponse AccessBookmarkDetailResponse
 	err = json.Unmarshal(res, &accessBookmarkDetailResponse)
 	if err != nil {
-		return AccessBookmark{}, errors.Wrap(err, errUnmarshalError)
+		return AccessBookmark{}, fmt.Errorf("%s: %w", errUnmarshalError, err)
 	}
 
 	return accessBookmarkDetailResponse.Result, nil

diff --git a/access_ca_certificate.go b/access_ca_certificate.go
@@ -5,8 +5,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
-
-	"github.com/pkg/errors"
 )
 
 // AccessCACertificate is the structure of the CA certificate used for
@@ -56,7 +54,7 @@ func (api *API) accessCACertificates(ctx context.Context, id string, routeRoot R
 	var accessCAListResponse AccessCACertificateListResponse
 	err = json.Unmarshal(res, &accessCAListResponse)
 	if err != nil {
-		return []AccessCACertificate{}, errors.Wrap(err, errUnmarshalError)
+		return []AccessCACertificate{}, fmt.Errorf("%s: %w", errUnmarshalError, err)
 	}
 
 	return accessCAListResponse.Result, nil
@@ -89,7 +87,7 @@ func (api *API) accessCACertificate(ctx context.Context, id, applicationID strin
 	var accessCAResponse AccessCACertificateResponse
 	err = json.Unmarshal(res, &accessCAResponse)
 	if err != nil {
-		return AccessCACertificate{}, errors.Wrap(err, errUnmarshalError)
+		return AccessCACertificate{}, fmt.Errorf("%s: %w", errUnmarshalError, err)
 	}
 
 	return accessCAResponse.Result, nil
@@ -127,7 +125,7 @@ func (api *API) createAccessCACertificate(ctx context.Context, id string, applic
 	var accessCACertificate AccessCACertificateResponse
 	err = json.Unmarshal(res, &accessCACertificate)
 	if err != nil {
-		return AccessCACertificate{}, errors.Wrap(err, errUnmarshalError)
+		return AccessCACertificate{}, fmt.Errorf("%s: %w", errUnmarshalError, err)
 	}
 
 	return accessCACertificate.Result, nil

diff --git a/access_group.go b/access_group.go
@@ -6,8 +6,6 @@ import (
 	"fmt"
 	"net/http"
 	"time"
-
-	"github.com/pkg/errors"
 )
 
 // AccessGroup defines a group for allowing or disallowing access to
@@ -237,7 +235,7 @@ func (api *API) accessGroups(ctx context.Context, id string, pageOpts Pagination
 	var accessGroupListResponse AccessGroupListResponse
 	err = json.Unmarshal(res, &accessGroupListResponse)
 	if err != nil {
-		return []AccessGroup{}, ResultInfo{}, errors.Wrap(err, errUnmarshalError)
+		return []AccessGroup{}, ResultInfo{}, fmt.Errorf("%s: %w", errUnmarshalError, err)
 	}
 
 	return accessGroupListResponse.Result, accessGroupListResponse.ResultInfo, nil
@@ -273,7 +271,7 @@ func (api *API) accessGroup(ctx context.Context, id, groupID string, routeRoot R
 	var accessGroupDetailResponse AccessGroupDetailResponse
 	err = json.Unmarshal(res, &accessGroupDetailResponse)
 	if err != nil {
-		return AccessGroup{}, errors.Wrap(err, errUnmarshalError)
+		return AccessGroup{}, fmt.Errorf("%s: %w", errUnmarshalError, err)
 	}
 
 	return accessGroupDetailResponse.Result, nil
@@ -308,7 +306,7 @@ func (api *API) createAccessGroup(ctx context.Context, id string, accessGroup Ac
 	var accessGroupDetailResponse AccessGroupDetailResponse
 	err = json.Unmarshal(res, &accessGroupDetailResponse)
 	if err != nil {
-		return AccessGroup{}, errors.Wrap(err, errUnmarshalError)
+		return AccessGroup{}, fmt.Errorf("%s: %w", errUnmarshalError, err)
 	}
 
 	return accessGroupDetailResponse.Result, nil
@@ -330,7 +328,7 @@ func (api *API) UpdateZoneLevelAccessGroup(ctx context.Context, zoneID string, a
 
 func (api *API) updateAccessGroup(ctx context.Context, id string, accessGroup AccessGroup, routeRoot RouteRoot) (AccessGroup, error) {
 	if accessGroup.ID == "" {
-		return AccessGroup{}, errors.Errorf("access group ID cannot be empty")
+		return AccessGroup{}, fmt.Errorf("access group ID cannot be empty")
 	}
 
 	uri := fmt.Sprintf(
@@ -348,7 +346,7 @@ func (api *API) updateAccessGroup(ctx context.Context, id string, accessGroup Ac
 	var accessGroupDetailResponse AccessGroupDetailResponse
 	err = json.Unmarshal(res, &accessGroupDetailResponse)
 	if err != nil {
-		return AccessGroup{}, errors.Wrap(err, errUnmarshalError)
+		return AccessGroup{}, fmt.Errorf("%s: %w", errUnmarshalError, err)
 	}
 
 	return accessGroupDetailResponse.Result, nil

diff --git a/access_identity_provider.go b/access_identity_provider.go
@@ -5,8 +5,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
-
-	"github.com/pkg/errors"
 )
 
 // AccessIdentityProvider is the structure of the provider object.
@@ -87,7 +85,7 @@ func (api *API) accessIdentityProviders(ctx context.Context, id string, routeRoo
 	var accessIdentityProviderResponse AccessIdentityProvidersListResponse
 	err = json.Unmarshal(res, &accessIdentityProviderResponse)
 	if err != nil {
-		return []AccessIdentityProvider{}, errors.Wrap(err, errUnmarshalError)
+		return []AccessIdentityProvider{}, fmt.Errorf("%s: %w", errUnmarshalError, err)
 	}
 
 	return accessIdentityProviderResponse.Result, nil
@@ -125,7 +123,7 @@ func (api *API) accessIdentityProviderDetails(ctx context.Context, id string, id
 	var accessIdentityProviderResponse AccessIdentityProviderListResponse
 	err = json.Unmarshal(res, &accessIdentityProviderResponse)
 	if err != nil {
-		return AccessIdentityProvider{}, errors.Wrap(err, errUnmarshalError)
+		return AccessIdentityProvider{}, fmt.Errorf("%s: %w", errUnmarshalError, err)
 	}
 
 	return accessIdentityProviderResponse.Result, nil
@@ -156,7 +154,7 @@ func (api *API) createAccessIdentityProvider(ctx context.Context, id string, ide
 	var accessIdentityProviderResponse AccessIdentityProviderListResponse
 	err = json.Unmarshal(res, &accessIdentityProviderResponse)
 	if err != nil {
-		return AccessIdentityProvider{}, errors.Wrap(err, errUnmarshalError)
+		return AccessIdentityProvider{}, fmt.Errorf("%s: %w", errUnmarshalError, err)
 	}
 
 	return accessIdentityProviderResponse.Result, nil
@@ -194,7 +192,7 @@ func (api *API) updateAccessIdentityProvider(ctx context.Context, id string, ide
 	var accessIdentityProviderResponse AccessIdentityProviderListResponse
 	err = json.Unmarshal(res, &accessIdentityProviderResponse)
 	if err != nil {
-		return AccessIdentityProvider{}, errors.Wrap(err, errUnmarshalError)
+		return AccessIdentityProvider{}, fmt.Errorf("%s: %w", errUnmarshalError, err)
 	}
 
 	return accessIdentityProviderResponse.Result, nil
@@ -230,7 +228,7 @@ func (api *API) deleteAccessIdentityProvider(ctx context.Context, id string, ide
 	var accessIdentityProviderResponse AccessIdentityProviderListResponse
 	err = json.Unmarshal(res, &accessIdentityProviderResponse)
 	if err != nil {
-		return AccessIdentityProvider{}, errors.Wrap(err, errUnmarshalError)
+		return AccessIdentityProvider{}, fmt.Errorf("%s: %w", errUnmarshalError, err)
 	}
 
 	return accessIdentityProviderResponse.Result, nil

diff --git a/access_keys.go b/access_keys.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/pkg/errors"
 	"net/http"
 	"time"
 )
@@ -58,7 +57,7 @@ func (api *API) accessKeysRequest(ctx context.Context, method, uri string, param
 
 	var keysConfigResponse accessKeysConfigResponse
 	if err := json.Unmarshal(res, &keysConfigResponse); err != nil {
-		return AccessKeysConfig{}, errors.Wrap(err, errUnmarshalError)
+		return AccessKeysConfig{}, fmt.Errorf("%s: %w", errUnmarshalError, err)
 	}
 	return keysConfigResponse.Result, nil
 }
diff --git a/access_mutual_tls_certificates.go b/access_mutual_tls_certificates.go
@@ -6,8 +6,6 @@ import (
 	"fmt"
 	"net/http"
 	"time"
-
-	"github.com/pkg/errors"
 )
 
 // AccessMutualTLSCertificate is the structure of a single Access Mutual TLS
@@ -68,7 +66,7 @@ func (api *API) accessMutualTLSCertificates(ctx context.Context, id string, rout
 	var accessMutualTLSCertificateListResponse AccessMutualTLSCertificateListResponse
 	err = json.Unmarshal(res, &accessMutualTLSCertificateListResponse)
 	if err != nil {
-		return []AccessMutualTLSCertificate{}, errors.Wrap(err, errUnmarshalError)
+		return []AccessMutualTLSCertificate{}, fmt.Errorf("%s: %w", errUnmarshalError, err)
 	}
 
 	return accessMutualTLSCertificateListResponse.Result, nil
@@ -106,7 +104,7 @@ func (api *API) accessMutualTLSCertificate(ctx context.Context, id, certificateI
 	var accessMutualTLSCertificateDetailResponse AccessMutualTLSCertificateDetailResponse
 	err = json.Unmarshal(res, &accessMutualTLSCertificateDetailResponse)
 	if err != nil {
-		return AccessMutualTLSCertificate{}, errors.Wrap(err, errUnmarshalError)
+		return AccessMutualTLSCertificate{}, fmt.Errorf("%s: %w", errUnmarshalError, err)
 	}
 
 	return accessMutualTLSCertificateDetailResponse.Result, nil
@@ -143,7 +141,7 @@ func (api *API) createAccessMutualTLSCertificate(ctx context.Context, id string,
 	var accessMutualTLSCertificateDetailResponse AccessMutualTLSCertificateDetailResponse
 	err = json.Unmarshal(res, &accessMutualTLSCertificateDetailResponse)
 	if err != nil {
-		return AccessMutualTLSCertificate{}, errors.Wrap(err, errUnmarshalError)
+		return AccessMutualTLSCertificate{}, fmt.Errorf("%s: %w", errUnmarshalError, err)
 	}
 
 	return accessMutualTLSCertificateDetailResponse.Result, nil
@@ -181,7 +179,7 @@ func (api *API) updateAccessMutualTLSCertificate(ctx context.Context, id string,
 	var accessMutualTLSCertificateDetailResponse AccessMutualTLSCertificateDetailResponse
 	err = json.Unmarshal(res, &accessMutualTLSCertificateDetailResponse)
 	if err != nil {
-		return AccessMutualTLSCertificate{}, errors.Wrap(err, errUnmarshalError)
+		return AccessMutualTLSCertificate{}, fmt.Errorf("%s: %w", errUnmarshalError, err)
 	}
 
 	return accessMutualTLSCertificateDetailResponse.Result, nil
@@ -219,7 +217,7 @@ func (api *API) deleteAccessMutualTLSCertificate(ctx context.Context, id, certif
 	var accessMutualTLSCertificateDetailResponse AccessMutualTLSCertificateDetailResponse
 	err = json.Unmarshal(res, &accessMutualTLSCertificateDetailResponse)
 	if err != nil {
-		return errors.Wrap(err, errUnmarshalError)
+		return fmt.Errorf("%s: %w", errUnmarshalError, err)
 	}
 
 	return nil

diff --git a/access_organization.go b/access_organization.go
@@ -6,8 +6,6 @@ import (
 	"fmt"
 	"net/http"
 	"time"
-
-	"github.com/pkg/errors"
 )
 
 // AccessOrganization represents an Access organization.
@@ -70,7 +68,7 @@ func (api *API) accessOrganization(ctx context.Context, id string, routeRoot Rou
 	var accessOrganizationListResponse AccessOrganizationListResponse
 	err = json.Unmarshal(res, &accessOrganizationListResponse)
 	if err != nil {
-		return AccessOrganization{}, ResultInfo{}, errors.Wrap(err, errUnmarshalError)
+		return AccessOrganization{}, ResultInfo{}, fmt.Errorf("%s: %w", errUnmarshalError, err)
 	}
 
 	return accessOrganizationListResponse.Result, accessOrganizationListResponse.ResultInfo, nil
@@ -101,7 +99,7 @@ func (api *API) createAccessOrganization(ctx context.Context, id string, accessO
 	var accessOrganizationDetailResponse AccessOrganizationDetailResponse
 	err = json.Unmarshal(res, &accessOrganizationDetailResponse)
 	if err != nil {
-		return AccessOrganization{}, errors.Wrap(err, errUnmarshalError)
+		return AccessOrganization{}, fmt.Errorf("%s: %w", errUnmarshalError, err)
 	}
 
 	return accessOrganizationDetailResponse.Result, nil
@@ -132,7 +130,7 @@ func (api *API) updateAccessOrganization(ctx context.Context, id string, accessO
 	var accessOrganizationDetailResponse AccessOrganizationDetailResponse
 	err = json.Unmarshal(res, &accessOrganizationDetailResponse)
 	if err != nil {
-		return AccessOrganization{}, errors.Wrap(err, errUnmarshalError)
+		return AccessOrganization{}, fmt.Errorf("%s: %w", errUnmarshalError, err)
 	}
 
 	return accessOrganizationDetailResponse.Result, nil