From a0f7812a49c7b7104354cde88bd6c09e9366480d Mon Sep 17 00:00:00 2001 From: i050994 Date: Thu, 28 Nov 2024 11:11:38 +0100 Subject: [PATCH] Add log --- cmd/whitesourceExecuteScan.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmd/whitesourceExecuteScan.go b/cmd/whitesourceExecuteScan.go index c6f2b562ca..824e55f834 100644 --- a/cmd/whitesourceExecuteScan.go +++ b/cmd/whitesourceExecuteScan.go @@ -718,6 +718,7 @@ func collectVulnsAndLibsForProject( if err != nil { errorsOccurred = append(errorsOccurred, fmt.Sprint(err)) } + 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) // collect all libraries detected in all related projects and errors libraries, err := sys.GetProjectHierarchy(project.Token, true) @@ -851,6 +852,8 @@ func checkProjectSecurityViolations(config *ScanOptions, cvssSeverityLimit float influx.whitesource_data.fields.minor_vulnerabilities += nonSevereVulnerabilities influx.whitesource_data.fields.major_vulnerabilities += severeVulnerabilities influx.whitesource_data.fields.vulnerabilities += (nonSevereVulnerabilities + severeVulnerabilities) + 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) + if nonSevereVulnerabilities > 0 { log.Entry().Warnf("WARNING: %v Open Source Software Security vulnerabilities with "+ "CVSS score below threshold %.1f detected in project %s.", nonSevereVulnerabilities, @@ -861,11 +864,11 @@ func checkProjectSecurityViolations(config *ScanOptions, cvssSeverityLimit float } // https://github.com/SAP/jenkins-library/blob/master/vars/whitesourceExecuteScan.groovy#L558 if severeVulnerabilities > 0 { + 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) if config.FailOnSevereVulnerabilities { log.SetErrorCategory(log.ErrorCompliance) 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) } - 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) log.Entry().Info("Step will only create data but not fail due to setting failOnSevereVulnerabilities: false") return severeVulnerabilities, alerts, assessedAlerts, nil }