From 6e139aee9666b77b63277ed88781fb70a977e954 Mon Sep 17 00:00:00 2001
From: Sarat Krishnan <78093145+sarat-krk@users.noreply.github.com>
Date: Tue, 25 Jan 2022 17:18:05 +0100
Subject: [PATCH] Fix(gctsDeploy) : add client in config url, disable retry for
 create and pull (#3464)

---
 cmd/gctsDeploy.go | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/cmd/gctsDeploy.go b/cmd/gctsDeploy.go
index e49067a9b..25982c5c6 100644
--- a/cmd/gctsDeploy.go
+++ b/cmd/gctsDeploy.go
@@ -471,9 +471,10 @@ func pullByCommit(config *gctsDeployOptions, telemetryData *telemetry.CustomData
 		return errors.Wrap(cookieErr, "creating a cookie jar failed")
 	}
 	clientOptions := piperhttp.ClientOptions{
-		CookieJar: cookieJar,
-		Username:  config.Username,
-		Password:  config.Password,
+		CookieJar:  cookieJar,
+		Username:   config.Username,
+		Password:   config.Password,
+		MaxRetries: -1,
 	}
 	httpClient.SetOptions(clientOptions)
 
@@ -531,9 +532,10 @@ func createRepositoryForDeploy(config *gctsCreateRepositoryOptions, telemetryDat
 		return errors.Wrapf(cookieErr, "creating repository on the ABAP system %v failed", config.Host)
 	}
 	clientOptions := piperhttp.ClientOptions{
-		CookieJar: cookieJar,
-		Username:  config.Username,
-		Password:  config.Password,
+		CookieJar:  cookieJar,
+		Username:   config.Username,
+		Password:   config.Password,
+		MaxRetries: -1,
 	}
 	httpClient.SetOptions(clientOptions)
 
@@ -615,7 +617,7 @@ func getConfigurationMetadata(config *gctsDeployOptions, httpClient piperhttp.Se
 	var response configurationMetadataBody
 	log.Entry().Infof("Starting to retrieve configuration metadata from the system")
 	requestURL := config.Host +
-		"/sap/bc/cts_abapvcs/config"
+		"/sap/bc/cts_abapvcs/config?sap-client=" + config.Client
 
 	resp, httpErr := httpClient.SendRequest("GET", requestURL, nil, nil, nil)
 	defer func() {