Merge pull request cloudflare#596 from cloudflare/better-error-handli…

…ng-and-use Better error handling for API errors
boekkooi-lengoo · Mar 2, 2021 · c237d53 · c237d53
2 parents 9b62079 + 58eba05
commit c237d53
Show file tree

Hide file tree

Showing 56 changed files with 770 additions and 571 deletions.
diff --git a/access_application.go b/access_application.go
@@ -89,7 +89,7 @@ func (api *API) accessApplications(ctx context.Context, id string, pageOpts Pagi
 
 	res, err := api.makeRequestContext(ctx, http.MethodGet, uri, nil)
 	if err != nil {
-		return []AccessApplication{}, ResultInfo{}, errors.Wrap(err, errMakeRequestError)
+		return []AccessApplication{}, ResultInfo{}, err
 	}
 
 	var accessApplicationListResponse AccessApplicationListResponse
@@ -127,7 +127,7 @@ func (api *API) accessApplication(ctx context.Context, id, applicationID string,
 
 	res, err := api.makeRequestContext(ctx, http.MethodGet, uri, nil)
 	if err != nil {
-		return AccessApplication{}, errors.Wrap(err, errMakeRequestError)
+		return AccessApplication{}, err
 	}
 
 	var accessApplicationDetailResponse AccessApplicationDetailResponse
@@ -158,7 +158,7 @@ func (api *API) createAccessApplication(ctx context.Context, id string, accessAp
 
 	res, err := api.makeRequestContext(ctx, http.MethodPost, uri, accessApplication)
 	if err != nil {
-		return AccessApplication{}, errors.Wrap(err, errMakeRequestError)
+		return AccessApplication{}, err
 	}
 
 	var accessApplicationDetailResponse AccessApplicationDetailResponse
@@ -198,7 +198,7 @@ func (api *API) updateAccessApplication(ctx context.Context, id string, accessAp
 
 	res, err := api.makeRequestContext(ctx, http.MethodPut, uri, accessApplication)
 	if err != nil {
-		return AccessApplication{}, errors.Wrap(err, errMakeRequestError)
+		return AccessApplication{}, err
 	}
 
 	var accessApplicationDetailResponse AccessApplicationDetailResponse
@@ -234,7 +234,7 @@ func (api *API) deleteAccessApplication(ctx context.Context, id, applicationID s
 
 	_, err := api.makeRequestContext(ctx, http.MethodDelete, uri, nil)
 	if err != nil {
-		return errors.Wrap(err, errMakeRequestError)
+		return err
 	}
 
 	return nil
@@ -266,7 +266,7 @@ func (api *API) revokeAccessApplicationTokens(ctx context.Context, id string, ap
 
 	_, err := api.makeRequestContext(ctx, http.MethodPost, uri, nil)
 	if err != nil {
-		return errors.Wrap(err, errMakeRequestError)
+		return err
 	}
 
 	return nil

diff --git a/access_audit_log.go b/access_audit_log.go
@@ -49,7 +49,7 @@ func (api *API) AccessAuditLogs(ctx context.Context, accountID string, opts Acce
 
 	res, err := api.makeRequestContext(ctx, http.MethodGet, uri, nil)
 	if err != nil {
-		return []AccessAuditLogRecord{}, errors.Wrap(err, errMakeRequestError)
+		return []AccessAuditLogRecord{}, err
 	}
 
 	var accessAuditLogListResponse AccessAuditLogListResponse

diff --git a/access_ca_certificate.go b/access_ca_certificate.go
@@ -50,7 +50,7 @@ func (api *API) accessCACertificates(ctx context.Context, id string, routeRoot R
 
 	res, err := api.makeRequestContext(ctx, http.MethodGet, uri, nil)
 	if err != nil {
-		return []AccessCACertificate{}, errors.Wrap(err, errMakeRequestError)
+		return []AccessCACertificate{}, err
 	}
 
 	var accessCAListResponse AccessCACertificateListResponse
@@ -83,7 +83,7 @@ func (api *API) accessCACertificate(ctx context.Context, id, applicationID strin
 
 	res, err := api.makeRequestContext(ctx, http.MethodGet, uri, nil)
 	if err != nil {
-		return AccessCACertificate{}, errors.Wrap(err, errMakeRequestError)
+		return AccessCACertificate{}, err
 	}
 
 	var accessCAResponse AccessCACertificateResponse
@@ -121,7 +121,7 @@ func (api *API) createAccessCACertificate(ctx context.Context, id string, applic
 
 	res, err := api.makeRequestContext(ctx, http.MethodPost, uri, nil)
 	if err != nil {
-		return AccessCACertificate{}, errors.Wrap(err, errMakeRequestError)
+		return AccessCACertificate{}, err
 	}
 
 	var accessCACertificate AccessCACertificateResponse
@@ -159,7 +159,7 @@ func (api *API) deleteAccessCACertificate(ctx context.Context, id string, applic
 
 	_, err := api.makeRequestContext(ctx, http.MethodDelete, uri, nil)
 	if err != nil {
-		return errors.Wrap(err, errMakeRequestError)
+		return err
 	}
 
 	return nil

diff --git a/access_group.go b/access_group.go
@@ -213,7 +213,7 @@ func (api *API) accessGroups(ctx context.Context, id string, pageOpts Pagination
 
 	res, err := api.makeRequestContext(ctx, http.MethodGet, uri, nil)
 	if err != nil {
-		return []AccessGroup{}, ResultInfo{}, errors.Wrap(err, errMakeRequestError)
+		return []AccessGroup{}, ResultInfo{}, err
 	}
 
 	var accessGroupListResponse AccessGroupListResponse
@@ -249,7 +249,7 @@ func (api *API) accessGroup(ctx context.Context, id, groupID string, routeRoot R
 
 	res, err := api.makeRequestContext(ctx, http.MethodGet, uri, nil)
 	if err != nil {
-		return AccessGroup{}, errors.Wrap(err, errMakeRequestError)
+		return AccessGroup{}, err
 	}
 
 	var accessGroupDetailResponse AccessGroupDetailResponse
@@ -284,7 +284,7 @@ func (api *API) createAccessGroup(ctx context.Context, id string, accessGroup Ac
 
 	res, err := api.makeRequestContext(ctx, http.MethodPost, uri, accessGroup)
 	if err != nil {
-		return AccessGroup{}, errors.Wrap(err, errMakeRequestError)
+		return AccessGroup{}, err
 	}
 
 	var accessGroupDetailResponse AccessGroupDetailResponse
@@ -323,7 +323,7 @@ func (api *API) updateAccessGroup(ctx context.Context, id string, accessGroup Ac
 
 	res, err := api.makeRequestContext(ctx, http.MethodPut, uri, accessGroup)
 	if err != nil {
-		return AccessGroup{}, errors.Wrap(err, errMakeRequestError)
+		return AccessGroup{}, err
 	}
 
 	var accessGroupDetailResponse AccessGroupDetailResponse
@@ -359,7 +359,7 @@ func (api *API) deleteAccessGroup(ctx context.Context, id string, groupID string
 
 	_, err := api.makeRequestContext(ctx, http.MethodDelete, uri, nil)
 	if err != nil {
-		return errors.Wrap(err, errMakeRequestError)
+		return err
 	}
 
 	return nil

diff --git a/access_identity_provider.go b/access_identity_provider.go
@@ -79,7 +79,7 @@ func (api *API) accessIdentityProviders(ctx context.Context, id string, routeRoo
 
 	res, err := api.makeRequestContext(ctx, http.MethodGet, uri, nil)
 	if err != nil {
-		return []AccessIdentityProvider{}, errors.Wrap(err, errMakeRequestError)
+		return []AccessIdentityProvider{}, err
 	}
 
 	var accessIdentityProviderResponse AccessIdentityProvidersListResponse
@@ -117,7 +117,7 @@ func (api *API) accessIdentityProviderDetails(ctx context.Context, id string, id
 
 	res, err := api.makeRequestContext(ctx, http.MethodGet, uri, nil)
 	if err != nil {
-		return AccessIdentityProvider{}, errors.Wrap(err, errMakeRequestError)
+		return AccessIdentityProvider{}, err
 	}
 
 	var accessIdentityProviderResponse AccessIdentityProviderListResponse
@@ -148,7 +148,7 @@ func (api *API) createAccessIdentityProvider(ctx context.Context, id string, ide
 
 	res, err := api.makeRequestContext(ctx, http.MethodPost, uri, identityProviderConfiguration)
 	if err != nil {
-		return AccessIdentityProvider{}, errors.Wrap(err, errMakeRequestError)
+		return AccessIdentityProvider{}, err
 	}
 
 	var accessIdentityProviderResponse AccessIdentityProviderListResponse
@@ -186,7 +186,7 @@ func (api *API) updateAccessIdentityProvider(ctx context.Context, id string, ide
 
 	res, err := api.makeRequestContext(ctx, http.MethodPut, uri, identityProviderConfiguration)
 	if err != nil {
-		return AccessIdentityProvider{}, errors.Wrap(err, errMakeRequestError)
+		return AccessIdentityProvider{}, err
 	}
 
 	var accessIdentityProviderResponse AccessIdentityProviderListResponse
@@ -222,7 +222,7 @@ func (api *API) deleteAccessIdentityProvider(ctx context.Context, id string, ide
 
 	res, err := api.makeRequestContext(ctx, http.MethodDelete, uri, nil)
 	if err != nil {
-		return AccessIdentityProvider{}, errors.Wrap(err, errMakeRequestError)
+		return AccessIdentityProvider{}, err
 	}
 
 	var accessIdentityProviderResponse AccessIdentityProviderListResponse

diff --git a/access_mutual_tls_certificates.go b/access_mutual_tls_certificates.go
@@ -62,7 +62,7 @@ func (api *API) accessMutualTLSCertificates(ctx context.Context, id string, rout
 
 	res, err := api.makeRequestContext(ctx, http.MethodGet, uri, nil)
 	if err != nil {
-		return []AccessMutualTLSCertificate{}, errors.Wrap(err, errMakeRequestError)
+		return []AccessMutualTLSCertificate{}, err
 	}
 
 	var accessMutualTLSCertificateListResponse AccessMutualTLSCertificateListResponse
@@ -100,7 +100,7 @@ func (api *API) accessMutualTLSCertificate(ctx context.Context, id, certificateI
 
 	res, err := api.makeRequestContext(ctx, http.MethodGet, uri, nil)
 	if err != nil {
-		return AccessMutualTLSCertificate{}, errors.Wrap(err, errMakeRequestError)
+		return AccessMutualTLSCertificate{}, err
 	}
 
 	var accessMutualTLSCertificateDetailResponse AccessMutualTLSCertificateDetailResponse
@@ -137,7 +137,7 @@ func (api *API) createAccessMutualTLSCertificate(ctx context.Context, id string,
 
 	res, err := api.makeRequestContext(ctx, http.MethodPost, uri, certificate)
 	if err != nil {
-		return AccessMutualTLSCertificate{}, errors.Wrap(err, errMakeRequestError)
+		return AccessMutualTLSCertificate{}, err
 	}
 
 	var accessMutualTLSCertificateDetailResponse AccessMutualTLSCertificateDetailResponse
@@ -175,7 +175,7 @@ func (api *API) updateAccessMutualTLSCertificate(ctx context.Context, id string,
 
 	res, err := api.makeRequestContext(ctx, http.MethodPut, uri, certificate)
 	if err != nil {
-		return AccessMutualTLSCertificate{}, errors.Wrap(err, errMakeRequestError)
+		return AccessMutualTLSCertificate{}, err
 	}
 
 	var accessMutualTLSCertificateDetailResponse AccessMutualTLSCertificateDetailResponse
@@ -213,7 +213,7 @@ func (api *API) deleteAccessMutualTLSCertificate(ctx context.Context, id, certif
 
 	res, err := api.makeRequestContext(ctx, http.MethodDelete, uri, nil)
 	if err != nil {
-		return errors.Wrap(err, errMakeRequestError)
+		return err
 	}
 
 	var accessMutualTLSCertificateDetailResponse AccessMutualTLSCertificateDetailResponse

diff --git a/access_organization.go b/access_organization.go
@@ -62,7 +62,7 @@ func (api *API) accessOrganization(ctx context.Context, id string, routeRoot Rou
 
 	res, err := api.makeRequestContext(ctx, http.MethodGet, uri, nil)
 	if err != nil {
-		return AccessOrganization{}, ResultInfo{}, errors.Wrap(err, errMakeRequestError)
+		return AccessOrganization{}, ResultInfo{}, err
 	}
 
 	var accessOrganizationListResponse AccessOrganizationListResponse
@@ -93,7 +93,7 @@ func (api *API) createAccessOrganization(ctx context.Context, id string, accessO
 
 	res, err := api.makeRequestContext(ctx, http.MethodPost, uri, accessOrganization)
 	if err != nil {
-		return AccessOrganization{}, errors.Wrap(err, errMakeRequestError)
+		return AccessOrganization{}, err
 	}
 
 	var accessOrganizationDetailResponse AccessOrganizationDetailResponse
@@ -124,7 +124,7 @@ func (api *API) updateAccessOrganization(ctx context.Context, id string, accessO
 
 	res, err := api.makeRequestContext(ctx, http.MethodPut, uri, accessOrganization)
 	if err != nil {
-		return AccessOrganization{}, errors.Wrap(err, errMakeRequestError)
+		return AccessOrganization{}, err
 	}
 
 	var accessOrganizationDetailResponse AccessOrganizationDetailResponse

diff --git a/access_policy.go b/access_policy.go
@@ -88,7 +88,7 @@ func (api *API) accessPolicies(ctx context.Context, id string, applicationID str
 
 	res, err := api.makeRequestContext(ctx, http.MethodGet, uri, nil)
 	if err != nil {
-		return []AccessPolicy{}, ResultInfo{}, errors.Wrap(err, errMakeRequestError)
+		return []AccessPolicy{}, ResultInfo{}, err
 	}
 
 	var accessPolicyListResponse AccessPolicyListResponse
@@ -125,7 +125,7 @@ func (api *API) accessPolicy(ctx context.Context, id string, applicationID strin
 
 	res, err := api.makeRequestContext(ctx, http.MethodGet, uri, nil)
 	if err != nil {
-		return AccessPolicy{}, errors.Wrap(err, errMakeRequestError)
+		return AccessPolicy{}, err
 	}
 
 	var accessPolicyDetailResponse AccessPolicyDetailResponse
@@ -161,7 +161,7 @@ func (api *API) createAccessPolicy(ctx context.Context, id, applicationID string
 
 	res, err := api.makeRequestContext(ctx, http.MethodPost, uri, accessPolicy)
 	if err != nil {
-		return AccessPolicy{}, errors.Wrap(err, errMakeRequestError)
+		return AccessPolicy{}, err
 	}
 
 	var accessPolicyDetailResponse AccessPolicyDetailResponse
@@ -201,7 +201,7 @@ func (api *API) updateAccessPolicy(ctx context.Context, id, applicationID string
 
 	res, err := api.makeRequestContext(ctx, http.MethodPut, uri, accessPolicy)
 	if err != nil {
-		return AccessPolicy{}, errors.Wrap(err, errMakeRequestError)
+		return AccessPolicy{}, err
 	}
 
 	var accessPolicyDetailResponse AccessPolicyDetailResponse
@@ -238,7 +238,7 @@ func (api *API) deleteAccessPolicy(ctx context.Context, id, applicationID, acces
 
 	_, err := api.makeRequestContext(ctx, http.MethodDelete, uri, nil)
 	if err != nil {
-		return errors.Wrap(err, errMakeRequestError)
+		return err
 	}
 
 	return nil

diff --git a/access_service_tokens.go b/access_service_tokens.go
@@ -97,7 +97,7 @@ func (api *API) accessServiceTokens(ctx context.Context, id string, routeRoot Ro
 
 	res, err := api.makeRequestContext(ctx, http.MethodGet, uri, nil)
 	if err != nil {
-		return []AccessServiceToken{}, ResultInfo{}, errors.Wrap(err, errMakeRequestError)
+		return []AccessServiceToken{}, ResultInfo{}, err
 	}
 
 	var accessServiceTokensListResponse AccessServiceTokensListResponse
@@ -132,7 +132,7 @@ func (api *API) createAccessServiceToken(ctx context.Context, id, name string, r
 	res, err := api.makeRequestContext(ctx, http.MethodPost, uri, marshalledName)
 
 	if err != nil {
-		return AccessServiceTokenCreateResponse{}, errors.Wrap(err, errMakeRequestError)
+		return AccessServiceTokenCreateResponse{}, err
 	}
 
 	var accessServiceTokenCreation AccessServiceTokensCreationDetailResponse
@@ -169,7 +169,7 @@ func (api *API) updateAccessServiceToken(ctx context.Context, id, uuid, name str
 
 	res, err := api.makeRequestContext(ctx, http.MethodPut, uri, marshalledName)
 	if err != nil {
-		return AccessServiceTokenUpdateResponse{}, errors.Wrap(err, errMakeRequestError)
+		return AccessServiceTokenUpdateResponse{}, err
 	}
 
 	var accessServiceTokenUpdate AccessServiceTokensUpdateDetailResponse
@@ -202,7 +202,7 @@ func (api *API) deleteAccessServiceToken(ctx context.Context, id, uuid string, r
 
 	res, err := api.makeRequestContext(ctx, http.MethodDelete, uri, nil)
 	if err != nil {
-		return AccessServiceTokenUpdateResponse{}, errors.Wrap(err, errMakeRequestError)
+		return AccessServiceTokenUpdateResponse{}, err
 	}
 
 	var accessServiceTokenUpdate AccessServiceTokensUpdateDetailResponse

diff --git a/account_members.go b/account_members.go
@@ -77,7 +77,7 @@ func (api *API) AccountMembers(ctx context.Context, accountID string, pageOpts P
 
 	res, err := api.makeRequestContext(ctx, http.MethodGet, uri, nil)
 	if err != nil {
-		return []AccountMember{}, ResultInfo{}, errors.Wrap(err, errMakeRequestError)
+		return []AccountMember{}, ResultInfo{}, err
 	}
 
 	var accountMemberListresponse AccountMembersListResponse
@@ -105,7 +105,7 @@ func (api *API) CreateAccountMember(ctx context.Context, accountID string, email
 	}
 	res, err := api.makeRequestContext(ctx, http.MethodPost, uri, newMember)
 	if err != nil {
-		return AccountMember{}, errors.Wrap(err, errMakeRequestError)
+		return AccountMember{}, err
 	}
 
 	var accountMemberListResponse AccountMemberDetailResponse
@@ -129,7 +129,7 @@ func (api *API) DeleteAccountMember(ctx context.Context, accountID string, userI
 
 	_, err := api.makeRequestContext(ctx, http.MethodDelete, uri, nil)
 	if err != nil {
-		return errors.Wrap(err, errMakeRequestError)
+		return err
 	}
 
 	return nil
@@ -147,7 +147,7 @@ func (api *API) UpdateAccountMember(ctx context.Context, accountID string, userI
 
 	res, err := api.makeRequestContext(ctx, http.MethodPut, uri, member)
 	if err != nil {
-		return AccountMember{}, errors.Wrap(err, errMakeRequestError)
+		return AccountMember{}, err
 	}
 
 	var accountMemberListResponse AccountMemberDetailResponse
@@ -175,7 +175,7 @@ func (api *API) AccountMember(ctx context.Context, accountID string, memberID st
 
 	res, err := api.makeRequestContext(ctx, http.MethodGet, uri, nil)
 	if err != nil {
-		return AccountMember{}, errors.Wrap(err, errMakeRequestError)
+		return AccountMember{}, err
 	}
 
 	var accountMemberResponse AccountMemberDetailResponse