fix issues where versions are not set in details

jfrog · Dec 23, 2024 · bfa7955 · bfa7955
1 parent dc30b5c
commit bfa7955
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/scanpullrequest/scanpullrequest.go b/scanpullrequest/scanpullrequest.go
@@ -134,6 +134,7 @@ func auditPullRequest(repoConfig *utils.Repository, client vcsclient.VcsClient)
 	repoConfig.Git.RepositoryCloneUrl = repositoryInfo.CloneInfo.HTTP
 
 	scanDetails := utils.NewScanDetails(client, &repoConfig.Server, &repoConfig.Git).
+		SetJfrogVersions(repoConfig.XrayVersion, repoConfig.XscVersion).
 		SetResultsContext(repositoryInfo.CloneInfo.HTTP, repoConfig.Watches, repoConfig.JFrogProjectKey, repoConfig.IncludeVulnerabilities, len(repoConfig.AllowedLicenses) > 0).
 		SetFixableOnly(repoConfig.FixableOnly).
 		SetFailOnInstallationErrors(*repoConfig.FailOnSecurityIssues).
@@ -144,8 +145,6 @@ func auditPullRequest(repoConfig *utils.Repository, client vcsclient.VcsClient)
 	if scanDetails, err = scanDetails.SetMinSeverity(repoConfig.MinSeverity); err != nil {
 		return
 	}
-	scanDetails.XrayVersion = repoConfig.XrayVersion
-	scanDetails.XscVersion = repoConfig.XscVersion
 
 	scanDetails.MultiScanId, scanDetails.StartTime = xsc.SendNewScanEvent(
 		scanDetails.XrayVersion,

diff --git a/scanrepository/scanrepository.go b/scanrepository/scanrepository.go
@@ -124,6 +124,7 @@ func (cfp *ScanRepositoryCmd) scanAndFixBranch(repository *utils.Repository) (er
 func (cfp *ScanRepositoryCmd) setCommandPrerequisites(repository *utils.Repository, client vcsclient.VcsClient) (err error) {
 	// Set the scan details
 	cfp.scanDetails = utils.NewScanDetails(client, &repository.Server, &repository.Git).
+		SetJfrogVersions(cfp.XrayVersion, cfp.XscVersion).
 		SetFailOnInstallationErrors(*repository.FailOnSecurityIssues).
 		SetFixableOnly(repository.FixableOnly).
 		SetConfigProfile(repository.ConfigProfile).
@@ -136,8 +137,6 @@ func (cfp *ScanRepositoryCmd) setCommandPrerequisites(repository *utils.Reposito
 		return
 	}
 	cfp.scanDetails.SetResultsContext(repositoryInfo.CloneInfo.HTTP, repository.Watches, repository.JFrogProjectKey, repository.IncludeVulnerabilities, len(repository.AllowedLicenses) > 0)
-	cfp.scanDetails.XrayVersion = cfp.XrayVersion
-	cfp.scanDetails.XscVersion = cfp.XscVersion
 
 	if cfp.scanDetails, err = cfp.scanDetails.SetMinSeverity(repository.MinSeverity); err != nil {
 		return

diff --git a/utils/scandetails.go b/utils/scandetails.go
@@ -50,6 +50,12 @@ func NewScanDetails(client vcsclient.VcsClient, server *config.ServerDetails, gi
 	return &ScanDetails{client: client, ServerDetails: server, Git: git}
 }
 
+func (sc *ScanDetails) SetJfrogVersions(xrayVersion, xscVersion string) *ScanDetails {
+	sc.XrayVersion = xrayVersion
+	sc.XscVersion = xscVersion
+	return sc
+}
+
 func (sc *ScanDetails) SetDisableJas(disable bool) *ScanDetails {
 	sc.disableJas = disable
 	return sc