chore: clear up flag issue with multiple cyclonedx format

Signed-off-by: Christopher Phillips <christopher.phillips@anchore.com>
anchore · Dec 13, 2022 · cb3116e · cb3116e
1 parent b747021
commit cb3116e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 46 deletions.
diff --git a/grype/presenter/cyclonedx/presenter.go b/grype/presenter/cyclonedx/presenter.go
@@ -24,14 +24,14 @@ type Presenter struct {
 }
 
 // NewPresenter is a *Presenter constructor
-func NewPresenter(pb models.PresenterBundle) *Presenter {
+func NewPresenter(pb models.PresenterBundle, format cyclonedx.BOMFileFormat) *Presenter {
 	return &Presenter{
 		results:          pb.Matches,
 		packages:         pb.Packages,
 		metadataProvider: pb.MetadataProvider,
 		srcMetadata:      pb.Context.Source,
 		sbom:             pb.SBOM,
-		format:           cyclonedx.BOMFileFormatJSON,
+		format:           format,
 	}
 }
 

diff --git a/grype/presenter/cyclonedxvex/presenter.go b/grype/presenter/cyclonedxvex/presenter.go
diff --git a/grype/presenter/format.go b/grype/presenter/format.go
@@ -31,12 +31,12 @@ func parse(userInput string) format {
 		return jsonFormat
 	case strings.ToLower(tableFormat.String()):
 		return tableFormat
-	case strings.ToLower(cycloneDXFormat.String()):
-		return cycloneDXFormat
 	case strings.ToLower(sarifFormat.String()):
 		return sarifFormat
 	case strings.ToLower(templateFormat.String()):
 		return templateFormat
+	case strings.ToLower(cycloneDXFormat.String()):
+		return cycloneDXFormat
 	case strings.ToLower(embeddedVEXJSON.String()):
 		return embeddedVEXJSON
 	case strings.ToLower(embeddedVEXXML.String()):

diff --git a/grype/presenter/presenter.go b/grype/presenter/presenter.go
@@ -29,12 +29,14 @@ func GetPresenter(c Config, pb models.PresenterBundle) Presenter {
 			return table.NewPresenter(pb)
 		}
 		return table.NewPresenter(pb)
+	// NOTE: cyclonedx is identical to embeddedVEXJSON
+	// The cyclonedx library only provides two BOM formats: JSON and XML
 	case cycloneDXFormat:
-		return cyclonedx.NewPresenter(pb)
+		return cyclonedx.NewPresenter(pb, cyclonedxLib.BOMFileFormatJSON)
 	case embeddedVEXJSON:
 		return cyclonedxvex.NewPresenter(pb, cyclonedxLib.BOMFileFormatJSON)
 	case embeddedVEXXML:
-		return cyclonedxvex.NewPresenter(pb, cyclonedxLib.BOMFileFormatXML)
+		return cyclonedx.NewPresenter(pb, cyclonedxLib.BOMFileFormatXML)
 	case sarifFormat:
 		return sarif.NewPresenter(pb)
 	case templateFormat: