use a default timeout on requests that don't specify one

This behavior was inadvertently lost in
e282fb3, but is restored here, while
still allowing for per-request timeouts to be specified.

Author: ewollesen

client/client.go

@@ -10,6 +10,7 @@ import (
 	"net/url"
 	"reflect"
 	"strings"
+	"time"
 	"unicode/utf8"
 
 	"github.com/tidepool-org/platform/errors"
@@ -35,6 +36,9 @@ type Client struct {
 	address             string
 	userAgent           string
 	errorResponseParser ErrorResponseParser
+
+	// DefaultRequestTimeout applies to requests whose context doesn't include a timeout.
+	DefaultRequestTimeout time.Duration
 }
 
 func New(cfg *Config) (*Client, error) {
@@ -49,12 +53,15 @@ func NewWithErrorParser(cfg *Config, errorResponseParser ErrorResponseParser) (*
 	}
 
 	return &Client{
-		address:             cfg.Address,
-		userAgent:           cfg.UserAgent,
-		errorResponseParser: errorResponseParser,
+		address:               cfg.Address,
+		userAgent:             cfg.UserAgent,
+		errorResponseParser:   errorResponseParser,
+		DefaultRequestTimeout: DefaultRequestTimeout,
 	}, nil
 }
 
+const DefaultRequestTimeout = time.Minute
+
 func (c *Client) ConstructURL(paths ...string) string {
 	segments := []string{}
 	for _, path := range paths {
@@ -92,6 +99,12 @@ func (c *Client) RequestStreamWithHTTPClient(ctx context.Context, method string,
 		return nil, err
 	}
 
+	if _, ok := ctx.Deadline(); !ok {
+		toCtx, cancel := context.WithTimeout(ctx, c.DefaultRequestTimeout)
+		defer cancel()
+		ctx = toCtx
+	}
+
 	res, err := httpClient.Do(req)
 	if err != nil {
 		return nil, errors.Wrapf(err, "unable to perform request to %s %s", method, url)