try to no break existing code

Author: jkroepke

core/auth/auth.go

@@ -98,10 +98,18 @@ func DefaultAuth(cfg *config.Configuration) (rt http.RoundTripper, err error) {
 
 // NoAuth configures a flow without authentication and returns an http.RoundTripper
 // that can be used to make unauthenticated requests
-func NoAuth(cfg *config.Configuration) (rt http.RoundTripper, err error) {
+func NoAuth(cfgs ...*config.Configuration) (rt http.RoundTripper, err error) {
 	noAuthConfig := clients.NoAuthFlowConfig{}
 	noAuthRoundTripper := &clients.NoAuthFlow{}
 
+	var cfg *config.Configuration
+
+	if len(cfgs) > 0 {
+		cfg = cfgs[0]
+	} else {
+		cfg = &config.Configuration{}
+	}
+
 	if cfg.HTTPClient == nil {
 		cfg.HTTPClient = &http.Client{
 			Timeout: clients.DefaultClientTimeout,

core/auth/auth_test.go

@@ -669,6 +669,28 @@ func TestKeyAuth(t *testing.T) {
 }
 
 func TestNoAuth(t *testing.T) {
+	for _, test := range []struct {
+		desc string
+	}{
+		{
+			desc: "valid_case",
+		},
+	} {
+		t.Run(test.desc, func(t *testing.T) {
+			setTemporaryHome(t) // Get the default authentication client and ensure that it's not nil
+			authClient, err := NoAuth()
+			if err != nil {
+				t.Fatalf("Test returned error on valid test case: %v", err)
+			}
+
+			if authClient == nil {
+				t.Fatalf("Client returned is nil for valid test case")
+			}
+		})
+	}
+}
+
+func TestNoAuthWithConfig(t *testing.T) {
 	for _, test := range []struct {
 		desc string
 	}{

core/clients/key_flow.go

@@ -53,6 +53,7 @@ type KeyFlowConfig struct {
 	ClientRetry                   *RetryConfig
 	TokenUrl                      string
 	BackgroundTokenRefreshContext context.Context // Functionality is enabled if this isn't nil
+	AuthHTTPClient                *http.Client
 }
 
 // TokenResponseBody is the API response
@@ -116,7 +117,7 @@ func (c *KeyFlow) GetToken() TokenResponseBody {
 	return *c.token
 }
 
-func (c *KeyFlow) Init(cfg *KeyFlowConfig, rt http.RoundTripper) error {
+func (c *KeyFlow) Init(cfg *KeyFlowConfig, rts ...http.RoundTripper) error {
 	// No concurrency at this point, so no mutex check needed
 	c.token = &TokenResponseBody{}
 	c.config = cfg
@@ -125,14 +126,24 @@ func (c *KeyFlow) Init(cfg *KeyFlowConfig, rt http.RoundTripper) error {
 		c.config.TokenUrl = tokenAPI
 	}
 
+	var rt http.RoundTripper
+	if len(rts) > 0 {
+		rt = rts[0]
+	}
+
 	if rt == nil {
 		rt = http.DefaultTransport
 	}
 
 	c.rt = rt
-	c.authClient = &http.Client{
-		Transport: rt,
-		Timeout:   DefaultClientTimeout,
+
+	if cfg.AuthHTTPClient != nil {
+		c.authClient = cfg.AuthHTTPClient
+	} else {
+		c.authClient = &http.Client{
+			Transport: rt,
+			Timeout:   DefaultClientTimeout,
+		}
 	}
 
 	err := c.validate()

core/clients/key_flow_test.go

@@ -114,7 +114,7 @@ func TestKeyFlowInit(t *testing.T) {
 			}
 
 			cfg.ServiceAccountKey = tt.serviceAccountKey
-			if err := c.Init(cfg, http.DefaultTransport); (err != nil) != tt.wantErr {
+			if err := c.Init(cfg); (err != nil) != tt.wantErr {
 				t.Errorf("KeyFlow.Init() error = %v, wantErr %v", err, tt.wantErr)
 			}
 			if c.config == nil {

core/clients/no_auth_flow.go

@@ -24,9 +24,14 @@ func (c *NoAuthFlow) GetConfig() NoAuthFlowConfig {
 	return *c.config
 }
 
-func (c *NoAuthFlow) Init(_ NoAuthFlowConfig, rt http.RoundTripper) error {
+func (c *NoAuthFlow) Init(_ NoAuthFlowConfig, rts ...http.RoundTripper) error {
 	c.config = &NoAuthFlowConfig{}
 
+	var rt http.RoundTripper
+	if len(rts) > 0 {
+		rt = rts[0]
+	}
+
 	if rt == nil {
 		rt = http.DefaultTransport
 	}
@@ -36,7 +41,7 @@ func (c *NoAuthFlow) Init(_ NoAuthFlowConfig, rt http.RoundTripper) error {
 	return nil
 }
 
-// Roundtrip performs the request
+// RoundTrip performs the request
 func (c *NoAuthFlow) RoundTrip(req *http.Request) (*http.Response, error) {
 	if c.rt == nil {
 		return nil, fmt.Errorf("please run Init()")

core/clients/no_auth_flow_test.go

@@ -25,7 +25,7 @@ func TestNoAuthFlow_Init(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			c := &NoAuthFlow{}
-			if err := c.Init(tt.args.cfg, http.DefaultTransport); (err != nil) != tt.wantErr {
+			if err := c.Init(tt.args.cfg); (err != nil) != tt.wantErr {
 				t.Errorf("NoAuthFlow.Init() error = %v, wantErr %v", err, tt.wantErr)
 			}
 		})

core/clients/token_flow.go

@@ -34,9 +34,15 @@ func (c *TokenFlow) GetConfig() TokenFlowConfig {
 	return *c.config
 }
 
-func (c *TokenFlow) Init(cfg *TokenFlowConfig, rt http.RoundTripper) error {
+func (c *TokenFlow) Init(cfg *TokenFlowConfig, rts ...http.RoundTripper) error {
 	c.config = cfg
 
+	var rt http.RoundTripper
+
+	if len(rts) > 0 {
+		rt = rts[0]
+	}
+
 	if rt == nil {
 		rt = http.DefaultTransport
 	}
@@ -54,7 +60,7 @@ func (c *TokenFlow) validate() error {
 	return nil
 }
 
-// Roundtrip performs the request
+// RoundTrip performs the request
 func (c *TokenFlow) RoundTrip(req *http.Request) (*http.Response, error) {
 	if c.rt == nil {
 		return nil, fmt.Errorf("please run Init()")

core/clients/token_flow_test.go

@@ -35,7 +35,7 @@ func TestTokenFlow_Init(t *testing.T) {
 			if err != nil {
 				t.Fatalf("Setting service account token: %s", err)
 			}
-			if err := c.Init(tt.args.cfg, http.DefaultTransport); (err != nil) != tt.wantErr {
+			if err := c.Init(tt.args.cfg); (err != nil) != tt.wantErr {
 				t.Errorf("TokenFlow.Init() error = %v, wantErr %v", err, tt.wantErr)
 			}
 			err = os.Setenv(ServiceAccountToken, b)