Skip to content

Commit a26b45e

Browse files
committed
Fix influx counter for whitesource
1 parent 758d10b commit a26b45e

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

cmd/whitesourceExecuteScan.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -848,9 +848,9 @@ func checkProjectSecurityViolations(config *ScanOptions, cvssSeverityLimit float
848848
}
849849

850850
severeVulnerabilities, nonSevereVulnerabilities := ws.CountSecurityVulnerabilities(&alerts, cvssSeverityLimit)
851-
influx.whitesource_data.fields.minor_vulnerabilities = nonSevereVulnerabilities
852-
influx.whitesource_data.fields.major_vulnerabilities = severeVulnerabilities
853-
influx.whitesource_data.fields.vulnerabilities = nonSevereVulnerabilities + severeVulnerabilities
851+
influx.whitesource_data.fields.minor_vulnerabilities += nonSevereVulnerabilities
852+
influx.whitesource_data.fields.major_vulnerabilities += severeVulnerabilities
853+
influx.whitesource_data.fields.vulnerabilities += (nonSevereVulnerabilities + severeVulnerabilities)
854854
if nonSevereVulnerabilities > 0 {
855855
log.Entry().Warnf("WARNING: %v Open Source Software Security vulnerabilities with "+
856856
"CVSS score below threshold %.1f detected in project %s.", nonSevereVulnerabilities,

cmd/whitesourceExecuteScan_test.go

+9
Original file line numberDiff line numberDiff line change
@@ -729,6 +729,9 @@ func TestCheckProjectSecurityViolations(t *testing.T) {
729729
assert.Equal(t, 0, severeVulnerabilities)
730730
assert.Equal(t, 0, len(alerts))
731731
assert.Equal(t, 0, len(assessedAlerts))
732+
assert.Equal(t, 0, influx.whitesource_data.fields.minor_vulnerabilities)
733+
assert.Equal(t, 0, influx.whitesource_data.fields.major_vulnerabilities)
734+
assert.Equal(t, 0, influx.whitesource_data.fields.vulnerabilities)
732735
})
733736

734737
t.Run("error - some vulnerabilities", func(t *testing.T) {
@@ -744,6 +747,9 @@ func TestCheckProjectSecurityViolations(t *testing.T) {
744747
assert.Equal(t, 1, severeVulnerabilities)
745748
assert.Equal(t, 2, len(alerts))
746749
assert.Equal(t, 0, len(assessedAlerts))
750+
assert.Equal(t, 1, influx.whitesource_data.fields.minor_vulnerabilities)
751+
assert.Equal(t, 1, influx.whitesource_data.fields.major_vulnerabilities)
752+
assert.Equal(t, 2, influx.whitesource_data.fields.vulnerabilities)
747753
})
748754

749755
t.Run("success - assessed vulnerabilities", func(t *testing.T) {
@@ -759,6 +765,9 @@ func TestCheckProjectSecurityViolations(t *testing.T) {
759765
assert.Equal(t, 0, severeVulnerabilities)
760766
assert.Equal(t, 0, len(alerts))
761767
assert.Equal(t, 2, len(assessedAlerts))
768+
assert.Equal(t, 0, influx.whitesource_data.fields.minor_vulnerabilities)
769+
assert.Equal(t, 0, influx.whitesource_data.fields.major_vulnerabilities)
770+
assert.Equal(t, 0, influx.whitesource_data.fields.vulnerabilities)
762771
})
763772

764773
t.Run("error - WhiteSource failure", func(t *testing.T) {

0 commit comments

Comments
 (0)