Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix build scan command output in table format #172

Merged
merged 5 commits into from
Sep 15, 2024
Merged

Fix build scan command output in table format #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8eb0196
change build scan to always print violations context (as the api alwa…
dortam888 Sep 10, 2024
4aebc19
changed the record to always have true violation context and dropped …
dortam888 Sep 10, 2024
c70c8db
make the code readable and fix the security job summary for build sca…
dortam888 Sep 10, 2024
708980a
Merge branch 'dev' into build-scan-print-fix
dortam888 Sep 10, 2024
11be8a1
Merge branch 'dev' into build-scan-print-fix
dortam888 Sep 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 1 addition & 12 deletions commands/scan/buildscan.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand All @@ -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
Expand All @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions utils/securityJobSummary.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading