From 2264f134ddff88452997f38783eb2a300aede482 Mon Sep 17 00:00:00 2001 From: Alex Goodman Date: Thu, 26 Sep 2024 10:49:21 -0400 Subject: [PATCH] migrate legacy distribution concerns Signed-off-by: Alex Goodman --- cmd/grype/cli/commands/db_check.go | 4 ++-- cmd/grype/cli/commands/db_delete.go | 4 ++-- cmd/grype/cli/commands/db_diff.go | 4 ++-- cmd/grype/cli/commands/db_import.go | 4 ++-- cmd/grype/cli/commands/db_list.go | 4 ++-- cmd/grype/cli/commands/db_status.go | 4 ++-- cmd/grype/cli/commands/db_update.go | 4 ++-- cmd/grype/cli/commands/root.go | 5 +++-- cmd/grype/cli/options/database.go | 6 +++--- grype/db/{ => legacy/distribution}/curator.go | 2 +- .../{ => legacy/distribution}/curator_test.go | 2 +- grype/db/{ => legacy/distribution}/listing.go | 2 +- .../distribution}/listing_entry.go | 2 +- .../{ => legacy/distribution}/listing_test.go | 2 +- .../db/{ => legacy/distribution}/metadata.go | 2 +- .../distribution}/metadata_test.go | 2 +- grype/db/{ => legacy/distribution}/status.go | 2 +- .../bad-checksum/metadata.json | 0 .../bad-checksum/vulnerability.db | 0 .../good-checksum/metadata.json | 0 .../good-checksum/vulnerability.db | 0 .../test-fixtures/listing-sorted.json | 0 .../test-fixtures/listing-unsorted.json | 0 .../distribution}/test-fixtures/listing.json | 0 .../metadata-edt-timezone/metadata.json | 0 .../metadata-gocase/metadata.json | 0 .../test-fixtures/tls/.gitignore | 0 .../distribution}/test-fixtures/tls/Makefile | 0 .../distribution}/test-fixtures/tls/README.md | 0 .../tls/generate-x509-cert-pair.sh | 0 .../test-fixtures/tls/listing.py | 0 .../distribution}/test-fixtures/tls/serve.py | 0 grype/db/test-fixtures/archives/metadata.json | 1 - grype/differ/differ.go | 20 +++++++++---------- grype/differ/differ_test.go | 6 +++--- grype/load_vulnerability_db.go | 5 +++-- grype/load_vulnerability_db_bench_test.go | 4 ++-- .../compare_sbom_input_vs_lib_test.go | 4 ++-- 38 files changed, 48 insertions(+), 47 deletions(-) rename grype/db/{ => legacy/distribution}/curator.go (99%) rename grype/db/{ => legacy/distribution}/curator_test.go (99%) rename grype/db/{ => legacy/distribution}/listing.go (99%) rename grype/db/{ => legacy/distribution}/listing_entry.go (99%) rename grype/db/{ => legacy/distribution}/listing_test.go (99%) rename grype/db/{ => legacy/distribution}/metadata.go (99%) rename grype/db/{ => legacy/distribution}/metadata_test.go (99%) rename grype/db/{ => legacy/distribution}/status.go (92%) rename grype/db/{ => legacy/distribution}/test-fixtures/curator-validate/bad-checksum/metadata.json (100%) rename grype/db/{ => legacy/distribution}/test-fixtures/curator-validate/bad-checksum/vulnerability.db (100%) rename grype/db/{ => legacy/distribution}/test-fixtures/curator-validate/good-checksum/metadata.json (100%) rename grype/db/{ => legacy/distribution}/test-fixtures/curator-validate/good-checksum/vulnerability.db (100%) rename grype/db/{ => legacy/distribution}/test-fixtures/listing-sorted.json (100%) rename grype/db/{ => legacy/distribution}/test-fixtures/listing-unsorted.json (100%) rename grype/db/{ => legacy/distribution}/test-fixtures/listing.json (100%) rename grype/db/{ => legacy/distribution}/test-fixtures/metadata-edt-timezone/metadata.json (100%) rename grype/db/{ => legacy/distribution}/test-fixtures/metadata-gocase/metadata.json (100%) rename grype/db/{ => legacy/distribution}/test-fixtures/tls/.gitignore (100%) rename grype/db/{ => legacy/distribution}/test-fixtures/tls/Makefile (100%) rename grype/db/{ => legacy/distribution}/test-fixtures/tls/README.md (100%) rename grype/db/{ => legacy/distribution}/test-fixtures/tls/generate-x509-cert-pair.sh (100%) rename grype/db/{ => legacy/distribution}/test-fixtures/tls/listing.py (100%) rename grype/db/{ => legacy/distribution}/test-fixtures/tls/serve.py (100%) delete mode 100644 grype/db/test-fixtures/archives/metadata.json diff --git a/cmd/grype/cli/commands/db_check.go b/cmd/grype/cli/commands/db_check.go index 5f34b8312b6..229d22c32a9 100644 --- a/cmd/grype/cli/commands/db_check.go +++ b/cmd/grype/cli/commands/db_check.go @@ -8,7 +8,7 @@ import ( "github.com/anchore/clio" "github.com/anchore/grype/cmd/grype/cli/options" - "github.com/anchore/grype/grype/db" + "github.com/anchore/grype/grype/db/legacy/distribution" ) const ( @@ -30,7 +30,7 @@ func DBCheck(app clio.Application) *cobra.Command { } func runDBCheck(opts options.Database) error { - dbCurator, err := db.NewCurator(opts.ToCuratorConfig()) + dbCurator, err := distribution.NewCurator(opts.ToCuratorConfig()) if err != nil { return err } diff --git a/cmd/grype/cli/commands/db_delete.go b/cmd/grype/cli/commands/db_delete.go index b7080786c6c..df57fe0e8f7 100644 --- a/cmd/grype/cli/commands/db_delete.go +++ b/cmd/grype/cli/commands/db_delete.go @@ -7,7 +7,7 @@ import ( "github.com/anchore/clio" "github.com/anchore/grype/cmd/grype/cli/options" - "github.com/anchore/grype/grype/db" + "github.com/anchore/grype/grype/db/legacy/distribution" ) func DBDelete(app clio.Application) *cobra.Command { @@ -25,7 +25,7 @@ func DBDelete(app clio.Application) *cobra.Command { } func runDBDelete(opts options.Database) error { - dbCurator, err := db.NewCurator(opts.ToCuratorConfig()) + dbCurator, err := distribution.NewCurator(opts.ToCuratorConfig()) if err != nil { return err } diff --git a/cmd/grype/cli/commands/db_diff.go b/cmd/grype/cli/commands/db_diff.go index e6029302ebf..0072a4544aa 100644 --- a/cmd/grype/cli/commands/db_diff.go +++ b/cmd/grype/cli/commands/db_diff.go @@ -8,7 +8,7 @@ import ( "github.com/anchore/clio" "github.com/anchore/grype/cmd/grype/cli/options" - "github.com/anchore/grype/grype/db" + "github.com/anchore/grype/grype/db/legacy/distribution" "github.com/anchore/grype/grype/differ" "github.com/anchore/grype/internal/bus" "github.com/anchore/grype/internal/log" @@ -104,7 +104,7 @@ func runDBDiff(opts *dbDiffOptions, base string, target string) (errs error) { } func getDefaultURLs(opts options.Database) (baseURL string, targetURL string, err error) { - dbCurator, err := db.NewCurator(opts.ToCuratorConfig()) + dbCurator, err := distribution.NewCurator(opts.ToCuratorConfig()) if err != nil { return "", "", err } diff --git a/cmd/grype/cli/commands/db_import.go b/cmd/grype/cli/commands/db_import.go index a1eedc2b0a8..ce1d8236472 100644 --- a/cmd/grype/cli/commands/db_import.go +++ b/cmd/grype/cli/commands/db_import.go @@ -7,7 +7,7 @@ import ( "github.com/anchore/clio" "github.com/anchore/grype/cmd/grype/cli/options" - "github.com/anchore/grype/grype/db" + "github.com/anchore/grype/grype/db/legacy/distribution" "github.com/anchore/grype/internal" ) @@ -27,7 +27,7 @@ func DBImport(app clio.Application) *cobra.Command { } func runDBImport(opts options.Database, dbArchivePath string) error { - dbCurator, err := db.NewCurator(opts.ToCuratorConfig()) + dbCurator, err := distribution.NewCurator(opts.ToCuratorConfig()) if err != nil { return err } diff --git a/cmd/grype/cli/commands/db_list.go b/cmd/grype/cli/commands/db_list.go index 2caabb0f76f..30a1cfd7bec 100644 --- a/cmd/grype/cli/commands/db_list.go +++ b/cmd/grype/cli/commands/db_list.go @@ -8,7 +8,7 @@ import ( "github.com/spf13/cobra" "github.com/anchore/clio" - "github.com/anchore/grype/grype/db" + "github.com/anchore/grype/grype/db/legacy/distribution" ) type dbListOptions struct { @@ -40,7 +40,7 @@ func DBList(app clio.Application) *cobra.Command { } func runDBList(opts *dbListOptions) error { - dbCurator, err := db.NewCurator(opts.DB.ToCuratorConfig()) + dbCurator, err := distribution.NewCurator(opts.DB.ToCuratorConfig()) if err != nil { return err } diff --git a/cmd/grype/cli/commands/db_status.go b/cmd/grype/cli/commands/db_status.go index 73c63dd2ca7..67c3f59ec9f 100644 --- a/cmd/grype/cli/commands/db_status.go +++ b/cmd/grype/cli/commands/db_status.go @@ -7,7 +7,7 @@ import ( "github.com/anchore/clio" "github.com/anchore/grype/cmd/grype/cli/options" - "github.com/anchore/grype/grype/db" + "github.com/anchore/grype/grype/db/legacy/distribution" ) func DBStatus(app clio.Application) *cobra.Command { @@ -25,7 +25,7 @@ func DBStatus(app clio.Application) *cobra.Command { } func runDBStatus(opts options.Database) error { - dbCurator, err := db.NewCurator(opts.ToCuratorConfig()) + dbCurator, err := distribution.NewCurator(opts.ToCuratorConfig()) if err != nil { return err } diff --git a/cmd/grype/cli/commands/db_update.go b/cmd/grype/cli/commands/db_update.go index 4b8110ba9b0..2f2fc1a9e6b 100644 --- a/cmd/grype/cli/commands/db_update.go +++ b/cmd/grype/cli/commands/db_update.go @@ -7,7 +7,7 @@ import ( "github.com/anchore/clio" "github.com/anchore/grype/cmd/grype/cli/options" - "github.com/anchore/grype/grype/db" + "github.com/anchore/grype/grype/db/legacy/distribution" "github.com/anchore/grype/internal/bus" "github.com/anchore/grype/internal/log" ) @@ -26,7 +26,7 @@ func DBUpdate(app clio.Application) *cobra.Command { } func runDBUpdate(opts options.Database) error { - dbCurator, err := db.NewCurator(opts.ToCuratorConfig()) + dbCurator, err := distribution.NewCurator(opts.ToCuratorConfig()) if err != nil { return err } diff --git a/cmd/grype/cli/commands/root.go b/cmd/grype/cli/commands/root.go index 0abe234fd7f..90d2ecd903e 100644 --- a/cmd/grype/cli/commands/root.go +++ b/cmd/grype/cli/commands/root.go @@ -12,6 +12,7 @@ import ( "github.com/anchore/grype/cmd/grype/cli/options" "github.com/anchore/grype/grype" "github.com/anchore/grype/grype/db" + "github.com/anchore/grype/grype/db/legacy/distribution" grypeDb "github.com/anchore/grype/grype/db/v5" "github.com/anchore/grype/grype/event" "github.com/anchore/grype/grype/event/parsers" @@ -117,7 +118,7 @@ func runGrype(app clio.Application, opts *options.Grype, userInput string) (errs } var str *store.Store - var status *db.Status + var status *distribution.Status var dbCloser *db.Closer var packages []pkg.Package var s *sbom.SBOM @@ -320,7 +321,7 @@ func getProviderConfig(opts *options.Grype) pkg.ProviderConfig { } } -func validateDBLoad(loadErr error, status *db.Status) error { +func validateDBLoad(loadErr error, status *distribution.Status) error { if loadErr != nil { return fmt.Errorf("failed to load vulnerability db: %w", loadErr) } diff --git a/cmd/grype/cli/options/database.go b/cmd/grype/cli/options/database.go index 986cfab2cf6..38fe4be3a1e 100644 --- a/cmd/grype/cli/options/database.go +++ b/cmd/grype/cli/options/database.go @@ -7,7 +7,7 @@ import ( "github.com/adrg/xdg" "github.com/anchore/clio" - "github.com/anchore/grype/grype/db" + "github.com/anchore/grype/grype/db/legacy/distribution" "github.com/anchore/grype/internal" ) @@ -50,8 +50,8 @@ func DefaultDatabase(id clio.Identification) Database { } } -func (cfg Database) ToCuratorConfig() db.Config { - return db.Config{ +func (cfg Database) ToCuratorConfig() distribution.Config { + return distribution.Config{ ID: cfg.ID, DBRootDir: cfg.Dir, ListingURL: cfg.UpdateURL, diff --git a/grype/db/curator.go b/grype/db/legacy/distribution/curator.go similarity index 99% rename from grype/db/curator.go rename to grype/db/legacy/distribution/curator.go index 0ac906e8ac1..6b9b40ce248 100644 --- a/grype/db/curator.go +++ b/grype/db/legacy/distribution/curator.go @@ -1,4 +1,4 @@ -package db +package distribution import ( "crypto/tls" diff --git a/grype/db/curator_test.go b/grype/db/legacy/distribution/curator_test.go similarity index 99% rename from grype/db/curator_test.go rename to grype/db/legacy/distribution/curator_test.go index d1bc203e577..579acf2496d 100644 --- a/grype/db/curator_test.go +++ b/grype/db/legacy/distribution/curator_test.go @@ -1,4 +1,4 @@ -package db +package distribution import ( "archive/tar" diff --git a/grype/db/listing.go b/grype/db/legacy/distribution/listing.go similarity index 99% rename from grype/db/listing.go rename to grype/db/legacy/distribution/listing.go index 3930a736846..d5ace7c1799 100644 --- a/grype/db/listing.go +++ b/grype/db/legacy/distribution/listing.go @@ -1,4 +1,4 @@ -package db +package distribution import ( "encoding/json" diff --git a/grype/db/listing_entry.go b/grype/db/legacy/distribution/listing_entry.go similarity index 99% rename from grype/db/listing_entry.go rename to grype/db/legacy/distribution/listing_entry.go index 9b928e6fe3c..6f334e7f4ad 100644 --- a/grype/db/listing_entry.go +++ b/grype/db/legacy/distribution/listing_entry.go @@ -1,4 +1,4 @@ -package db +package distribution import ( "crypto/sha256" diff --git a/grype/db/listing_test.go b/grype/db/legacy/distribution/listing_test.go similarity index 99% rename from grype/db/listing_test.go rename to grype/db/legacy/distribution/listing_test.go index 673b78a8553..44f3d4a441f 100644 --- a/grype/db/listing_test.go +++ b/grype/db/legacy/distribution/listing_test.go @@ -1,4 +1,4 @@ -package db +package distribution import ( "net/url" diff --git a/grype/db/metadata.go b/grype/db/legacy/distribution/metadata.go similarity index 99% rename from grype/db/metadata.go rename to grype/db/legacy/distribution/metadata.go index 60fc6702583..70e451fbb01 100644 --- a/grype/db/metadata.go +++ b/grype/db/legacy/distribution/metadata.go @@ -1,4 +1,4 @@ -package db +package distribution import ( "encoding/json" diff --git a/grype/db/metadata_test.go b/grype/db/legacy/distribution/metadata_test.go similarity index 99% rename from grype/db/metadata_test.go rename to grype/db/legacy/distribution/metadata_test.go index bd94cb65681..e6a2feb5540 100644 --- a/grype/db/metadata_test.go +++ b/grype/db/legacy/distribution/metadata_test.go @@ -1,4 +1,4 @@ -package db +package distribution import ( "testing" diff --git a/grype/db/status.go b/grype/db/legacy/distribution/status.go similarity index 92% rename from grype/db/status.go rename to grype/db/legacy/distribution/status.go index 7f90ab98ccb..c19c9b2251b 100644 --- a/grype/db/status.go +++ b/grype/db/legacy/distribution/status.go @@ -1,4 +1,4 @@ -package db +package distribution import "time" diff --git a/grype/db/test-fixtures/curator-validate/bad-checksum/metadata.json b/grype/db/legacy/distribution/test-fixtures/curator-validate/bad-checksum/metadata.json similarity index 100% rename from grype/db/test-fixtures/curator-validate/bad-checksum/metadata.json rename to grype/db/legacy/distribution/test-fixtures/curator-validate/bad-checksum/metadata.json diff --git a/grype/db/test-fixtures/curator-validate/bad-checksum/vulnerability.db b/grype/db/legacy/distribution/test-fixtures/curator-validate/bad-checksum/vulnerability.db similarity index 100% rename from grype/db/test-fixtures/curator-validate/bad-checksum/vulnerability.db rename to grype/db/legacy/distribution/test-fixtures/curator-validate/bad-checksum/vulnerability.db diff --git a/grype/db/test-fixtures/curator-validate/good-checksum/metadata.json b/grype/db/legacy/distribution/test-fixtures/curator-validate/good-checksum/metadata.json similarity index 100% rename from grype/db/test-fixtures/curator-validate/good-checksum/metadata.json rename to grype/db/legacy/distribution/test-fixtures/curator-validate/good-checksum/metadata.json diff --git a/grype/db/test-fixtures/curator-validate/good-checksum/vulnerability.db b/grype/db/legacy/distribution/test-fixtures/curator-validate/good-checksum/vulnerability.db similarity index 100% rename from grype/db/test-fixtures/curator-validate/good-checksum/vulnerability.db rename to grype/db/legacy/distribution/test-fixtures/curator-validate/good-checksum/vulnerability.db diff --git a/grype/db/test-fixtures/listing-sorted.json b/grype/db/legacy/distribution/test-fixtures/listing-sorted.json similarity index 100% rename from grype/db/test-fixtures/listing-sorted.json rename to grype/db/legacy/distribution/test-fixtures/listing-sorted.json diff --git a/grype/db/test-fixtures/listing-unsorted.json b/grype/db/legacy/distribution/test-fixtures/listing-unsorted.json similarity index 100% rename from grype/db/test-fixtures/listing-unsorted.json rename to grype/db/legacy/distribution/test-fixtures/listing-unsorted.json diff --git a/grype/db/test-fixtures/listing.json b/grype/db/legacy/distribution/test-fixtures/listing.json similarity index 100% rename from grype/db/test-fixtures/listing.json rename to grype/db/legacy/distribution/test-fixtures/listing.json diff --git a/grype/db/test-fixtures/metadata-edt-timezone/metadata.json b/grype/db/legacy/distribution/test-fixtures/metadata-edt-timezone/metadata.json similarity index 100% rename from grype/db/test-fixtures/metadata-edt-timezone/metadata.json rename to grype/db/legacy/distribution/test-fixtures/metadata-edt-timezone/metadata.json diff --git a/grype/db/test-fixtures/metadata-gocase/metadata.json b/grype/db/legacy/distribution/test-fixtures/metadata-gocase/metadata.json similarity index 100% rename from grype/db/test-fixtures/metadata-gocase/metadata.json rename to grype/db/legacy/distribution/test-fixtures/metadata-gocase/metadata.json diff --git a/grype/db/test-fixtures/tls/.gitignore b/grype/db/legacy/distribution/test-fixtures/tls/.gitignore similarity index 100% rename from grype/db/test-fixtures/tls/.gitignore rename to grype/db/legacy/distribution/test-fixtures/tls/.gitignore diff --git a/grype/db/test-fixtures/tls/Makefile b/grype/db/legacy/distribution/test-fixtures/tls/Makefile similarity index 100% rename from grype/db/test-fixtures/tls/Makefile rename to grype/db/legacy/distribution/test-fixtures/tls/Makefile diff --git a/grype/db/test-fixtures/tls/README.md b/grype/db/legacy/distribution/test-fixtures/tls/README.md similarity index 100% rename from grype/db/test-fixtures/tls/README.md rename to grype/db/legacy/distribution/test-fixtures/tls/README.md diff --git a/grype/db/test-fixtures/tls/generate-x509-cert-pair.sh b/grype/db/legacy/distribution/test-fixtures/tls/generate-x509-cert-pair.sh similarity index 100% rename from grype/db/test-fixtures/tls/generate-x509-cert-pair.sh rename to grype/db/legacy/distribution/test-fixtures/tls/generate-x509-cert-pair.sh diff --git a/grype/db/test-fixtures/tls/listing.py b/grype/db/legacy/distribution/test-fixtures/tls/listing.py similarity index 100% rename from grype/db/test-fixtures/tls/listing.py rename to grype/db/legacy/distribution/test-fixtures/tls/listing.py diff --git a/grype/db/test-fixtures/tls/serve.py b/grype/db/legacy/distribution/test-fixtures/tls/serve.py similarity index 100% rename from grype/db/test-fixtures/tls/serve.py rename to grype/db/legacy/distribution/test-fixtures/tls/serve.py diff --git a/grype/db/test-fixtures/archives/metadata.json b/grype/db/test-fixtures/archives/metadata.json deleted file mode 100644 index 0967ef424bc..00000000000 --- a/grype/db/test-fixtures/archives/metadata.json +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/grype/differ/differ.go b/grype/differ/differ.go index af232875881..2ec432556c6 100644 --- a/grype/differ/differ.go +++ b/grype/differ/differ.go @@ -11,19 +11,19 @@ import ( "github.com/wagoodman/go-partybus" "github.com/wagoodman/go-progress" - "github.com/anchore/grype/grype/db" + "github.com/anchore/grype/grype/db/legacy/distribution" v5 "github.com/anchore/grype/grype/db/v5" "github.com/anchore/grype/grype/event" "github.com/anchore/grype/internal/bus" ) type Differ struct { - baseCurator db.Curator - targetCurator db.Curator + baseCurator distribution.Curator + targetCurator distribution.Curator } -func NewDiffer(config db.Config) (*Differ, error) { - baseCurator, err := db.NewCurator(db.Config{ +func NewDiffer(config distribution.Config) (*Differ, error) { + baseCurator, err := distribution.NewCurator(distribution.Config{ DBRootDir: path.Join(config.DBRootDir, "diff", "base"), ListingURL: config.ListingURL, CACert: config.CACert, @@ -33,7 +33,7 @@ func NewDiffer(config db.Config) (*Differ, error) { return nil, err } - targetCurator, err := db.NewCurator(db.Config{ + targetCurator, err := distribution.NewCurator(distribution.Config{ DBRootDir: path.Join(config.DBRootDir, "diff", "target"), ListingURL: config.ListingURL, CACert: config.CACert, @@ -57,11 +57,11 @@ func (d *Differ) SetTargetDB(target string) error { return d.setOrDownload(&d.targetCurator, target) } -func (d *Differ) setOrDownload(curator *db.Curator, filenameOrURL string) error { +func (d *Differ) setOrDownload(curator *distribution.Curator, filenameOrURL string) error { u, err := url.ParseRequestURI(filenameOrURL) if err != nil || u.Scheme == "" { - *curator, err = db.NewCurator(db.Config{ + *curator, err = distribution.NewCurator(distribution.Config{ DBRootDir: filenameOrURL, }) if err != nil { @@ -76,7 +76,7 @@ func (d *Differ) setOrDownload(curator *db.Curator, filenameOrURL string) error available := listings.Available dbs := available[v5.SchemaVersion] - var listing *db.ListingEntry + var listing *distribution.ListingEntry for _, d := range dbs { database := d @@ -97,7 +97,7 @@ func (d *Differ) setOrDownload(curator *db.Curator, filenameOrURL string) error return nil } -func download(curator *db.Curator, listing *db.ListingEntry) error { +func download(curator *distribution.Curator, listing *distribution.ListingEntry) error { // let consumers know of a monitorable event (download + import stages) importProgress := progress.NewManual(1) stage := progress.NewAtomicStage("checking available databases") diff --git a/grype/differ/differ_test.go b/grype/differ/differ_test.go index 7aee002caaa..f4782e00c4d 100644 --- a/grype/differ/differ_test.go +++ b/grype/differ/differ_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/require" "github.com/anchore/go-testutils" - "github.com/anchore/grype/grype/db" + "github.com/anchore/grype/grype/db/legacy/distribution" v5 "github.com/anchore/grype/grype/db/v5" "github.com/anchore/grype/grype/vulnerability" ) @@ -19,7 +19,7 @@ var update = flag.Bool("update", false, "update the *.golden files for diff pres func TestNewDiffer(t *testing.T) { //GIVEN - config := db.Config{} + config := distribution.Config{} //WHEN differ, err := NewDiffer(config) @@ -30,7 +30,7 @@ func TestNewDiffer(t *testing.T) { } func Test_DifferDirectory(t *testing.T) { - d, err := NewDiffer(db.Config{ + d, err := NewDiffer(distribution.Config{ DBRootDir: "root-dir", }) require.NoError(t, err) diff --git a/grype/load_vulnerability_db.go b/grype/load_vulnerability_db.go index 4b1ea2cf9e1..ca9bb715434 100644 --- a/grype/load_vulnerability_db.go +++ b/grype/load_vulnerability_db.go @@ -2,12 +2,13 @@ package grype import ( "github.com/anchore/grype/grype/db" + "github.com/anchore/grype/grype/db/legacy/distribution" "github.com/anchore/grype/grype/store" "github.com/anchore/grype/internal/log" ) -func LoadVulnerabilityDB(cfg db.Config, update bool) (*store.Store, *db.Status, *db.Closer, error) { - dbCurator, err := db.NewCurator(cfg) +func LoadVulnerabilityDB(cfg distribution.Config, update bool) (*store.Store, *distribution.Status, *db.Closer, error) { + dbCurator, err := distribution.NewCurator(cfg) if err != nil { return nil, nil, nil, err } diff --git a/grype/load_vulnerability_db_bench_test.go b/grype/load_vulnerability_db_bench_test.go index 735a1d0d6dd..30272f1673c 100644 --- a/grype/load_vulnerability_db_bench_test.go +++ b/grype/load_vulnerability_db_bench_test.go @@ -4,7 +4,7 @@ import ( "path/filepath" "testing" - "github.com/anchore/grype/grype/db" + "github.com/anchore/grype/grype/db/legacy/distribution" "github.com/anchore/grype/internal" ) @@ -12,7 +12,7 @@ import ( // of LoadVulnerabilityDB, specifically in regards to hash validation. // https://github.com/anchore/grype/issues/1502 func BenchmarkLoadVulnerabilityDB(b *testing.B) { - cfg := db.Config{ + cfg := distribution.Config{ DBRootDir: filepath.Join(".tmp", "grype-db"), ListingURL: internal.DBUpdateURL, ValidateByHashOnGet: true, diff --git a/test/integration/compare_sbom_input_vs_lib_test.go b/test/integration/compare_sbom_input_vs_lib_test.go index d343cebaed7..49088a7d7af 100644 --- a/test/integration/compare_sbom_input_vs_lib_test.go +++ b/test/integration/compare_sbom_input_vs_lib_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/anchore/grype/grype" - "github.com/anchore/grype/grype/db" + "github.com/anchore/grype/grype/db/legacy/distribution" "github.com/anchore/grype/internal" "github.com/anchore/syft/syft/format/spdxjson" "github.com/anchore/syft/syft/format/spdxtagvalue" @@ -35,7 +35,7 @@ func must(e sbom.FormatEncoder, err error) sbom.FormatEncoder { func TestCompareSBOMInputToLibResults(t *testing.T) { // get a grype DB - store, _, closer, err := grype.LoadVulnerabilityDB(db.Config{ + store, _, closer, err := grype.LoadVulnerabilityDB(distribution.Config{ DBRootDir: "test-fixtures/grype-db", ListingURL: getListingURL(), ValidateByHashOnGet: false,