Merge remote-tracking branch 'upstream/master' into ad_project_path_analytics

Author: attiasas

tests/xraybinmgr_test.go

@@ -43,5 +43,5 @@ func addBuildsToIndexing(t *testing.T) {
 			return false
 		}
 		return slices.Contains(indexedBuilds, buildName)
-	}, time.Second*5, time.Millisecond*150, "Build %s not found in indexed builds", buildName)
+	}, time.Second*30, time.Millisecond*500, "Build %s not found in indexed builds", buildName)
 }

xray/services/buildscan.go

@@ -174,6 +174,12 @@ func (bs *BuildScanService) getBuildScanResults(reqFunc func() (*http.Response,
 	if err != nil {
 		return nil, err
 	}
+	if len(body) == 0 {
+		return nil, errorutils.CheckErrorf(
+			"Received empty response from Xray server (HTTP 200). " +
+				"This may indicate a server-side timeout during authentication. Please retry.",
+		)
+	}
 	buildScanResponse := BuildScanResponse{}
 	if err = json.Unmarshal(body, &buildScanResponse); err != nil {
 		return nil, errorutils.CheckError(err)