From 13360088395852475fe5caebc3fba1591b2f37c8 Mon Sep 17 00:00:00 2001 From: attiasas Date: Mon, 2 Sep 2024 09:42:20 +0300 Subject: [PATCH 1/3] Fix sorting table results when no JAS scan --- utils/severityutils/severity.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/utils/severityutils/severity.go b/utils/severityutils/severity.go index 33e72f7e..50f9b9c1 100644 --- a/utils/severityutils/severity.go +++ b/utils/severityutils/severity.go @@ -234,6 +234,10 @@ func ParseToSeverityDetails(severity string, sarifSeverity, pretty bool, applica // -- Getters functions (With default values) -- func GetAsDetails(severity Severity, applicabilityStatus jasutils.ApplicabilityStatus, pretty bool) formats.SeverityDetails { + if applicabilityStatus == jasutils.NotScanned { + // Pass 'NotCovered' as default value to get priority + applicabilityStatus = jasutils.NotCovered + } return GetSeverityDetails(severity, applicabilityStatus).ToDetails(severity, pretty) } From 6010d31a513dec4fc4951498298339c9cfaaece8 Mon Sep 17 00:00:00 2001 From: attiasas Date: Mon, 2 Sep 2024 11:47:58 +0300 Subject: [PATCH 2/3] fix tests --- utils/resultwriter_test.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/utils/resultwriter_test.go b/utils/resultwriter_test.go index 0c9a5a62..5f8652b0 100644 --- a/utils/resultwriter_test.go +++ b/utils/resultwriter_test.go @@ -242,7 +242,7 @@ func TestConvertXrayScanToSimpleJson(t *testing.T) { Summary: "summary-1", IssueId: "XRAY-1", ImpactedDependencyDetails: formats.ImpactedDependencyDetails{ - SeverityDetails: formats.SeverityDetails{Severity: "High"}, + SeverityDetails: formats.SeverityDetails{Severity: "High", SeverityNumValue: 15}, ImpactedDependencyName: "component-A", }, }, @@ -250,7 +250,7 @@ func TestConvertXrayScanToSimpleJson(t *testing.T) { Summary: "summary-1", IssueId: "XRAY-1", ImpactedDependencyDetails: formats.ImpactedDependencyDetails{ - SeverityDetails: formats.SeverityDetails{Severity: "High"}, + SeverityDetails: formats.SeverityDetails{Severity: "High", SeverityNumValue: 15}, ImpactedDependencyName: "component-B", }, }, @@ -258,7 +258,7 @@ func TestConvertXrayScanToSimpleJson(t *testing.T) { Summary: "summary-2", IssueId: "XRAY-2", ImpactedDependencyDetails: formats.ImpactedDependencyDetails{ - SeverityDetails: formats.SeverityDetails{Severity: "Low"}, + SeverityDetails: formats.SeverityDetails{Severity: "Low", SeverityNumValue: 9}, ImpactedDependencyName: "component-B", }, }, @@ -288,7 +288,7 @@ func TestConvertXrayScanToSimpleJson(t *testing.T) { Summary: "summary-1", IssueId: "XRAY-1", ImpactedDependencyDetails: formats.ImpactedDependencyDetails{ - SeverityDetails: formats.SeverityDetails{Severity: "High"}, + SeverityDetails: formats.SeverityDetails{Severity: "High", SeverityNumValue: 15}, ImpactedDependencyName: "component-A", }, }, @@ -296,7 +296,7 @@ func TestConvertXrayScanToSimpleJson(t *testing.T) { Summary: "summary-1", IssueId: "XRAY-1", ImpactedDependencyDetails: formats.ImpactedDependencyDetails{ - SeverityDetails: formats.SeverityDetails{Severity: "High"}, + SeverityDetails: formats.SeverityDetails{Severity: "High", SeverityNumValue: 15}, ImpactedDependencyName: "component-B", }, }, @@ -305,7 +305,7 @@ func TestConvertXrayScanToSimpleJson(t *testing.T) { { LicenseKey: "license-1", ImpactedDependencyDetails: formats.ImpactedDependencyDetails{ - SeverityDetails: formats.SeverityDetails{Severity: "Low"}, + SeverityDetails: formats.SeverityDetails{Severity: "Low", SeverityNumValue: 9}, ImpactedDependencyName: "component-B", }, }, From 3d0f6ffe17699c518f99a260cf9c84b7a4b162aa Mon Sep 17 00:00:00 2001 From: attiasas Date: Wed, 4 Sep 2024 11:31:04 +0300 Subject: [PATCH 3/3] expends comment --- utils/severityutils/severity.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/severityutils/severity.go b/utils/severityutils/severity.go index 50f9b9c1..436279ab 100644 --- a/utils/severityutils/severity.go +++ b/utils/severityutils/severity.go @@ -235,7 +235,7 @@ func ParseToSeverityDetails(severity string, sarifSeverity, pretty bool, applica func GetAsDetails(severity Severity, applicabilityStatus jasutils.ApplicabilityStatus, pretty bool) formats.SeverityDetails { if applicabilityStatus == jasutils.NotScanned { - // Pass 'NotCovered' as default value to get priority + // Pass 'NotCovered' as default value to get priority, since 'NotScanned' returns 0 priority for all severities applicabilityStatus = jasutils.NotCovered } return GetSeverityDetails(severity, applicabilityStatus).ToDetails(severity, pretty)