Retrieve target from directory sbom types in addition to image types (#…

…440) * Retrieve target from directory sbom types in addition to image types Signed-off-by: Samuel Dacanay <[email protected]> * add dir sbom ingest test Signed-off-by: Alex Goodman <[email protected]> Co-authored-by: Alex Goodman <[email protected]>
anchore · Oct 6, 2021 · 2dd4131 · 2dd4131
1 parent 6fe9fc2
commit 2dd4131
Show file tree

Hide file tree

Showing 3 changed files with 1,132 additions and 7 deletions.
diff --git a/grype/pkg/syft_json_provider.go b/grype/pkg/syft_json_provider.go
@@ -37,6 +37,8 @@ func (s *syftSource) UnmarshalJSON(b []byte) error {
 	s.Type = unpacker.Type
 
 	switch s.Type {
+	case "directory":
+		s.Target = string(unpacker.Target[:])
 	case "image":
 		var payload source.ImageMetadata
 		if err := json.Unmarshal(unpacker.Target, &payload); err != nil {

diff --git a/test/cli/sbom_input_test.go b/test/cli/sbom_input_test.go
@@ -6,8 +6,6 @@ import (
 	"testing"
 )
 
-const sbomLocation = "./test-fixtures/sbom-ubuntu-20.04--pruned.json"
-
 func TestSBOMInput_AsArgument(t *testing.T) {
 	workingDirectory, err := os.Getwd()
 	if err != nil {
@@ -19,12 +17,16 @@ func TestSBOMInput_AsArgument(t *testing.T) {
 		path string
 	}{
 		{
-			"absolute path",
-			path.Join(workingDirectory, sbomLocation),
+			"absolute path - image scan",
+			path.Join(workingDirectory, "./test-fixtures/sbom-ubuntu-20.04--pruned.json"),
+		},
+		{
+			"relative path - image scan",
+			"./test-fixtures/sbom-ubuntu-20.04--pruned.json",
 		},
 		{
-			"relative path",
-			sbomLocation,
+			"directory scan",
+			"./test-fixtures/sbom-grype-source.json",
 		},
 	}
 
@@ -54,7 +56,7 @@ func TestSBOMInput_AsArgument(t *testing.T) {
 func TestSBOMInput_FromStdin(t *testing.T) {
 	cmd := getGrypeCommand(t)
 
-	sbom, err := os.Open(sbomLocation)
+	sbom, err := os.Open("./test-fixtures/sbom-ubuntu-20.04--pruned.json")
 	if err != nil {
 		t.Fatal(err)
 	}