From 1176d2cf1c767cd9b3036fde5ebfde37a521a3a0 Mon Sep 17 00:00:00 2001 From: Zxilly <31370133+Zxilly@users.noreply.github.com> Date: Mon, 27 May 2024 12:55:47 +0000 Subject: [PATCH 1/2] fix: init empty result slice for sarif printer --- pkg/printers/sarif.go | 1 + pkg/printers/sarif_test.go | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/pkg/printers/sarif.go b/pkg/printers/sarif.go index 378ee008aed8..132e74947c93 100644 --- a/pkg/printers/sarif.go +++ b/pkg/printers/sarif.go @@ -70,6 +70,7 @@ func NewSarif(w io.Writer) *Sarif { func (p Sarif) Print(issues []result.Issue) error { run := sarifRun{} run.Tool.Driver.Name = "golangci-lint" + run.Results = make([]sarifResult, 0) for i := range issues { issue := issues[i] diff --git a/pkg/printers/sarif_test.go b/pkg/printers/sarif_test.go index 7ebda1210f2a..f93a25b9ccdd 100644 --- a/pkg/printers/sarif_test.go +++ b/pkg/printers/sarif_test.go @@ -65,3 +65,17 @@ func TestSarif_Print(t *testing.T) { assert.Equal(t, expected, buf.String()) } + +func TestSarif_EmptyPrint(t *testing.T) { + buf := new(bytes.Buffer) + + printer := NewSarif(buf) + + err := printer.Print(make([]result.Issue, 0)) + require.NoError(t, err) + + expected := `{"version":"2.1.0","$schema":"https://schemastore.azurewebsites.net/schemas/json/sarif-2.1.0-rtm.6.json","runs":[{"tool":{"driver":{"name":"golangci-lint"}},"results":[]}]} +` + + assert.Equal(t, expected, buf.String()) +} From 844961e2c99bdbf16700966613ba406b172d6c94 Mon Sep 17 00:00:00 2001 From: Fernandez Ludovic Date: Mon, 27 May 2024 15:32:12 +0200 Subject: [PATCH 2/2] review: tests --- pkg/printers/sarif_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/printers/sarif_test.go b/pkg/printers/sarif_test.go index f93a25b9ccdd..c3595826c42a 100644 --- a/pkg/printers/sarif_test.go +++ b/pkg/printers/sarif_test.go @@ -66,12 +66,12 @@ func TestSarif_Print(t *testing.T) { assert.Equal(t, expected, buf.String()) } -func TestSarif_EmptyPrint(t *testing.T) { +func TestSarif_Print_empty(t *testing.T) { buf := new(bytes.Buffer) printer := NewSarif(buf) - err := printer.Print(make([]result.Issue, 0)) + err := printer.Print(nil) require.NoError(t, err) expected := `{"version":"2.1.0","$schema":"https://schemastore.azurewebsites.net/schemas/json/sarif-2.1.0-rtm.6.json","runs":[{"tool":{"driver":{"name":"golangci-lint"}},"results":[]}]}