Skip to content

Commit 1629ef4

Browse files
committed
Add log
1 parent 74e0dc7 commit 1629ef4

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

cmd/whitesourceExecuteScan.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -767,6 +767,7 @@ func collectVulnsAndLibsForProject(
767767
if err != nil {
768768
errorsOccurred = append(errorsOccurred, fmt.Sprint(err))
769769
}
770+
log.Entry().Infof("Current influx data : minor_vulnerabilities = %v / major_vulnerabilities = %v / vulnerabilities = %v", influx.whitesource_data.fields.minor_vulnerabilities, influx.whitesource_data.fields.major_vulnerabilities, influx.whitesource_data.fields.vulnerabilities)
770771

771772
// collect all libraries detected in all related projects and errors
772773
libraries, err := sys.GetProjectHierarchy(project.Token, true)
@@ -900,6 +901,8 @@ func checkProjectSecurityViolations(config *ScanOptions, cvssSeverityLimit float
900901
influx.whitesource_data.fields.minor_vulnerabilities += nonSevereVulnerabilities
901902
influx.whitesource_data.fields.major_vulnerabilities += severeVulnerabilities
902903
influx.whitesource_data.fields.vulnerabilities += (nonSevereVulnerabilities + severeVulnerabilities)
904+
log.Entry().Infof("Current influx data : minor_vulnerabilities = %v / major_vulnerabilities = %v / vulnerabilities = %v", influx.whitesource_data.fields.minor_vulnerabilities, influx.whitesource_data.fields.major_vulnerabilities, influx.whitesource_data.fields.vulnerabilities)
905+
903906
if nonSevereVulnerabilities > 0 {
904907
log.Entry().Warnf("WARNING: %v Open Source Software Security vulnerabilities with "+
905908
"CVSS score below threshold %.1f detected in project %s.", nonSevereVulnerabilities,
@@ -910,11 +913,11 @@ func checkProjectSecurityViolations(config *ScanOptions, cvssSeverityLimit float
910913
}
911914
// https://github.com/SAP/jenkins-library/blob/master/vars/whitesourceExecuteScan.groovy#L558
912915
if severeVulnerabilities > 0 {
916+
log.Entry().Infof("%v Open Source Software Security vulnerabilities with CVSS score greater or equal to %.1f detected in project %s", severeVulnerabilities, cvssSeverityLimit, project.Name)
913917
if config.FailOnSevereVulnerabilities {
914918
log.SetErrorCategory(log.ErrorCompliance)
915919
return severeVulnerabilities, alerts, assessedAlerts, fmt.Errorf("%v Open Source Software Security vulnerabilities with CVSS score greater or equal to %.1f detected in project %s", severeVulnerabilities, cvssSeverityLimit, project.Name)
916920
}
917-
log.Entry().Infof("%v Open Source Software Security vulnerabilities with CVSS score greater or equal to %.1f detected in project %s", severeVulnerabilities, cvssSeverityLimit, project.Name)
918921
log.Entry().Info("Step will only create data but not fail due to setting failOnSevereVulnerabilities: false")
919922
return severeVulnerabilities, alerts, assessedAlerts, nil
920923
}

0 commit comments

Comments
 (0)