From fc3dec4a5828456115a94df836be8b2dbc99a7e1 Mon Sep 17 00:00:00 2001
From: jonathan gold <jgold@stripe.com>
Date: Thu, 3 Jun 2021 10:56:31 -0700
Subject: [PATCH] Change signature of `NewHTTPClient` to accomodate errors

---
 pkg/cmd/factory/default.go   | 2 +-
 pkg/cmd/factory/http.go      | 4 ++--
 pkg/cmd/factory/http_test.go | 3 ++-
 pkg/cmd/root/root.go         | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkg/cmd/factory/default.go b/pkg/cmd/factory/default.go
index eec60bc56..a6bb0d950 100644
--- a/pkg/cmd/factory/default.go
+++ b/pkg/cmd/factory/default.go
@@ -82,7 +82,7 @@ func httpClientFunc(f *cmdutil.Factory, appVersion string) func() (*http.Client,
 		if err != nil {
 			return nil, err
 		}
-		return NewHTTPClient(io, cfg, appVersion, true), nil
+		return NewHTTPClient(io, cfg, appVersion, true)
 	}
 }
 
diff --git a/pkg/cmd/factory/http.go b/pkg/cmd/factory/http.go
index 23534a0d3..48f63e8ad 100644
--- a/pkg/cmd/factory/http.go
+++ b/pkg/cmd/factory/http.go
@@ -57,7 +57,7 @@ type configGetter interface {
 }
 
 // generic authenticated HTTP client for commands
-func NewHTTPClient(io *iostreams.IOStreams, cfg configGetter, appVersion string, setAccept bool) *http.Client {
+func NewHTTPClient(io *iostreams.IOStreams, cfg configGetter, appVersion string, setAccept bool) (*http.Client, error) {
 	var opts []api.ClientOption
 	if verbose := os.Getenv("DEBUG"); verbose != "" {
 		logTraffic := strings.Contains(verbose, "api")
@@ -98,7 +98,7 @@ func NewHTTPClient(io *iostreams.IOStreams, cfg configGetter, appVersion string,
 		)
 	}
 
-	return api.NewHTTPClient(opts...)
+	return api.NewHTTPClient(opts...), nil
 }
 
 func getHost(r *http.Request) string {
diff --git a/pkg/cmd/factory/http_test.go b/pkg/cmd/factory/http_test.go
index 6172d846c..ae4096594 100644
--- a/pkg/cmd/factory/http_test.go
+++ b/pkg/cmd/factory/http_test.go
@@ -135,7 +135,8 @@ func TestNewHTTPClient(t *testing.T) {
 			})
 
 			io, _, _, stderr := iostreams.Test()
-			client := NewHTTPClient(io, tt.args.config, tt.args.appVersion, tt.args.setAccept)
+			client, err := NewHTTPClient(io, tt.args.config, tt.args.appVersion, tt.args.setAccept)
+			require.NoError(t, err)
 
 			req, err := http.NewRequest("GET", ts.URL, nil)
 			req.Host = tt.host
diff --git a/pkg/cmd/root/root.go b/pkg/cmd/root/root.go
index 7876eb1f9..77174c71d 100644
--- a/pkg/cmd/root/root.go
+++ b/pkg/cmd/root/root.go
@@ -120,6 +120,6 @@ func bareHTTPClient(f *cmdutil.Factory, version string) func() (*http.Client, er
 		if err != nil {
 			return nil, err
 		}
-		return factory.NewHTTPClient(f.IOStreams, cfg, version, false), nil
+		return factory.NewHTTPClient(f.IOStreams, cfg, version, false)
 	}
 }