From 05732ff5c09f6cab0909ee56437a1e822347cce3 Mon Sep 17 00:00:00 2001 From: stikkireddy <54602805+stikkireddy@users.noreply.github.com> Date: Tue, 14 Jul 2020 08:11:37 -0400 Subject: [PATCH] used http.DefaultTransport to inherit system properties for proxy settings and etc. (#172) --- client/service/client.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/client/service/client.go b/client/service/client.go index 28e050a03..7e586c665 100644 --- a/client/service/client.go +++ b/client/service/client.go @@ -119,10 +119,19 @@ func (c *DBApiClientConfig) Setup() { // a transient error on initial creation retryDelayDuration := 10 * time.Second retryMaximumDuration := 5 * time.Minute + // Default transport will inherit from env variables and system settings such as HTTP_PROXY and NO_PROXY + defaultTransport := http.DefaultTransport.(*http.Transport) c.client = &retryablehttp.Client{ HTTPClient: &http.Client{ Timeout: time.Duration(c.TimeoutSeconds) * time.Second, Transport: &http.Transport{ + Proxy: defaultTransport.Proxy, + DialContext: defaultTransport.DialContext, + MaxIdleConns: defaultTransport.MaxIdleConns, + IdleConnTimeout: defaultTransport.IdleConnTimeout, + TLSHandshakeTimeout: defaultTransport.TLSHandshakeTimeout, + ExpectContinueTimeout: defaultTransport.ExpectContinueTimeout, + // TODO: This probably should be a configuration at the provider level and optional and not a fixed val TLSClientConfig: &tls.Config{ InsecureSkipVerify: c.InsecureSkipVerify, },