Skip to content

Commit

Permalink
Handle other potentially swallowed errors
Browse files Browse the repository at this point in the history
  • Loading branch information
ScottRudiger committed Mar 9, 2020
1 parent 1b3626b commit 6553e92
Show file tree
Hide file tree
Showing 24 changed files with 94 additions and 29 deletions.
4 changes: 3 additions & 1 deletion Categories.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ func (client *Config) Categories() (*CategoriesResponse, error) {
return nil, err
}
categories := new(CategoriesResponse)
json.Unmarshal(res.([]byte), &categories)
if err := json.Unmarshal(res.([]byte), &categories); err != nil {
return nil, err
}
return categories, nil
}
4 changes: 3 additions & 1 deletion CreateCustomer.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ func (client *Config) CreateCustomer(params CreateCustomerParams) (*CreateCustom
return nil, err
}
customer := new(CreateCustomerResponse)
json.Unmarshal(res.([]byte), &customer)
if err := json.Unmarshal(res.([]byte), &customer); err != nil {
return nil, err
}
return customer, nil
}
4 changes: 3 additions & 1 deletion CreateOrder.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ func (client *Config) CreateOrder(params CreateOrderParams) (*CreateOrderRespons
return nil, err
}
order := new(CreateOrderResponse)
json.Unmarshal(res.([]byte), &order)
if err := json.Unmarshal(res.([]byte), &order); err != nil {
return nil, err
}
return order, nil
}
4 changes: 3 additions & 1 deletion CreateRefund.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ func (client *Config) CreateRefund(params CreateRefundParams) (*CreateRefundResp
return nil, err
}
refund := new(CreateRefundResponse)
json.Unmarshal(res.([]byte), &refund)
if err := json.Unmarshal(res.([]byte), &refund); err != nil {
return nil, err
}
return refund, nil
}
4 changes: 3 additions & 1 deletion DeleteCustomer.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ func (client *Config) DeleteCustomer(customerID string) (*DeleteCustomerResponse
return nil, err
}
customer := new(DeleteCustomerResponse)
json.Unmarshal(res.([]byte), &customer)
if err := json.Unmarshal(res.([]byte), &customer); err != nil {
return nil, err
}
return customer, nil
}
4 changes: 3 additions & 1 deletion DeleteOrder.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ func (client *Config) DeleteOrder(transactionID string, params ...DeleteOrderPar
return nil, err
}
order := new(DeleteOrderResponse)
json.Unmarshal(res.([]byte), &order)
if err := json.Unmarshal(res.([]byte), &order); err != nil {
return nil, err
}
return order, nil
}
4 changes: 3 additions & 1 deletion DeleteRefund.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ func (client *Config) DeleteRefund(transactionID string, params ...DeleteRefundP
return nil, err
}
refund := new(DeleteRefundResponse)
json.Unmarshal(res.([]byte), &refund)
if err := json.Unmarshal(res.([]byte), &refund); err != nil {
return nil, err
}
return refund, nil
}
4 changes: 3 additions & 1 deletion ListCustomers.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ func (client *Config) ListCustomers() (*ListCustomersResponse, error) {
return nil, err
}
customers := new(ListCustomersResponse)
json.Unmarshal(res.([]byte), &customers)
if err := json.Unmarshal(res.([]byte), &customers); err != nil {
return nil, err
}
return customers, nil
}
4 changes: 3 additions & 1 deletion ListOrders.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ func (client *Config) ListOrders(params ListOrdersParams) (*ListOrdersResponse,
return nil, err
}
orders := new(ListOrdersResponse)
json.Unmarshal(res.([]byte), &orders)
if err := json.Unmarshal(res.([]byte), &orders); err != nil {
return nil, err
}
return orders, nil
}
4 changes: 3 additions & 1 deletion ListRefunds.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ func (client *Config) ListRefunds(params ListRefundsParams) (*ListRefundsRespons
return nil, err
}
refunds := new(ListRefundsResponse)
json.Unmarshal(res.([]byte), &refunds)
if err := json.Unmarshal(res.([]byte), &refunds); err != nil {
return nil, err
}
return refunds, nil
}
4 changes: 3 additions & 1 deletion NexusRegions.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ func (client *Config) NexusRegions() (*NexusRegionsResponse, error) {
return nil, err
}
regions := new(NexusRegionsResponse)
json.Unmarshal(res.([]byte), &regions)
if err := json.Unmarshal(res.([]byte), &regions); err != nil {
return nil, err
}
return regions, nil
}
4 changes: 3 additions & 1 deletion RatesForLocation.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ func (client *Config) RatesForLocation(zip string, params ...RatesForLocationPar
return nil, err
}
rate := new(RatesForLocationResponse)
json.Unmarshal(res.([]byte), &rate)
if err := json.Unmarshal(res.([]byte), &rate); err != nil {
return nil, err
}
return rate, nil
}
4 changes: 3 additions & 1 deletion ShowCustomer.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ func (client *Config) ShowCustomer(customerID string) (*ShowCustomerResponse, er
return nil, err
}
customer := new(ShowCustomerResponse)
json.Unmarshal(res.([]byte), &customer)
if err := json.Unmarshal(res.([]byte), &customer); err != nil {
return nil, err
}
return customer, nil
}
4 changes: 3 additions & 1 deletion ShowOrder.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ func (client *Config) ShowOrder(transactionID string, params ...ShowOrderParams)
return nil, err
}
order := new(ShowOrderResponse)
json.Unmarshal(res.([]byte), &order)
if err := json.Unmarshal(res.([]byte), &order); err != nil {
return nil, err
}
return order, nil
}
4 changes: 3 additions & 1 deletion ShowRefund.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ func (client *Config) ShowRefund(transactionID string, params ...ShowRefundParam
return nil, err
}
refund := new(ShowRefundResponse)
json.Unmarshal(res.([]byte), &refund)
if err := json.Unmarshal(res.([]byte), &refund); err != nil {
return nil, err
}
return refund, nil
}
4 changes: 3 additions & 1 deletion SummaryRates.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ func (client *Config) SummaryRates() (*SummaryRatesResponse, error) {
return nil, err
}
summaryRates := new(SummaryRatesResponse)
json.Unmarshal(res.([]byte), &summaryRates)
if err := json.Unmarshal(res.([]byte), &summaryRates); err != nil {
return nil, err
}
return summaryRates, nil
}
4 changes: 3 additions & 1 deletion TaxForOrder.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ func (client *Config) TaxForOrder(params TaxForOrderParams) (*TaxForOrderRespons
return nil, err
}
tax := new(TaxForOrderResponse)
json.Unmarshal(res.([]byte), &tax)
if err := json.Unmarshal(res.([]byte), &tax); err != nil {
return nil, err
}
return tax, nil
}
4 changes: 3 additions & 1 deletion UpdateCustomer.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ func (client *Config) UpdateCustomer(params UpdateCustomerParams) (*UpdateCustom
return nil, err
}
customer := new(UpdateCustomerResponse)
json.Unmarshal(res.([]byte), &customer)
if err := json.Unmarshal(res.([]byte), &customer); err != nil {
return nil, err
}
return customer, nil
}
4 changes: 3 additions & 1 deletion UpdateOrder.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ func (client *Config) UpdateOrder(params UpdateOrderParams) (*UpdateOrderRespons
return nil, err
}
order := new(UpdateOrderResponse)
json.Unmarshal(res.([]byte), &order)
if err := json.Unmarshal(res.([]byte), &order); err != nil {
return nil, err
}
return order, nil
}
4 changes: 3 additions & 1 deletion UpdateRefund.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ func (client *Config) UpdateRefund(params UpdateRefundParams) (*UpdateRefundResp
return nil, err
}
refund := new(UpdateRefundResponse)
json.Unmarshal(res.([]byte), &refund)
if err := json.Unmarshal(res.([]byte), &refund); err != nil {
return nil, err
}
return refund, nil
}
4 changes: 3 additions & 1 deletion Validate.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ func (client *Config) Validate(params ValidateParams) (*ValidateResponse, error)
return nil, err
}
validation := new(ValidateResponse)
json.Unmarshal(res.([]byte), &validation)
if err := json.Unmarshal(res.([]byte), &validation); err != nil {
return nil, err
}
return validation, nil
}
4 changes: 3 additions & 1 deletion ValidateAddress.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ func (client *Config) ValidateAddress(params ValidateAddressParams) (*ValidateAd
return nil, err
}
addresses := new(ValidateAddressResponse)
json.Unmarshal(res.([]byte), &addresses)
if err := json.Unmarshal(res.([]byte), &addresses); err != nil {
return nil, err
}
return addresses, nil
}
30 changes: 24 additions & 6 deletions request.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ import (
)

