refactor!: allow providing custom http.Client (#23)

banzaicloud · Apr 14, 2023 · 104c0f4 · 104c0f4
1 parent 2be922e
commit 104c0f4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/pkg/client/client.go b/pkg/client/client.go
@@ -137,18 +137,17 @@ func NewClient(opts *Config) (*Client, error) {
 	// 	Jar:       jar,
 	// 	Timeout:   0,
 	// }
-	transport := http.DefaultTransport
-	if opts.Transport != nil {
-		transport = opts.Transport
-	}
 
-	client.httpClient = &http.Client{
-		Transport: transport,
+	client.httpClient = opts.HTTPClient
+	if client.httpClient == nil {
+		client.httpClient = &http.Client{
+			Transport: http.DefaultTransport,
+		}
 	}
 
-	serverURL := DefaultServerURL
-	if opts.ServerURL != "" {
-		serverURL = opts.ServerURL
+	serverURL := opts.ServerURL
+	if serverURL == "" {
+		serverURL = DefaultServerURL
 	}
 	if !strings.HasSuffix(serverURL, "/") {
 		serverURL += "/"

diff --git a/pkg/client/config.go b/pkg/client/config.go
@@ -39,7 +39,8 @@ type Config struct {
 	Password    string
 	AccessToken string
 	UserAgent   string
-	Transport   http.RoundTripper
+
+	HTTPClient *http.Client
 }
 
 func (c *Config) ReadFromEnvironment() {