orchestrator: fix TestGitHubActions flaky test (#4495)

* fix data race

* fix test

---------

Co-authored-by: Egor Balakin <egor.balakin@sap.com>

pkg/http/http.go

@@ -44,6 +44,7 @@ type Client struct {
 	useDefaultTransport       bool
 	trustedCerts              []string
 	fileUtils                 piperutils.FileUtils
+	httpClient                *http.Client
 }
 
 // ClientOptions defines the options to be set on the client
@@ -224,7 +225,7 @@ func (c *Client) SendRequest(method, url string, body io.Reader, header http.Hea
 
 // Send sends a http request
 func (c *Client) Send(request *http.Request) (*http.Response, error) {
-	httpClient := c.initialize()
+	httpClient := c.initializeHttpClient()
 	response, err := httpClient.Do(request)
 	if err != nil {
 		return response, errors.Wrapf(err, "HTTP %v request to %v failed", request.Method, request.URL)
@@ -269,12 +270,15 @@ func (c *Client) SetFileUtils(fileUtils piperutils.FileUtils) {
 
 // StandardClient returns a stdlib *http.Client which respects the custom settings.
 func (c *Client) StandardClient() *http.Client {
-	return c.initialize()
+	return c.initializeHttpClient()
 }
 
-func (c *Client) initialize() *http.Client {
+func (c *Client) initializeHttpClient() *http.Client {
+	if c.httpClient != nil {
+		return c.httpClient
+	}
+
 	c.applyDefaults()
-	c.logger = log.Entry().WithField("package", "SAP/jenkins-library/pkg/http")
 
 	var transport = &TransportWrapper{
 		Transport: &http.Transport{
@@ -306,7 +310,6 @@ func (c *Client) initialize() *http.Client {
 		log.Entry().Debug("no trusted certs found / using default transport / insecure skip set to true / : continuing with existing tls config")
 	}
 
-	var httpClient *http.Client
 	if c.maxRetries > 0 {
 		retryClient := retryablehttp.NewClient()
 		localLogger := log.Entry()
@@ -333,13 +336,14 @@ func (c *Client) initialize() *http.Client {
 			}
 			return retryablehttp.DefaultRetryPolicy(ctx, resp, err)
 		}
-		httpClient = retryClient.StandardClient()
+		c.httpClient = retryClient.StandardClient()
 	} else {
-		httpClient = &http.Client{}
-		httpClient.Timeout = c.maxRequestDuration
-		httpClient.Jar = c.cookieJar
+		c.httpClient = &http.Client{
+			Timeout: c.maxRequestDuration,
+			Jar:     c.cookieJar,
+		}
 		if !c.useDefaultTransport {
-			httpClient.Transport = transport
+			c.httpClient.Transport = transport
 		}
 	}
 
@@ -349,7 +353,7 @@ func (c *Client) initialize() *http.Client {
 
 	c.logger.Debugf("Transport timeout: %v, max request duration: %v", c.transportTimeout, c.maxRequestDuration)
 
-	return httpClient
+	return c.httpClient
 }
 
 type contextKey struct {

pkg/orchestrator/gitHubActions_test.go

@@ -196,6 +196,8 @@ func TestGitHubActions(t *testing.T) {
 		actual, err := p.GetLog()
 
 		assert.Nil(t, actual)
-		assert.EqualError(t, err, "failed to get logs: failed to get API data: HTTP request to https://api.github.com/repos/foo/bar/actions/jobs/124/logs failed with error: HTTP GET request to https://api.github.com/repos/foo/bar/actions/jobs/124/logs failed: Get \"https://api.github.com/repos/foo/bar/actions/jobs/124/logs\": no responder found")
+		// GitHubActionsConfigProvider.GetLog calls http.GetRequest concurrently, so we don't know what log (123 or 124) will be got first
+		// ref: pkg/orchestrator/gitHubActions.go:90
+		assert.ErrorContains(t, err, "failed to get logs: failed to get API data: HTTP request to https://api.github.com/repos/foo/bar/actions/jobs/12")
 	})
 }