Tidied up timeout

Author: bobbyjameswilliams

httpclient/client.go

@@ -17,6 +17,8 @@ import (
 	"go.uber.org/zap"
 )
 
+const DefaultTimeout time.Duration = 5 * time.Second
+
 // Master struct/object
 type Client struct {
 	config      *ClientConfig
@@ -105,6 +107,12 @@ func (c *ClientConfig) Build() (*Client, error) {
 
 	httpClient := c.HTTP
 
+	if c.CustomTimeout == 0 {
+		c.CustomTimeout = DefaultTimeout
+	}
+
+	httpClient.Timeout = c.CustomTimeout
+
 	cookieJar, err := cookiejar.New(nil)
 	if err != nil {
 		return nil, err
@@ -127,6 +135,8 @@ func (c *ClientConfig) Build() (*Client, error) {
 		)
 	}
 
+
+
 	client := &Client{
 		Integration: &c.Integration,
 		http:        &httpClient,

httpclient/request.go

@@ -272,10 +272,6 @@ func (c *Client) request(ctx context.Context, method, endpoint string, body inte
 
 	req = req.WithContext(ctx)
 
-	// TEMPORARY HARD CODED TIMEOUT
-	c.http.Timeout = 5 * time.Second
-	////////////////////////////////
-
 	resp, err := c.http.Do(req)
 	if err != nil {
 		c.Sugar.Error("Failed to send request", zap.String("method", method), zap.String("endpoint", endpoint), zap.Error(err))