STACKITGit/cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change signature of NewHTTPClient to accomodate errors

Browse source
This commit is contained in:
jonathan gold 2021-06-03 10:56:31 -07:00
parent c3e6fccabe
commit fc3dec4a58
4 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pkg/cmd/factory/default.go
View file

@ -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)
}
}

4
pkg/cmd/factory/http.go
View file

@ -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 {

3
pkg/cmd/factory/http_test.go
View file

@ -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

2
pkg/cmd/root/root.go
View file

@ -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)
}
}