Fixes format references for SBOM

paketo-buildpacks · Mar 8, 2022 · cf9981d · cf9981d
1 parent 8bb42ef
commit cf9981d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/sbom/formatted_reader.go b/sbom/formatted_reader.go
@@ -7,7 +7,7 @@ import (
 	"sync"
 
 	"github.com/anchore/syft/syft"
-	"github.com/anchore/syft/syft/format"
+	"github.com/anchore/syft/syft/sbom"
 )
 
 // FormattedReader outputs the SBoM in a specified format.
@@ -31,19 +31,19 @@ func (f *FormattedReader) Read(b []byte) (int, error) {
 	defer f.m.Unlock()
 
 	if f.reader == nil {
-		var option format.Option
+		var id sbom.FormatID
 		switch f.format {
 		case CycloneDXFormat:
-			option = format.CycloneDxJSONOption
+			id = syft.CycloneDxJSONFormatID
 		case SPDXFormat:
-			option = format.SPDXJSONOption
+			id = syft.SPDXJSONFormatID
 		case SyftFormat:
-			option = format.JSONOption
+			id = syft.JSONFormatID
 		default:
-			option = format.UnknownFormatOption
+			return 0, fmt.Errorf("failed to format sbom: unsupported format %q", f.format)
 		}
 
-		output, err := syft.Encode(f.sbom.syft, option)
+		output, err := syft.Encode(f.sbom.syft, syft.FormatByID(id))
 		if err != nil {
 			return 0, fmt.Errorf("failed to format sbom: %w", err)
 		}

diff --git a/sbom/formatted_reader_test.go b/sbom/formatted_reader_test.go
@@ -96,7 +96,7 @@ func testFormattedReader(t *testing.T, context spec.G, it spec.S) {
 				it("returns an error", func() {
 					formatter := sbom.NewFormattedReader(sbom.SBOM{}, sbom.Format("unknown-format"))
 					_, err := formatter.Read(make([]byte, 10))
-					Expect(err).To(MatchError("failed to format sbom: unsupported format: UnknownFormatOption"))
+					Expect(err).To(MatchError("failed to format sbom: unsupported format \"unknown-format\""))
 				})
 			})
 		})