refactor buildTransport to match incoming changes

Author: peterguy

internal/api/api.go

@@ -90,36 +90,33 @@ type ClientOpts struct {
 }
 
 func buildTransport(opts ClientOpts, flags *Flags) http.RoundTripper {
-	transport := http.DefaultTransport.(*http.Transport).Clone()
+	var transport http.RoundTripper
+	{
+		tp := http.DefaultTransport.(*http.Transport).Clone()
 
-	if flags.insecureSkipVerify != nil && *flags.insecureSkipVerify {
-		transport.TLSClientConfig = &tls.Config{InsecureSkipVerify: true}
-	}
+		if flags.insecureSkipVerify != nil && *flags.insecureSkipVerify {
+			tp.TLSClientConfig = &tls.Config{InsecureSkipVerify: true}
+		}
 
-	if transport.TLSClientConfig == nil {
-		transport.TLSClientConfig = &tls.Config{}
-	}
+		if tp.TLSClientConfig == nil {
+			tp.TLSClientConfig = &tls.Config{}
+		}
 
-	if opts.ProxyPath != "" || opts.ProxyURL != nil {
-		// Use our custom dialer for proxied connections.
-		// A custom dialer is not always needed - the connection libraries will handle HTTP(S)_PROXY-defined proxies
-		// (Go supports http, https, socks5, and socks5h proxies via HTTP(S)_PROXY),
-		// but we're also supporting proxies defined via SRC_PROXY, which can include UDS proxies,
-		// and connecting to TLS-enabled proxies adds an additional wrinkle when using HTTP/2.
-		transport = withProxyTransport(transport, opts.ProxyURL, opts.ProxyPath)
-	}
+		if opts.ProxyPath != "" || opts.ProxyURL != nil {
+			tp = withProxyTransport(transport, opts.ProxyURL, opts.ProxyPath)
+		}
 
-	// For http:// and socks5:// proxies, the cloned
-	// transport's default Proxy handles them correctly without intervention.
+		transport = tp
+	}
 
-	var rt http.RoundTripper = transport
+	// not we do not fail here if requireAccessToken is true, because that would
+	// mean returning an error on construction which we want to avoid for now
+	// TODO(burmudar): allow returning of an error upon client construction
 	if opts.AccessToken == "" && opts.OAuthToken != nil {
-		rt = &oauth.Transport{
-			Base:  transport,
-			Token: opts.OAuthToken,
-		}
+		transport = oauth.NewTransport(transport, opts.OAuthToken)
 	}
-	return rt
+
+	return transport
 }
 
 // NewClient creates a new API client.