Change signature of NewHTTPClient to accomodate errors

jgold2-stripe · jgold2-stripe · commit fc3dec4a5828 · 2021-06-25T11:26:21.000-07:00
diff --git 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
@@ -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
@@ -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
@@ -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)
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ func httpClientFunc(f cmdutil.Factory, appVersion string) func() (http.Client,`
`82`	`82`	`if err != nil {`
`83`	`83`	`return nil, err`
`84`	`84`	`}`
`85`		`- return NewHTTPClient(io, cfg, appVersion, true), nil`
	`85`	`+ return NewHTTPClient(io, cfg, appVersion, true)`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ type configGetter interface {`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`// generic authenticated HTTP client for commands`
`60`		`-func NewHTTPClient(io iostreams.IOStreams, cfg configGetter, appVersion string, setAccept bool) http.Client {`
	`60`	`+func NewHTTPClient(io iostreams.IOStreams, cfg configGetter, appVersion string, setAccept bool) (http.Client, error) {`
`61`	`61`	`var opts []api.ClientOption`
`62`	`62`	`if verbose := os.Getenv("DEBUG"); verbose != "" {`
`63`	`63`	`logTraffic := strings.Contains(verbose, "api")`
`@@ -98,7 +98,7 @@ func NewHTTPClient(io *iostreams.IOStreams, cfg configGetter, appVersion string,`
`98`	`98`	`)`
`99`	`99`	`}`
`100`	`100`
`101`		`- return api.NewHTTPClient(opts...)`
	`101`	`+ return api.NewHTTPClient(opts...), nil`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`func getHost(r *http.Request) string {`
Original file line number	Diff line number	Diff line change
`@@ -120,6 +120,6 @@ func bareHTTPClient(f cmdutil.Factory, version string) func() (http.Client, er`
`120`	`120`	`if err != nil {`
`121`	`121`	`return nil, err`
`122`	`122`	`}`
`123`		`- return factory.NewHTTPClient(f.IOStreams, cfg, version, false), nil`
	`123`	`+ return factory.NewHTTPClient(f.IOStreams, cfg, version, false)`
`124`	`124`	`}`
`125`	`125`	`}`