From c6447cb62b9ea2a196aa33b6a1a0e4ed27cbb3b4 Mon Sep 17 00:00:00 2001 From: Alex Goodman Date: Sun, 10 Oct 2021 18:59:46 -0700 Subject: [PATCH] update anchore import to use the new format option Signed-off-by: Alex Goodman --- internal/anchore/import_package_sbom.go | 5 +++-- internal/anchore/import_package_sbom_test.go | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/internal/anchore/import_package_sbom.go b/internal/anchore/import_package_sbom.go index 02b832e7e..858eef77d 100644 --- a/internal/anchore/import_package_sbom.go +++ b/internal/anchore/import_package_sbom.go @@ -8,7 +8,8 @@ import ( "fmt" "net/http" - "github.com/anchore/syft/internal/presenter/packages" + "github.com/anchore/syft/internal/formats" + "github.com/anchore/syft/syft/format" "github.com/wagoodman/go-progress" @@ -26,7 +27,7 @@ type packageSBOMImportAPI interface { func packageSbomModel(s source.Metadata, catalog *pkg.Catalog, d *distro.Distro, scope source.Scope) (*external.ImagePackageManifest, error) { var buf bytes.Buffer - pres := packages.NewJSONPresenter(catalog, s, d, scope) + pres := formats.ByOption(format.JSONOption).Presenter(catalog, &s, d) err := pres.Present(&buf) if err != nil { return nil, fmt.Errorf("unable to serialize results: %w", err) diff --git a/internal/anchore/import_package_sbom_test.go b/internal/anchore/import_package_sbom_test.go index cf97899ea..80e5055c2 100644 --- a/internal/anchore/import_package_sbom_test.go +++ b/internal/anchore/import_package_sbom_test.go @@ -9,6 +9,8 @@ import ( "strings" "testing" + model2 "github.com/anchore/syft/internal/formats/syftjson/model" + "github.com/anchore/syft/internal/presenter/packages" "github.com/wagoodman/go-progress" @@ -94,13 +96,13 @@ func TestPackageSbomToModel(t *testing.T) { } // unmarshal expected result - var expectedDoc packages.JSONDocument + var expectedDoc model2.Document if err := json.Unmarshal(buf.Bytes(), &expectedDoc); err != nil { t.Fatalf("unable to parse json doc: %+v", err) } // unmarshal actual result - var actualDoc packages.JSONDocument + var actualDoc model2.Document if err := json.Unmarshal(modelJSON, &actualDoc); err != nil { t.Fatalf("unable to parse json doc: %+v", err) }