Skip to content

Commit d5ba23b

Browse files
committed
make the trivy parser not error out when receiving an empty file
1 parent 18e0e96 commit d5ba23b

File tree

2 files changed

+21
-1
lines changed

2 files changed

+21
-1
lines changed

components/scanners/trivy/internal/transformer/transformer.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,10 @@ func (g *trivyTransformer) Transform(ctx context.Context) ([]*ocsf.Vulnerability
126126
}
127127
return nil, errors.Errorf("failed to read raw output file '%s': %w", g.rawOutFilePath, err)
128128
}
129-
129+
if len(b) == 0 {
130+
logger.Info("input file is empty, exiting without findings")
131+
return []*ocsf.VulnerabilityFinding{}, nil
132+
}
130133
var report sarifschemav210.SchemaJson
131134
if err := report.UnmarshalJSON(b); err != nil {
132135
return nil, errors.Errorf("failed to parse raw trivy output: %w", err)

components/scanners/trivy/internal/transformer/transformer_test.go

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ package transformer_test
33
import (
44
"context"
55
_ "embed"
6+
"os"
7+
"path/filepath"
68
"testing"
79
"time"
810

@@ -215,4 +217,19 @@ func TestTrivyTransformer_Transform(t *testing.T) {
215217
assert.NotNilf(t, affectedCode.EndLine, "Unexpected nil end line for vulnerability for finding %d", idx)
216218
}
217219
})
220+
t.Run("it should return an empty finding array when the input file is empty", func(t *testing.T) {
221+
emptyFilePath := filepath.Join(t.TempDir(), "empty.sarif.json")
222+
require.NoError(t, os.WriteFile(emptyFilePath, []byte{}, 0644))
223+
224+
ocsfTransformer, err := transformer.New(
225+
transformer.TrivyRawOutFilePath(emptyFilePath),
226+
transformer.TrivyTransformerWithTarget(transformer.TargetTypeContainer),
227+
transformer.TrivyTransformerWithClock(clock),
228+
)
229+
require.NoError(t, err)
230+
231+
findings, err := ocsfTransformer.Transform(ctx)
232+
require.NoError(t, err)
233+
assert.Empty(t, findings, "Expected no findings for an empty input file")
234+
})
218235
}

0 commit comments

Comments
 (0)