fix(xp-treatment,plugin): Fix treatment service and plugin's method of initiating management service client (caraml-dev#89)

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

* Remove redundant argument

Author: deadlycoconuts

plugins/turing/manager/experiment_manager.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"net/http"
 	"strconv"
 	"time"
 
@@ -167,15 +168,19 @@ func NewExperimentManager(configData json.RawMessage) (manager.CustomExperimentM
 	}
 
 	// Create Google Client
+	httpClient := http.DefaultClient
 	googleClient, err := auth.InitGoogleClient(context.Background())
-	if err != nil {
-		return nil, err
+	if err == nil {
+		googleClient.Timeout = defaultRequestTimeout
+		httpClient = googleClient
+	} else {
+		log.Infof("Google default credential not found. Fallback to HTTP default client")
 	}
-	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/appcontext/appcontext.go

@@ -32,7 +32,6 @@ func NewAppContext(cfg *config.Config) (*AppContext, error) {
 	localStorage, err := models.NewLocalStorage(
 		cfg.GetProjectIds(),
 		cfg.ManagementService.URL,
-		cfg.ManagementService.AuthorizationEnabled,
 		cfg.DeploymentConfig.GoogleApplicationCredentialsEnvVar,
 	)
 	if err != nil {

treatment-service/appcontext/appcontext_test.go

@@ -78,7 +78,6 @@ func TestContext(t *testing.T) {
 	localStorage, err := models.NewLocalStorage(
 		testConfig.GetProjectIds(),
 		testConfig.ManagementService.URL,
-		testConfig.ManagementService.AuthorizationEnabled,
 		"",
 	)
 	if err != nil {

treatment-service/integration-test/fetch_treatment_it_test.go

@@ -807,7 +807,7 @@ func (suite *TreatmentServiceTestSuite) TestAllFiltersSwitchback() {
 }
 
 func (suite *TreatmentServiceTestSuite) TestLocalStorage() {
-	storage, err := models.NewLocalStorage([]models.ProjectId{1}, suite.managementServiceServer.URL, false, "")
+	storage, err := models.NewLocalStorage([]models.ProjectId{1}, suite.managementServiceServer.URL, "")
 	suite.Require().NoError(err)
 	suite.Require().NotEmpty(storage)
 

treatment-service/models/storage.go

@@ -589,31 +589,33 @@ func (s *LocalStorage) getAllProjects() ([]*pubsub.ProjectSettings, error) {
 func NewLocalStorage(
 	projectIds []ProjectId,
 	xpServer string,
-	authzEnabled bool,
 	googleApplicationCredentialsEnvVar string,
 ) (*LocalStorage, error) {
 	// Set up Request Modifiers
 	clientOptions := []managementClient.ClientOption{}
-	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)
-		} else {
-			googleClient, err = auth.InitGoogleClient(context.Background())
-		}
-		if err != nil {
-			return nil, err
-		}
 
-		clientOptions = append(
-			clientOptions,
-			managementClient.WithHTTPClient(googleClient),
-		)
+	httpClient := http.DefaultClient
+	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)
+	} else {
+		googleClient, err = auth.InitGoogleClient(context.Background())
 	}
+
+	if err == nil {
+		httpClient = googleClient
+	} else {
+		log.Println("Google default credential not found. Fallback to HTTP default client")
+	}
+
+	clientOptions = append(
+		clientOptions,
+		managementClient.WithHTTPClient(httpClient),
+	)
 	xpClient, err := managementClient.NewClientWithResponses(xpServer, clientOptions...)
 	if err != nil {
 		return nil, err