OMG-25427 - Set SHIPPO-ACCOUNT-ID header

.gitignore

@@ -1,2 +1,3 @@
 /pkg/
-/vendor/
+/vendor/
+.idea

client/carrier_account.go

@@ -21,13 +21,13 @@ func (c *Client) CreateCarrierAccount(input *models.CarrierAccountInput) (*model
 }
 
 // RetrieveCarrierAccount retrieves an existing carrier account by object id.
-func (c *Client) RetrieveCarrierAccount(objectID string) (*models.CarrierAccount, error) {
+func (c *Client) RetrieveCarrierAccount(objectID string, shippoSubAccountID string) (*models.CarrierAccount, error) {
 	if objectID == "" {
 		return nil, errors.New("Empty object ID")
 	}
 
 	output := &models.CarrierAccount{}
-	err := c.do(http.MethodGet, "/carrier_accounts/"+objectID, nil, output)
+	err := c.do(http.MethodGet, "/carrier_accounts/"+objectID, &models.ShippoSubAccount{ShippoSubAccountID: shippoSubAccountID}, output)
 	return output, err
 }
 

client/client.go

@@ -104,13 +104,6 @@ func (c *Client) createRequest(method, url string, bodyObject interface{}) (req
 				return
 			}
 
-			headers := []string{}
-			for hk, hva := range req.Header {
-				for _, hv := range hva {
-					headers = append(headers, fmt.Sprintf("%s=%s", hk, hv))
-				}
-			}
-
 			body := ""
 			if reqBodyDebug != nil {
 				body = string(reqBodyDebug)
@@ -121,7 +114,10 @@ func (c *Client) createRequest(method, url string, bodyObject interface{}) (req
 		}()
 	}
 
-	var reqBody io.Reader
+	var (
+		reqBody   io.Reader
+		subAcctID string
+	)
 	if bodyObject != nil {
 		data, err := json.Marshal(bodyObject)
 		if err != nil {
@@ -131,6 +127,21 @@ func (c *Client) createRequest(method, url string, bodyObject interface{}) (req
 		reqBodyDebug = data
 
 		reqBody = bytes.NewBuffer(data)
+
+		switch v := bodyObject.(type) {
+		case models.CarrierAccountInput:
+			subAcctID = v.ShippoSubAccountID
+		case models.RefundInput:
+			subAcctID = v.ShippoSubAccountID
+		case models.ShipmentInput:
+			subAcctID = v.ShippoSubAccountID
+		case models.ShippoSubAccount:
+			subAcctID = v.ShippoSubAccountID
+		case models.TrackingStatusInput:
+			subAcctID = v.ShippoSubAccountID
+		case models.TransactionInput:
+			subAcctID = v.ShippoSubAccountID
+		}
 	}
 
 	req, err = http.NewRequest(method, url, reqBody)
@@ -149,6 +160,14 @@ func (c *Client) createRequest(method, url string, bodyObject interface{}) (req
 	req.Header.Set("Connection", "close")
 	req.Close = true
 
+	// If a shippo sub account id is present, add it to the request headers
+	if len(subAcctID) > 0 {
+		c.logPrintf("Client.createRequest() setting SHIPPO-ACCOUNT-ID to %q", subAcctID)
+		req.Header.Set("SHIPPO-ACCOUNT-ID", subAcctID)
+	} else {
+		c.logPrintf("Client.createRequest() NOT setting SHIPPO-ACCOUNT-ID")
+	}
+
 	return req, nil
 }
 

client/shipment.go

@@ -62,13 +62,13 @@ func (c *Client) CreateShipment(input *models.ShipmentInput) (*models.Shipment,
 }
 
 // RetrieveShipment retrieves an existing shipment by object id.
-func (c *Client) RetrieveShipment(objectID string) (*models.Shipment, error) {
+func (c *Client) RetrieveShipment(objectID string, shippoSubAccountID string) (*models.Shipment, error) {
 	if objectID == "" {
 		return nil, errors.New("Empty object ID")
 	}
 
 	output := &models.Shipment{}
-	err := c.do(http.MethodGet, "/shipments/"+objectID, nil, output)
+	err := c.do(http.MethodGet, "/shipments/"+objectID, &models.ShippoSubAccount{ShippoSubAccountID: shippoSubAccountID}, output)
 	return output, err
 }
 

client/tracking_status.go

@@ -8,7 +8,7 @@ import (
 )
 
 // GetTrackingUpdate requests the tracking status of a shipment.
-func (c *Client) GetTrackingUpdate(carrier, trackingNumber string) (*models.TrackingStatus, error) {
+func (c *Client) GetTrackingUpdate(carrier, trackingNumber string, shippoSubAccountID string) (*models.TrackingStatus, error) {
 	if carrier == "" {
 		return nil, errors.New("Empty carrier")
 	}
@@ -17,14 +17,14 @@ func (c *Client) GetTrackingUpdate(carrier, trackingNumber string) (*models.Trac
 	}
 
 	output := &models.TrackingStatus{}
-	err := c.do(http.MethodGet, "/tracks/"+carrier+"/"+trackingNumber, nil, output)
+	err := c.do(http.MethodGet, "/tracks/"+carrier+"/"+trackingNumber, &models.ShippoSubAccount{ShippoSubAccountID: shippoSubAccountID}, output)
 	return output, err
 }
 
 // RegisterTrackingWebhook registers a tracking webhook.
 // TODO: documentation on this API endpoint is not clear.
 // https://goshippo.com/docs/reference#tracks-create
-func (c *Client) RegisterTrackingWebhook(carrier, trackingNumber, metadata string) (*models.TrackingStatus, error) {
+func (c *Client) RegisterTrackingWebhook(carrier, trackingNumber, metadata string, shippoSubAccountID string) (*models.TrackingStatus, error) {
 	if carrier == "" {
 		return nil, errors.New("Empty carrier")
 	}
@@ -34,9 +34,10 @@ func (c *Client) RegisterTrackingWebhook(carrier, trackingNumber, metadata strin
 
 	output := &models.TrackingStatus{}
 	err := c.do(http.MethodPost, "/tracks/", &models.TrackingStatusInput{
-		Carrier:        carrier,
-		TrackingNumber: trackingNumber,
-		Metadata:       metadata,
+		Carrier:            carrier,
+		TrackingNumber:     trackingNumber,
+		Metadata:           metadata,
+		ShippoSubAccountID: shippoSubAccountID,
 	}, output)
 	return output, err
 }

client/transaction.go

@@ -20,13 +20,13 @@ func (c *Client) PurchaseShippingLabel(input *models.TransactionInput) (*models.
 }
 
 // RetrieveTransaction retrieves an existing transaction by object id.
-func (c *Client) RetrieveTransaction(objectID string) (*models.Transaction, error) {
+func (c *Client) RetrieveTransaction(objectID string, shippoSubAccountID string) (*models.Transaction, error) {
 	if objectID == "" {
 		return nil, errors.New("Empty object ID")
 	}
 
 	output := &models.Transaction{}
-	err := c.do(http.MethodGet, "/transactions/"+objectID, nil, output)
+	err := c.do(http.MethodGet, "/transactions/"+objectID, &models.ShippoSubAccount{ShippoSubAccountID: shippoSubAccountID}, output)
 	return output, err
 }
 

models/carrier_account.go

@@ -2,10 +2,11 @@ package models
 
 // See https://goshippo.com/docs/reference#carrier-accounts
 type CarrierAccountInput struct {
-	Carrier    string                 `json:"carrier"`
-	AccountID  string                 `json:"account_id"`
-	Parameters map[string]interface{} `json:"parameters"`
-	Active     bool                   `json:"active"`
+	Carrier            string                 `json:"carrier"`
+	AccountID          string                 `json:"account_id"`
+	Parameters         map[string]interface{} `json:"parameters"`
+	Active             bool                   `json:"active"`
+	ShippoSubAccountID string                 `json:"shippo_sub_account_id,omitempty"`
 }
 
 // See https://goshippo.com/docs/reference#carrier-accounts

models/refund.go

@@ -2,8 +2,9 @@ package models
 
 // See https://goshippo.com/docs/reference#refunds
 type RefundInput struct {
-	Transaction string `json:"transaction"`
-	Async       bool   `json:"async"`
+	Transaction        string `json:"transaction"`
+	Async              bool   `json:"async"`
+	ShippoSubAccountID string `json:"shippo_sub_account_id,omitempty"`
 }
 
 // See https://goshippo.com/docs/reference#refunds

models/shipment.go

@@ -49,6 +49,7 @@ type ShipmentInput struct {
 	Metadata           string         `json:"metadata,omitempty"`
 	Extra              *ShipmentExtra `json:"extra,omitempty"`
 	Async              bool           `json:"async"`
+	ShippoSubAccountID string         `json:"shippo_sub_account_id,omitempty"`
 }
 
 type ShipmentExtra struct {

models/shippo_sub_account.go

@@ -0,0 +1,5 @@
+package models
+
+type ShippoSubAccount struct {
+	ShippoSubAccountID string `json:"shippo_sub_account_id,omitempty"`
+}

models/tracking_status.go

@@ -12,9 +12,10 @@ const (
 
 // See https://goshippo.com/docs/reference#tracks
 type TrackingStatusInput struct {
-	Carrier        string `json:"carrier"`
-	TrackingNumber string `json:"tracking_number"`
-	Metadata       string `json:"metadata,omitempty"`
+	Carrier            string `json:"carrier"`
+	TrackingNumber     string `json:"tracking_number"`
+	Metadata           string `json:"metadata,omitempty"`
+	ShippoSubAccountID string `json:"shippo_subaccount_id,omitempty"`
 }
 
 // See https://goshippo.com/docs/reference#tracks

models/transaction.go

@@ -4,10 +4,11 @@ import "time"
 
 // See https://goshippo.com/docs/reference#transactions
 type TransactionInput struct {
-	Rate          string `json:"rate,omitempty"`
-	Metadata      string `json:"metadata,omitempty"`
-	LabelFileType string `json:"label_file_type"`
-	Async         bool   `json:"async"`
+	Rate               string `json:"rate,omitempty"`
+	Metadata           string `json:"metadata,omitempty"`
+	LabelFileType      string `json:"label_file_type"`
+	Async              bool   `json:"async"`
+	ShippoSubAccountID string `json:"shippo_sub_account_id,omitempty"`
 
 	Shipment         *ShipmentInput `json:"shipment,omitempty"`           // instant call only: https://goshippo.com/docs/reference#transactions-create-instant
 	CarrierAccount   string         `json:"carrier_account,omitempty"`    // instant call only: https://goshippo.com/docs/reference#transactions-create-instant