Export the presenter interface so it may be used by external projects

Signed-off-by: Samuel Dacanay <sam.dacanay@anchore.com>

cmd/packages.go

@@ -6,13 +6,14 @@ import (
 	"io/ioutil"
 	"os"
 
+	"github.com/anchore/syft/syft/presenter/packages"
+
 	"github.com/spf13/viper"
 
 	"github.com/anchore/syft/internal"
 	"github.com/anchore/syft/internal/anchore"
 	"github.com/anchore/syft/internal/bus"
 	"github.com/anchore/syft/internal/log"
-	"github.com/anchore/syft/internal/presenter/packages"
 	"github.com/anchore/syft/internal/ui"
 	"github.com/anchore/syft/syft"
 	"github.com/anchore/syft/syft/distro"

syft/event/parsers/parsers.go

@@ -6,9 +6,9 @@ package parsers
 import (
 	"fmt"
 
-	"github.com/anchore/syft/syft/file"
+	"github.com/anchore/syft/syft/presenter"
 
-	"github.com/anchore/syft/internal/presenter"
+	"github.com/anchore/syft/syft/file"
 
 	"github.com/wagoodman/go-progress"
 

syft/presenter/packages/presenter.go

@@ -5,20 +5,21 @@ a specific Presenter implementation given user configuration.
 package packages
 
 import (
-	"github.com/anchore/syft/internal/presenter"
+	"github.com/anchore/syft/internal/presenter/packages"
+	"github.com/anchore/syft/syft/presenter"
 )
 
 // Presenter returns a presenter for images or directories
 func Presenter(option PresenterOption, config PresenterConfig) presenter.Presenter {
 	switch option {
 	case JSONPresenterOption:
-		return NewJSONPresenter(config.Catalog, config.SourceMetadata, config.Distro, config.Scope)
+		return packages.NewJSONPresenter(config.Catalog, config.SourceMetadata, config.Distro, config.Scope)
 	case TextPresenterOption:
-		return NewTextPresenter(config.Catalog, config.SourceMetadata)
+		return packages.NewTextPresenter(config.Catalog, config.SourceMetadata)
 	case TablePresenterOption:
-		return NewTablePresenter(config.Catalog)
+		return packages.NewTablePresenter(config.Catalog)
 	case CycloneDxPresenterOption:
-		return NewCycloneDxPresenter(config.Catalog, config.SourceMetadata)
+		return packages.NewCycloneDxPresenter(config.Catalog, config.SourceMetadata)
 	default:
 		return nil
 	}

test/integration/package_ownership_relationship_test.go

@@ -3,9 +3,10 @@ package integration
 import (
 	"bytes"
 	"encoding/json"
+	exportedPackages "github.com/anchore/syft/syft/presenter/packages"
 	"testing"
 
-	"github.com/anchore/syft/internal/presenter/packages"
+	internalPackages "github.com/anchore/syft/internal/presenter/packages"
 )
 
 func TestPackageOwnershipRelationships(t *testing.T) {
@@ -23,7 +24,7 @@ func TestPackageOwnershipRelationships(t *testing.T) {
 		t.Run(test.fixture, func(t *testing.T) {
 			catalog, d, src := catalogFixtureImage(t, test.fixture)
 
-			p := packages.Presenter(packages.JSONPresenterOption, packages.PresenterConfig{
+			p := exportedPackages.Presenter(exportedPackages.JSONPresenterOption, exportedPackages.PresenterConfig{
 				SourceMetadata: src.Metadata,
 				Catalog:        catalog,
 				Distro:         d,
@@ -38,7 +39,7 @@ func TestPackageOwnershipRelationships(t *testing.T) {
 				t.Fatalf("unable to present: %+v", err)
 			}
 
-			var doc packages.JSONDocument
+			var doc internalPackages.JSONDocument
 			decoder := json.NewDecoder(output)
 			if err := decoder.Decode(&doc); err != nil {
 				t.Fatalf("unable to decode json doc: %+v", err)