- Default client override for testing.

Author: general-kroll-4-life

anysdk/client.go

@@ -144,10 +144,11 @@ type anySdkHTTPClientConfigurator struct {
 func NewAnySdkClientConfigurator(
 	rtCtx dto.RuntimeCtx,
 	provName string,
+	defaultClient *http.Client,
 ) client.AnySdkClientConfigurator {
 	return &anySdkHTTPClientConfigurator{
 		runtimeCtx:   rtCtx,
-		authUtil:     auth_util.NewAuthUtility(),
+		authUtil:     auth_util.NewAuthUtility(defaultClient),
 		providerName: provName,
 	}
 }

cmd/argparse/query.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"net/http"
 	"os"
 	"runtime/pprof"
 
@@ -54,15 +55,16 @@ func parseExecPayload(
 }
 
 type queryCmdPayload struct {
-	rtCtx        dto.RuntimeCtx
-	provFilePath string
-	svcFilePath  string
-	resourceStr  string
-	methodName   string
-	payload      string
-	payloadType  string
-	parameters   map[string]interface{}
-	auth         map[string]*dto.AuthCtx
+	rtCtx             dto.RuntimeCtx
+	provFilePath      string
+	svcFilePath       string
+	resourceStr       string
+	methodName        string
+	payload           string
+	payloadType       string
+	parameters        map[string]interface{}
+	auth              map[string]*dto.AuthCtx
+	defaultHttpClient *http.Client // for testing purposes
 }
 
 func (qcp *queryCmdPayload) getService() (anysdk.Service, error) {
@@ -217,6 +219,7 @@ func runQueryCommand(authCtx *dto.AuthCtx, payload *queryCmdPayload) error {
 			cc := anysdk.NewAnySdkClientConfigurator(
 				payload.rtCtx,
 				prov.GetName(),
+				payload.defaultHttpClient,
 			)
 			response, apiErr := anysdk.CallFromSignature(
 				cc, payload.rtCtx, authCtx, authCtx.Type, false, os.Stderr, prov, anysdk.NewAnySdkOpStoreDesignation(opStore), argList)

pkg/auth_util/auth_util.go

@@ -99,11 +99,16 @@ type AuthUtility interface {
 }
 
 type authUtil struct {
-	// Placeholder for future implementation
+	defaultClient *http.Client
 }
 
-func NewAuthUtility() AuthUtility {
-	return &authUtil{}
+func NewAuthUtility(defaultClient *http.Client) AuthUtility {
+	if defaultClient == nil {
+		defaultClient = http.DefaultClient
+	}
+	return &authUtil{
+		defaultClient: defaultClient,
+	}
 }
 
 type transport struct {
@@ -341,7 +346,7 @@ func (au *authUtil) GoogleOauthServiceAccount(
 		return nil, errToken
 	}
 	au.ActivateAuth(authCtx, "", dto.AuthServiceAccountStr)
-	httpClient := netutils.GetHTTPClient(httpContext, http.DefaultClient)
+	httpClient := netutils.GetHTTPClient(httpContext, au.defaultClient)
 	return config.Client(context.WithValue(context.Background(), oauth2.HTTPClient, httpClient)), nil
 }
 
@@ -355,7 +360,7 @@ func (au *authUtil) GenericOauthClientCredentials(
 		return nil, errToken
 	}
 	au.ActivateAuth(authCtx, "", dto.ClientCredentialsStr)
-	httpClient := netutils.GetHTTPClient(httpContext, http.DefaultClient)
+	httpClient := netutils.GetHTTPClient(httpContext, au.defaultClient)
 	return config.Client(context.WithValue(context.Background(), oauth2.HTTPClient, httpClient)), nil
 }
 
@@ -365,7 +370,7 @@ func (au *authUtil) ApiTokenAuth(authCtx *dto.AuthCtx, httpContext netutils.HTTP
 		return nil, fmt.Errorf("credentials error: %w", err)
 	}
 	au.ActivateAuth(authCtx, "", "api_key")
-	httpClient := netutils.GetHTTPClient(httpContext, http.DefaultClient)
+	httpClient := netutils.GetHTTPClient(httpContext, au.defaultClient)
 	valPrefix := authCtx.ValuePrefix
 	if enforceBearer {
 		valPrefix = "Bearer "
@@ -404,7 +409,7 @@ func (au *authUtil) AwsSigningAuth(authCtx *dto.AuthCtx, httpContext netutils.HT
 	au.ActivateAuth(authCtx, "", dto.AuthAWSSigningv4Str)
 
 	// Get the HTTP client from the runtime context.
-	httpClient := netutils.GetHTTPClient(httpContext, http.DefaultClient)
+	httpClient := netutils.GetHTTPClient(httpContext, au.defaultClient)
 
 	// Initialize the AWS signing transport with credentials and optional session token.
 	tr, err := awssign.NewAwsSignTransport(httpClient.Transport, keyID, keyStr, sessionToken)
@@ -424,7 +429,7 @@ func (au *authUtil) BasicAuth(authCtx *dto.AuthCtx, httpContext netutils.HTTPCon
 		return nil, fmt.Errorf("credentials error: %w", err)
 	}
 	au.ActivateAuth(authCtx, "", "basic")
-	httpClient := netutils.GetHTTPClient(httpContext, http.DefaultClient)
+	httpClient := netutils.GetHTTPClient(httpContext, au.defaultClient)
 	tr, err := newTransport(b, AuthTypeBasic, authCtx.ValuePrefix, LocationHeader, "", httpClient.Transport)
 	if err != nil {
 		return nil, err
@@ -439,7 +444,7 @@ func (au *authUtil) CustomAuth(authCtx *dto.AuthCtx, httpContext netutils.HTTPCo
 		return nil, fmt.Errorf("credentials error: %w", err)
 	}
 	au.ActivateAuth(authCtx, "", "custom")
-	httpClient := netutils.GetHTTPClient(httpContext, http.DefaultClient)
+	httpClient := netutils.GetHTTPClient(httpContext, au.defaultClient)
 	tr, err := newTransport(b, AuthTypeCustom, authCtx.ValuePrefix, authCtx.Location, authCtx.Name, httpClient.Transport)
 	if err != nil {
 		return nil, err
@@ -482,7 +487,7 @@ func (au *authUtil) AzureDefaultAuth(authCtx *dto.AuthCtx, httpContext netutils.
 	}
 	tokenString := token.Token
 	au.ActivateAuth(authCtx, "", "azure_default")
-	httpClient := netutils.GetHTTPClient(httpContext, http.DefaultClient)
+	httpClient := netutils.GetHTTPClient(httpContext, au.defaultClient)
 	tr, err := newTransport([]byte(tokenString), AuthTypeBearer, "Bearer ", LocationHeader, "", httpClient.Transport)
 	if err != nil {
 		return nil, err