From 646a6fdafcd6d53c36af32c4711588947aab3e3d Mon Sep 17 00:00:00 2001 From: Zxilly Date: Thu, 20 Jun 2024 02:09:46 +0800 Subject: [PATCH 1/4] fix: sarif level property should be enum --- pkg/printers/sarif.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkg/printers/sarif.go b/pkg/printers/sarif.go index 9ccf33ce1948..e3622d26840b 100644 --- a/pkg/printers/sarif.go +++ b/pkg/printers/sarif.go @@ -76,8 +76,15 @@ func (p Sarif) Print(issues []result.Issue) error { issue := issues[i] severity := issue.Severity - if severity == "" { - severity = "error" + + // can be only none, note, warning, error + // https://docs.oasis-open.org/sarif/sarif/v2.1.0/errata01/os/sarif-v2.1.0-errata01-os-complete.html#_Toc141790898 + if severity == "" || + severity != "none" && + severity != "note" && + severity != "warning" && + severity != "error" { + severity = "note" } sr := sarifResult{ From d1a76792f6de76178b1cc37d5161561f297584d5 Mon Sep 17 00:00:00 2001 From: Fernandez Ludovic Date: Wed, 19 Jun 2024 22:06:24 +0200 Subject: [PATCH 2/4] review --- pkg/printers/sarif.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkg/printers/sarif.go b/pkg/printers/sarif.go index e3622d26840b..97dc7bb40bc5 100644 --- a/pkg/printers/sarif.go +++ b/pkg/printers/sarif.go @@ -79,12 +79,11 @@ func (p Sarif) Print(issues []result.Issue) error { // can be only none, note, warning, error // https://docs.oasis-open.org/sarif/sarif/v2.1.0/errata01/os/sarif-v2.1.0-errata01-os-complete.html#_Toc141790898 - if severity == "" || - severity != "none" && - severity != "note" && - severity != "warning" && - severity != "error" { - severity = "note" + switch severity { + case "none", "note", "warning", "error": + // valid + default: + severity = "error" } sr := sarifResult{ From 9959637fd7c9590e7832f1421bb4e5f90a96cead Mon Sep 17 00:00:00 2001 From: Fernandez Ludovic Date: Wed, 19 Jun 2024 22:08:59 +0200 Subject: [PATCH 3/4] review: add tests --- pkg/printers/sarif_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/printers/sarif_test.go b/pkg/printers/sarif_test.go index 62cb0d5ae05c..87c833de448c 100644 --- a/pkg/printers/sarif_test.go +++ b/pkg/printers/sarif_test.go @@ -42,7 +42,7 @@ func TestSarif_Print(t *testing.T) { }, { FromLinter: "linter-a", - Severity: "error", + Severity: "low", Text: "some issue 2", Pos: token.Position{ Filename: "path/to/filec.go", From b4d2ca9afae73a23e00ba00f33b67b0b53afdda0 Mon Sep 17 00:00:00 2001 From: Fernandez Ludovic Date: Thu, 20 Jun 2024 00:03:16 +0200 Subject: [PATCH 4/4] review --- pkg/printers/sarif.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkg/printers/sarif.go b/pkg/printers/sarif.go index 97dc7bb40bc5..8b1dd2ee29ea 100644 --- a/pkg/printers/sarif.go +++ b/pkg/printers/sarif.go @@ -77,11 +77,10 @@ func (p Sarif) Print(issues []result.Issue) error { severity := issue.Severity - // can be only none, note, warning, error - // https://docs.oasis-open.org/sarif/sarif/v2.1.0/errata01/os/sarif-v2.1.0-errata01-os-complete.html#_Toc141790898 switch severity { + // https://docs.oasis-open.org/sarif/sarif/v2.1.0/errata01/os/sarif-v2.1.0-errata01-os-complete.html#_Toc141790898 case "none", "note", "warning", "error": - // valid + // Valid levels. default: severity = "error" }