Skip to content

Simplify getResultScanStatus #1014

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

Open
eranturgeman wants to merge 2 commits into
base: v3_er
Choose a base branch
from
Open

Simplify getResultScanStatus #1014

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2685d4
simplify getResultScanStatus
eranturgeman Dec 29, 2025
56a3dbf
Merge branch 'v3_er' of https://github.com/jfrog/frogbot into simplif…
eranturgeman Jan 4, 2026
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
50 changes: 7 additions & 43 deletions scanpullrequest/scanpullrequest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,50 +453,14 @@ func scanResultsToIssuesCollection(scanResults *results.SecurityCommandResults,
return
}

func getResultScanStatues(cmdResults ...*results.SecurityCommandResults) formats.ScanStatus {
converted := make([]formats.SimpleJsonResults, len(cmdResults))
for i, cmdResult := range cmdResults {
convertor := conversion.NewCommandResultsConvertor(conversion.ResultConvertParams{IncludeVulnerabilities: cmdResult.IncludesVulnerabilities(), HasViolationContext: cmdResult.HasViolationContext(), SimplifiedOutput: true})
var err error
if converted[i], err = convertor.ConvertToSimpleJson(cmdResult); err != nil {
log.Debug(fmt.Sprintf("Failed to get scan status for failed scan #%d. Error: %s", i, err.Error()))
continue
}
}
return getScanStatus(converted...)
}

func getScanStatus(cmdResults ...formats.SimpleJsonResults) formats.ScanStatus {
if len(cmdResults) == 0 {
func getResultScanStatues(cmdResult *results.SecurityCommandResults) formats.ScanStatus {
if cmdResult == nil {
return formats.ScanStatus{}
}
if len(cmdResults) == 1 {
return cmdResults[0].Statuses
}
statuses := cmdResults[0].Statuses
for _, sourceResults := range cmdResults[1:] {
statuses.ScaStatusCode = getWorstScanStatus(statuses.ScaStatusCode, sourceResults.Statuses.ScaStatusCode)
statuses.IacStatusCode = getWorstScanStatus(statuses.IacStatusCode, sourceResults.Statuses.IacStatusCode)
statuses.SecretsStatusCode = getWorstScanStatus(statuses.SecretsStatusCode, sourceResults.Statuses.SecretsStatusCode)
statuses.SastStatusCode = getWorstScanStatus(statuses.SastStatusCode, sourceResults.Statuses.SastStatusCode)
statuses.ApplicabilityStatusCode = getWorstScanStatus(statuses.ApplicabilityStatusCode, sourceResults.Statuses.ApplicabilityStatusCode)
}
return statuses
}

func getWorstScanStatus(targetStatus, sourceStatus *int) *int {
if sourceStatus == nil && targetStatus == nil {
// Scan not performed.
return nil
}
if targetStatus == nil {
return sourceStatus
}
if sourceStatus == nil {
return targetStatus
}
if *sourceStatus == 0 {
return targetStatus
converted, err := conversion.NewCommandResultsConvertor(conversion.ResultConvertParams{IncludeVulnerabilities: cmdResult.IncludesVulnerabilities(), HasViolationContext: cmdResult.HasViolationContext(), SimplifiedOutput: true}).ConvertToSimpleJson(cmdResult)
if err != nil {
log.Debug(fmt.Sprintf("Failed to get scan status for failed scan. Error: %v", err))
return formats.ScanStatus{}
}
return sourceStatus
return converted.Statuses
}
Loading