Fix treatment service and plugin's method of initiating google client

Author: deadlycoconuts

plugins/turing/manager/experiment_manager.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"net/http"
 	"strconv"
 	"time"
 
@@ -165,17 +166,20 @@ func NewExperimentManager(configData json.RawMessage) (manager.CustomExperimentM
 	if err != nil {
 		return nil, fmt.Errorf("failed to create XP experiment manager: %s", err)
 	}
-
-	// Create Google Client
-	googleClient, err := auth.InitGoogleClient(context.Background())
-	if err != nil {
-		return nil, err
+	httpClient := http.DefaultClient
+	if config.TreatmentServicePluginConfig.ManagementService.AuthorizationEnabled {
+		// Create Google Client
+		httpClient, err = auth.InitGoogleClient(context.Background())
+		if err != nil {
+			return nil, err
+		}
+		httpClient.Timeout = defaultRequestTimeout
 	}
-	googleClient.Timeout = defaultRequestTimeout
+
 	// Create XP client
 	client, err := xpclient.NewClientWithResponses(
 		config.BaseURL,
-		xpclient.WithHTTPClient(googleClient),
+		xpclient.WithHTTPClient(httpClient),
 	)
 	if err != nil {
 		return nil, fmt.Errorf("Unable to create XP management client: %s", err.Error())

treatment-service/models/storage.go

@@ -566,26 +566,25 @@ func NewLocalStorage(
 ) (*LocalStorage, error) {
 	// Set up Request Modifiers
 	clientOptions := []managementClient.ClientOption{}
+	httpClient := http.DefaultClient
 	if authzEnabled {
-		var googleClient *http.Client
 		var err error
 		// Init Google client for Authz. When using a non-empty googleApplicationCredentialsEnvVar that contains a file
 		// path to a credentials file, the credentials file MUST contain a Google SERVICE ACCOUNT for authentication to
 		// work correctly
 		if filepath := os.Getenv(googleApplicationCredentialsEnvVar); filepath != "" {
-			googleClient, err = auth.InitGoogleClientFromCredentialsFile(context.Background(), filepath)
+			httpClient, err = auth.InitGoogleClientFromCredentialsFile(context.Background(), filepath)
 		} else {
-			googleClient, err = auth.InitGoogleClient(context.Background())
+			httpClient, err = auth.InitGoogleClient(context.Background())
 		}
 		if err != nil {
 			return nil, err
 		}
-
-		clientOptions = append(
-			clientOptions,
-			managementClient.WithHTTPClient(googleClient),
-		)
 	}
+	clientOptions = append(
+		clientOptions,
+		managementClient.WithHTTPClient(httpClient),
+	)
 	xpClient, err := managementClient.NewClientWithResponses(xpServer, clientOptions...)
 	if err != nil {
 		return nil, err