Fix aggregateScanResults (#543)

jfrog · Oct 15, 2023 · 05ddca5 · 05ddca5
1 parent a737242
commit 05ddca5
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 0 deletions.
diff --git a/scanpullrequest/scanpullrequest.go b/scanpullrequest/scanpullrequest.go
@@ -376,10 +376,12 @@ func aggregateScanResults(scanResults []services.ScanResponse) services.ScanResp
 	aggregateResults := services.ScanResponse{
 		Violations:      []services.Violation{},
 		Vulnerabilities: []services.Vulnerability{},
+		Licenses:        []services.License{},
 	}
 	for _, scanResult := range scanResults {
 		aggregateResults.Violations = append(aggregateResults.Violations, scanResult.Violations...)
 		aggregateResults.Vulnerabilities = append(aggregateResults.Vulnerabilities, scanResult.Vulnerabilities...)
+		aggregateResults.Licenses = append(aggregateResults.Licenses, scanResult.Licenses...)
 	}
 	return aggregateResults
 }

diff --git a/scanpullrequest/scanpullrequest_test.go b/scanpullrequest/scanpullrequest_test.go
@@ -1195,6 +1195,38 @@ func TestDeletePreviousPullRequestReviewMessages(t *testing.T) {
 	}
 }
 
+func TestAggregateScanResults(t *testing.T) {
+	scanResult1 := services.ScanResponse{
+		Violations:      []services.Violation{{IssueId: "Violation 1"}},
+		Vulnerabilities: []services.Vulnerability{{IssueId: "Vulnerability 1"}},
+		Licenses:        []services.License{{Name: "License 1"}},
+	}
+
+	scanResult2 := services.ScanResponse{
+		Violations:      []services.Violation{{IssueId: "Violation 2"}},
+		Vulnerabilities: []services.Vulnerability{{IssueId: "Vulnerability 2"}},
+		Licenses:        []services.License{{Name: "License 2"}},
+	}
+
+	aggregateResult := aggregateScanResults([]services.ScanResponse{scanResult1, scanResult2})
+	expectedResult := services.ScanResponse{
+		Violations: []services.Violation{
+			{IssueId: "Violation 1"},
+			{IssueId: "Violation 2"},
+		},
+		Vulnerabilities: []services.Vulnerability{
+			{IssueId: "Vulnerability 1"},
+			{IssueId: "Vulnerability 2"},
+		},
+		Licenses: []services.License{
+			{Name: "License 1"},
+			{Name: "License 2"},
+		},
+	}
+
+	assert.Equal(t, expectedResult, aggregateResult)
+}
+
 // Set new logger with output redirection to a null logger. This is useful for negative tests.
 // Caller is responsible to set the old log back.
 func redirectLogOutputToNil() (previousLog log.Log) {