diff --git a/commands/scan/buildscan.go b/commands/scan/buildscan.go index a1a59148..30c4f390 100644 --- a/commands/scan/buildscan.go +++ b/commands/scan/buildscan.go @@ -155,7 +155,7 @@ func (bsc *BuildScanCommand) runBuildScanAndPrintResults(xrayManager *xray.XrayS resultsPrinter := utils.NewResultsWriter(scanResults). SetOutputFormat(bsc.outputFormat). - SetHasViolationContext(bsc.hasViolationContext()). + SetHasViolationContext(true). SetIncludeVulnerabilities(bsc.includeVulnerabilities). SetIncludeLicenses(false). SetIsMultipleRootProject(true). @@ -176,18 +176,11 @@ func (bsc *BuildScanCommand) runBuildScanAndPrintResults(xrayManager *xray.XrayS return false, err } } - if bsc.includeVulnerabilities { - resultsPrinter.SetIncludeVulnerabilities(true) - if err = resultsPrinter.PrintScanResults(); err != nil { - return false, err - } - } } err = utils.RecordSecurityCommandSummary(utils.NewBuildScanSummary( scanResults, bsc.serverDetails, bsc.includeVulnerabilities, - bsc.hasViolationContext(), params.BuildName, params.BuildNumber, )) return @@ -197,10 +190,6 @@ func (bsc *BuildScanCommand) CommandName() string { return "xr_build_scan" } -func (bsc *BuildScanCommand) hasViolationContext() bool { - return bsc.buildConfiguration.GetProject() != "" -} - // There are two cases. when serverDetails.Url is configured and when serverDetails.XrayUrl and serverDetails.ArtifactoryUrl are configured // The function will return the Url if configured and will trim xray if serverDetails.Url is not configured func getActualUrl(serverDetails config.ServerDetails) (string, error) { diff --git a/utils/securityJobSummary.go b/utils/securityJobSummary.go index dde1bbe8..e71d7d51 100644 --- a/utils/securityJobSummary.go +++ b/utils/securityJobSummary.go @@ -73,8 +73,8 @@ func newResultSummary(cmdResults *Results, cmdType CommandType, serverDetails *c return } -func NewBuildScanSummary(cmdResults *Results, serverDetails *config.ServerDetails, vulnerabilitiesRequested, violationsRequested bool, buildName, buildNumber string) (summary ScanCommandResultSummary) { - summary = newResultSummary(cmdResults, Build, serverDetails, vulnerabilitiesRequested, violationsRequested) +func NewBuildScanSummary(cmdResults *Results, serverDetails *config.ServerDetails, vulnerabilitiesRequested bool, buildName, buildNumber string) (summary ScanCommandResultSummary) { + summary = newResultSummary(cmdResults, Build, serverDetails, vulnerabilitiesRequested, true) summary.Args.BuildName = buildName summary.Args.BuildNumbers = []string{buildNumber} return