Merge branch 'master' into master

api/rest/client.go

@@ -12,6 +12,7 @@ import (
 	"time"
 
 	"github.com/CircleCI-Public/circleci-cli/api/header"
+	"github.com/CircleCI-Public/circleci-cli/settings"
 	"github.com/CircleCI-Public/circleci-cli/version"
 )
 
@@ -21,19 +22,22 @@ type Client struct {
 	client      *http.Client
 }
 
-func New(host, endpoint, circleToken string) *Client {
+func New(host string, config *settings.Config) *Client {
 	// Ensure endpoint ends with a slash
+	endpoint := config.RestEndpoint
 	if !strings.HasSuffix(endpoint, "/") {
 		endpoint += "/"
 	}
 
 	u, _ := url.Parse(host)
+
+	client := config.HTTPClient
+	client.Timeout = 10 * time.Second
+
 	return &Client{
 		baseURL:     u.ResolveReference(&url.URL{Path: endpoint}),
-		circleToken: circleToken,
-		client: &http.Client{
-			Timeout: 10 * time.Second,
-		},
+		circleToken: config.Token,
+		client:      client,
 	}
 }
 

api/rest/client_test.go

@@ -12,6 +12,7 @@ import (
 	"gotest.tools/v3/assert"
 	"gotest.tools/v3/assert/cmp"
 
+	"github.com/CircleCI-Public/circleci-cli/settings"
 	"github.com/CircleCI-Public/circleci-cli/version"
 )
 
@@ -167,5 +168,13 @@ func (f *fixture) Run(statusCode int, respBody string) (c *Client, cleanup func(
 	})
 	server := httptest.NewServer(mux)
 
-	return New(server.URL, "api/v2", "fake-token"), server.Close
+	cfg := &settings.Config{
+		Debug:        false,
+		Token:        "fake-token",
+		RestEndpoint: "api/v2",
+		Endpoint:     "api/v2",
+		HTTPClient:   http.DefaultClient,
+	}
+
+	return New(server.URL, cfg), server.Close
 }

api/runner/runner_test.go

@@ -14,6 +14,7 @@ import (
 	"gotest.tools/v3/assert/cmp"
 
 	"github.com/CircleCI-Public/circleci-cli/api/rest"
+	"github.com/CircleCI-Public/circleci-cli/settings"
 	"github.com/CircleCI-Public/circleci-cli/version"
 )
 
@@ -489,5 +490,13 @@ func (f *fixture) Run(statusCode int, respBody string) (r *Runner, cleanup func(
 	})
 	server := httptest.NewServer(mux)
 
-	return New(rest.New(server.URL, "api/v2", "fake-token")), server.Close
+	cfg := &settings.Config{
+		Debug:        false,
+		Token:        "fake-token",
+		RestEndpoint: "api/v2",
+		Endpoint:     "api/v2",
+		HTTPClient:   http.DefaultClient,
+	}
+
+	return New(rest.New(server.URL, cfg)), server.Close
 }