Merge pull request #780 from CircleCI-Public/nr/feat/EXT-307/fix-cust…

…om-certs-w-tls

[EXT-307] Clone default transport to ignore bad certs & update GraphQL client to use custom HTTP Client

api/graphql/client.go

@@ -29,7 +29,7 @@ type Client struct {
 // NewClient returns a reference to a Client.
 func NewClient(httpClient *http.Client, host, endpoint, token string, debug bool) *Client {
 	return &Client{
-		httpClient: http.DefaultClient,
+		httpClient: httpClient,
 		Endpoint:   endpoint,
 		Host:       host,
 		Token:      token,

settings/settings.go

@@ -223,15 +223,17 @@ func (cfg *Config) WithHTTPClient() error {
 		tlsConfig.RootCAs = pool
 	}
 
+	// clone default http transport to retain default transport config values
+	customTransport := http.DefaultTransport.(*http.Transport).Clone()
+	customTransport.ExpectContinueTimeout = time.Second
+	customTransport.IdleConnTimeout = 90 * time.Second
+	customTransport.MaxIdleConns = 10
+	customTransport.TLSHandshakeTimeout = 10 * time.Second
+	customTransport.TLSClientConfig = tlsConfig
+
 	cfg.HTTPClient = &http.Client{
-		Timeout: 60 * time.Second,
-		Transport: &http.Transport{
-			ExpectContinueTimeout: 1 * time.Second,
-			IdleConnTimeout:       90 * time.Second,
-			MaxIdleConns:          10,
-			TLSHandshakeTimeout:   10 * time.Second,
-			TLSClientConfig:       tlsConfig,
-		},
+		Timeout:   60 * time.Second,
+		Transport: customTransport,
 	}
 
 	return nil