func (client *Config) get(endpoint string, params interface{}) (interface{}, error) {
req, _ := http.NewRequest("GET", client.url(endpoint), nil)
req, err := http.NewRequest("GET", client.url(endpoint), nil)
if err != nil {
return nil, err
}
if params != nil {
if err := addQueryParams(req, params); err != nil {
return nil, err
Expand All @@ -17,19 +20,34 @@ func (client *Config) get(endpoint string, params interface{}) (interface{}, err
}

func (client *Config) post(endpoint string, params interface{}) (interface{}, error) {
jsonParams, _ := json.Marshal(params)
req, _ := http.NewRequest("POST", client.url(endpoint), bytes.NewBuffer(jsonParams))
jsonParams, err := json.Marshal(params)
if err != nil {
return nil, err
}
req, err := http.NewRequest("POST", client.url(endpoint), bytes.NewBuffer(jsonParams))
if err != nil {
return nil, err
}
return client.sendRequest(req)
}

func (client *Config) put(endpoint string, params interface{}) (interface{}, error) {
jsonParams, _ := json.Marshal(params)
req, _ := http.NewRequest("PUT", client.url(endpoint), bytes.NewBuffer(jsonParams))
jsonParams, err := json.Marshal(params)
if err != nil {
return nil, err
}
req, err := http.NewRequest("PUT", client.url(endpoint), bytes.NewBuffer(jsonParams))
if err != nil {
return nil, err
}
return client.sendRequest(req)
}

func (client *Config) delete(endpoint string, params interface{}) (interface{}, error) {
req, _ := http.NewRequest("DELETE", client.url(endpoint), nil)
req, err := http.NewRequest("DELETE", client.url(endpoint), nil)
if err != nil {
return nil, err
}
if params != nil {
if err := addQueryParams(req, params); err != nil {
return nil, err
Expand Down
5 changes: 4 additions & 1 deletion request_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,10 @@ func (client *Config) sendRequest(req *http.Request) ([]byte, error) {
return nil, err
}
defer res.Body.Close()
body, _ := ioutil.ReadAll(res.Body)
body, err := ioutil.ReadAll(res.Body)
if err != nil {
return nil, err
}
if res.StatusCode >= 400 {
err := new(Error)
json.Unmarshal(body, err)
Expand Down

0 comments on commit 6553e92

Please sign in to comment.