fix: create client in config along with transport (#30)

Author: cristiGuranIonos

shared/configuration.go

@@ -9,6 +9,7 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	"fmt"
+	"net"
 	"net/http"
 	"net/url"
 	"os"
@@ -179,6 +180,7 @@ func NewConfigurationFromOptions(clientOptions ClientOptions) *Configuration {
 		WaitTime:           defaultWaitTime,
 		Servers:            ServerConfigurations{},
 		OperationServers:   map[string]ServerConfigurations{},
+		HTTPClient:         http.DefaultClient,
 	}
 	if clientOptions.Endpoint != "" {
 		cfg.Servers = ServerConfigurations{
@@ -188,15 +190,30 @@ func NewConfigurationFromOptions(clientOptions ClientOptions) *Configuration {
 			},
 		}
 	}
-	if clientOptions.SkipTLSVerify {
-		if transport, ok := cfg.HTTPClient.Transport.(*http.Transport); ok {
-			transport.TLSClientConfig.InsecureSkipVerify = clientOptions.SkipTLSVerify
-		}
+	cfg.HTTPClient.Transport = CreateTransport(clientOptions.SkipTLSVerify, clientOptions.Certificate)
+	return cfg
+}
+
+func CreateTransport(insecure bool, certificate string) *http.Transport {
+	dialer := &net.Dialer{
+		Timeout:   30 * time.Second,
+		KeepAlive: 30 * time.Second,
 	}
-	if clientOptions.Certificate != "" {
-		AddCertsToClient(cfg.HTTPClient, clientOptions.Certificate)
+	transport := &http.Transport{
+		Proxy:                 http.ProxyFromEnvironment,
+		DialContext:           dialer.DialContext,
+		DisableKeepAlives:     true,
+		IdleConnTimeout:       30 * time.Second,
+		TLSHandshakeTimeout:   15 * time.Second,
+		ExpectContinueTimeout: 1 * time.Second,
+		MaxIdleConnsPerHost:   3,
+		MaxConnsPerHost:       3,
 	}
-	return cfg
+	transport.TLSClientConfig = &tls.Config{InsecureSkipVerify: insecure}
+	if certificate != "" {
+		transport.TLSClientConfig.RootCAs = AddCertsToClient(certificate)
+	}
+	return transport
 }
 
 func NewConfigurationFromEnv() *Configuration {
@@ -394,15 +411,13 @@ func SetSkipTLSVerify(configProvider ConfigProvider, skipTLSVerify bool) {
 }
 
 // AddCertsToClient adds certificates to the http client
-func AddCertsToClient(httpClient *http.Client, authorityData string) {
+func AddCertsToClient(authorityData string) *x509.CertPool {
 	rootCAs, _ := x509.SystemCertPool()
 	if rootCAs == nil {
 		rootCAs = x509.NewCertPool()
 	}
 	if ok := rootCAs.AppendCertsFromPEM([]byte(authorityData)); !ok && SdkLogLevel.Satisfies(Debug) {
 		SdkLogger.Printf("No certs appended, using system certs only")
 	}
-	if transport, ok := httpClient.Transport.(*http.Transport); ok {
-		transport.TLSClientConfig.RootCAs = rootCAs
-	}
+	return rootCAs
 }

shared/configuration_test.go

@@ -0,0 +1,141 @@
+package shared
+
+import (
+	"crypto/tls"
+	"github.com/stretchr/testify/assert"
+	"net/http"
+	"testing"
+)
+
+const testEndpoint = "https://test.endpoint"
+
+func TestNewConfigurationFromOptions(t *testing.T) {
+	tests := []struct {
+		name           string
+		clientOptions  ClientOptions
+		expectedConfig *Configuration
+	}{
+		{
+			name: "ValidOptions",
+			clientOptions: ClientOptions{
+				Endpoint:      testEndpoint,
+				SkipTLSVerify: true,
+				Certificate:   "",
+				Credentials: Credentials{
+					Username: "testUser",
+					Password: "testPass",
+					Token:    "testToken",
+				},
+			},
+			expectedConfig: &Configuration{
+				Username: "testUser",
+				Password: "testPass",
+				Token:    "testToken",
+				Servers: ServerConfigurations{
+					{
+						URL:         testEndpoint,
+						Description: "Production",
+					},
+				},
+				HTTPClient: &http.Client{
+					Transport: &http.Transport{
+						TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
+					},
+				},
+			},
+		},
+		{
+			name: "EmptyEndpoint",
+			clientOptions: ClientOptions{
+				SkipTLSVerify: true,
+				Certificate:   "",
+				Credentials: Credentials{
+					Username: "testUser",
+					Password: "testPass",
+					Token:    "testToken",
+				},
+			},
+			expectedConfig: &Configuration{
+				Username: "testUser",
+				Password: "testPass",
+				Token:    "testToken",
+				Servers:  ServerConfigurations{},
+				HTTPClient: &http.Client{
+					Transport: &http.Transport{
+						TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
+					},
+				},
+			},
+		},
+		{
+			name: "NoCredentials",
+			clientOptions: ClientOptions{
+				Endpoint:      testEndpoint,
+				SkipTLSVerify: true,
+				Certificate:   "",
+			},
+			expectedConfig: &Configuration{
+				Username: "",
+				Password: "",
+				Token:    "",
+				Servers: ServerConfigurations{
+					{
+						URL:         testEndpoint,
+						Description: "Production",
+					},
+				},
+				HTTPClient: &http.Client{
+					Transport: &http.Transport{
+						TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
+					},
+				},
+			},
+		},
+		{
+			name: "AddCertificate",
+			clientOptions: ClientOptions{
+				Endpoint:      testEndpoint,
+				SkipTLSVerify: true,
+				Certificate:   "testCertData",
+				Credentials: Credentials{
+					Username: "testUser",
+					Password: "testPass",
+					Token:    "testToken",
+				},
+			},
+			expectedConfig: &Configuration{
+				Username: "testUser",
+				Password: "testPass",
+				Token:    "testToken",
+				Servers: ServerConfigurations{
+					{
+						URL:         testEndpoint,
+						Description: "Production",
+					},
+				},
+				HTTPClient: &http.Client{
+					Transport: &http.Transport{
+						TLSClientConfig: &tls.Config{
+							InsecureSkipVerify: true,
+							RootCAs:            AddCertsToClient("testCertData"),
+						},
+					},
+				},
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			config := NewConfigurationFromOptions(tt.clientOptions)
+			assert.Equal(t, tt.expectedConfig.Username, config.Username)
+			assert.Equal(t, tt.expectedConfig.Password, config.Password)
+			assert.Equal(t, tt.expectedConfig.Token, config.Token)
+			assert.Equal(t, tt.expectedConfig.Servers, config.Servers)
+			assert.NotNil(t, config.HTTPClient)
+			assert.Equal(t, tt.expectedConfig.HTTPClient.Transport.(*http.Transport).TLSClientConfig.InsecureSkipVerify,
+				config.HTTPClient.Transport.(*http.Transport).TLSClientConfig.InsecureSkipVerify)
+			assert.True(t, config.HTTPClient.Transport.(*http.Transport).TLSClientConfig.RootCAs.Equal(tt.expectedConfig.HTTPClient.Transport.(*http.Transport).TLSClientConfig.RootCAs))
+		})
+	}
+}