When calling httpclient.New without any options return a new client with default configuration (#1312)

* When calling httpclient.New without any options return a new client with default configuration.

* fix tests

* test that we do not return the default http client or transport

Author: DanCech

backend/httpclient/http_client.go

@@ -14,17 +14,12 @@ import (
 )
 
 // New creates a new http.Client.
-// If opts is nil the http.DefaultClient will be returned.
 // If no middlewares are provided the DefaultMiddlewares will be used. If you
 // provide middlewares you have to manually add the DefaultMiddlewares for it to be
 // enabled.
 // Note: Middlewares will be executed in the same order as provided.
 // Note: If more than one Options is provided a panic is raised.
 func New(opts ...Options) (*http.Client, error) {
-	if opts == nil {
-		return http.DefaultClient, nil
-	}
-
 	clientOpts := createOptions(opts...)
 	transport, err := GetTransport(clientOpts)
 	if err != nil {

backend/httpclient/http_client_test.go

@@ -10,13 +10,27 @@ import (
 )
 
 func TestNewClient(t *testing.T) {
-	t.Run("New() without any opts should return http.DefaultClient", func(t *testing.T) {
+	t.Run("New() without any opts should return expected http client and middlewares", func(t *testing.T) {
 		client, err := New()
 		require.NoError(t, err)
-		require.Same(t, http.DefaultClient, client)
+		require.NotNil(t, client)
+		require.NotSame(t, http.DefaultClient, client)
+
+		require.Equal(t, 30*time.Second, client.Timeout)
+		require.NotSame(t, &http.DefaultTransport, &client.Transport)
+	})
+
+	t.Run("New() with opts and no middlewares specified should return expected http client and middlewares", func(t *testing.T) {
+		client, err := New(Options{})
+		require.NoError(t, err)
+		require.NotNil(t, client)
+		require.NotSame(t, http.DefaultClient, client)
+
+		require.Equal(t, 30*time.Second, client.Timeout)
+		require.NotSame(t, &http.DefaultTransport, &client.Transport)
 	})
 
-	t.Run("New() with opts and no middleware should return expected http client and transport", func(t *testing.T) {
+	t.Run("New() with opts and empty middlewares should return expected http client and transport", func(t *testing.T) {
 		client, err := New(Options{
 			Timeouts: &TimeoutOptions{
 				Timeout:               time.Second,
@@ -35,6 +49,7 @@ func TestNewClient(t *testing.T) {
 		require.NotNil(t, client)
 		require.Equal(t, time.Second, client.Timeout)
 
+		// this only works when there are no middlewares, otherwise the transport is wrapped
 		transport, ok := client.Transport.(*http.Transport)
 		require.True(t, ok)
 		require.NotNil(t, transport)