Simplify v6 distribution material (#2277)

* adjust enumerations

Signed-off-by: Alex Goodman <[email protected]>

* simplify distribution artifacts and plumb to import

Signed-off-by: Alex Goodman <[email protected]>

* make assigner plural

Signed-off-by: Alex Goodman <[email protected]>

* fix tests

Signed-off-by: Alex Goodman <[email protected]>

* incorporate review comments

Signed-off-by: Alex Goodman <[email protected]>

* remove advisory reference tag

Signed-off-by: Alex Goodman <[email protected]>

---------

Signed-off-by: Alex Goodman <[email protected]>

Author: wagoodman

Taskfile.yaml

@@ -57,7 +57,8 @@ tasks:
       - task: check-licenses
       - task: lint
       - task: validate-cyclonedx-schema
-      - task: validate-grype-db-schema
+# TODO: while developing v6, we need to disable this check (since v5 and v6 are imported in the same codebase)
+#      - task: validate-grype-db-schema
 
   test:
     desc: Run all levels of test

cmd/grype/cli/commands/db_check.go

@@ -34,7 +34,7 @@ func DBCheck(app clio.Application) *cobra.Command {
 }
 
 func runDBCheck(opts options.Database) error {
-	dbCurator, err := distribution.NewCurator(opts.ToCuratorConfig())
+	dbCurator, err := distribution.NewCurator(opts.ToLegacyCuratorConfig())
 	if err != nil {
 		return err
 	}

cmd/grype/cli/commands/db_delete.go

@@ -25,7 +25,7 @@ func DBDelete(app clio.Application) *cobra.Command {
 }
 
 func runDBDelete(opts options.Database) error {
-	dbCurator, err := distribution.NewCurator(opts.ToCuratorConfig())
+	dbCurator, err := distribution.NewCurator(opts.ToLegacyCuratorConfig())
 	if err != nil {
 		return err
 	}

cmd/grype/cli/commands/db_diff.go

@@ -65,7 +65,7 @@ func DBDiff(app clio.Application) *cobra.Command {
 }
 
 func runDBDiff(opts *dbDiffOptions, base string, target string) (errs error) {
-	d, err := differ.NewDiffer(opts.DB.ToCuratorConfig())
+	d, err := differ.NewDiffer(opts.DB.ToLegacyCuratorConfig())
 	if err != nil {
 		return err
 	}
@@ -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 := distribution.NewCurator(opts.ToCuratorConfig())
+	dbCurator, err := distribution.NewCurator(opts.ToLegacyCuratorConfig())
 	if err != nil {
 		return "", "", err
 	}

cmd/grype/cli/commands/db_import.go

@@ -2,12 +2,16 @@ package commands
 
 import (
 	"fmt"
+	"path/filepath"
+	"strings"
 
 	"github.com/spf13/cobra"
 
 	"github.com/anchore/clio"
 	"github.com/anchore/grype/cmd/grype/cli/options"
-	"github.com/anchore/grype/grype/db/legacy/distribution"
+	legacyDistribution "github.com/anchore/grype/grype/db/legacy/distribution"
+	"github.com/anchore/grype/grype/db/v6/distribution"
+	"github.com/anchore/grype/grype/db/v6/installation"
 	"github.com/anchore/grype/internal"
 )
 
@@ -27,14 +31,44 @@ func DBImport(app clio.Application) *cobra.Command {
 }
 
 func runDBImport(opts options.Database, dbArchivePath string) error {
-	dbCurator, err := distribution.NewCurator(opts.ToCuratorConfig())
+	// TODO: tui update? better logging?
+
+	// TODO: we will only support v6 after development is complete
+	if isV6DB(dbArchivePath) {
+		return importDB(opts, dbArchivePath)
+	}
+	return legacyDBImport(opts, dbArchivePath)
+}
+
+func importDB(opts options.Database, dbArchivePath string) error {
+	client, err := distribution.NewClient(opts.ToClientConfig())
+	if err != nil {
+		return fmt.Errorf("unable to create distribution client: %w", err)
+	}
+	c, err := installation.NewCurator(opts.ToCuratorConfig(), client)
+	if err != nil {
+		return fmt.Errorf("unable to create curator: %w", err)
+	}
+
+	if err := c.Import(dbArchivePath); err != nil {
+		return fmt.Errorf("unable to import vulnerability database: %w", err)
+	}
+	return stderrPrintLnf("Vulnerability database imported")
+}
+
+func legacyDBImport(opts options.Database, dbArchivePath string) error {
+	dbCurator, err := legacyDistribution.NewCurator(opts.ToLegacyCuratorConfig())
 	if err != nil {
 		return err
 	}
 
 	if err := dbCurator.ImportFrom(dbArchivePath); err != nil {
-		return fmt.Errorf("unable to import vulnerability database: %+v", err)
+		return fmt.Errorf("unable to import vulnerability database: %w", err)
 	}
 
 	return stderrPrintLnf("Vulnerability database imported")
 }
+
+func isV6DB(path string) bool {
+	return strings.Contains(filepath.Base(path), "vulnerability-db_v6")
+}

cmd/grype/cli/commands/db_list.go

@@ -40,7 +40,7 @@ func DBList(app clio.Application) *cobra.Command {
 }
 
 func runDBList(opts *dbListOptions) error {
-	dbCurator, err := distribution.NewCurator(opts.DB.ToCuratorConfig())
+	dbCurator, err := distribution.NewCurator(opts.DB.ToLegacyCuratorConfig())
 	if err != nil {
 		return err
 	}

cmd/grype/cli/commands/db_providers.go

@@ -83,7 +83,7 @@ func runDBProviders(opts *dbProvidersOptions, app clio.Application) error {
 }
 
 func getMetadataFileLocation(app clio.Application) (*string, error) {
-	dbCurator, err := distribution.NewCurator(dbOptionsDefault(app.ID()).DB.ToCuratorConfig())
+	dbCurator, err := distribution.NewCurator(dbOptionsDefault(app.ID()).DB.ToLegacyCuratorConfig())
 	if err != nil {
 		return nil, err
 	}

cmd/grype/cli/commands/db_search.go

@@ -46,7 +46,7 @@ func DBSearch(app clio.Application) *cobra.Command {
 
 func runDBSearch(opts *dbQueryOptions, vulnerabilityID string) error {
 	log.Debug("loading DB")
-	str, status, dbCloser, err := grype.LoadVulnerabilityDB(opts.DB.ToCuratorConfig(), opts.DB.AutoUpdate)
+	str, status, dbCloser, err := grype.LoadVulnerabilityDB(opts.DB.ToLegacyCuratorConfig(), opts.DB.AutoUpdate)
 	err = validateDBLoad(err, status)
 	if err != nil {
 		return err

cmd/grype/cli/commands/db_status.go

@@ -25,7 +25,7 @@ func DBStatus(app clio.Application) *cobra.Command {
 }
 
 func runDBStatus(opts options.Database) error {
-	dbCurator, err := distribution.NewCurator(opts.ToCuratorConfig())
+	dbCurator, err := distribution.NewCurator(opts.ToLegacyCuratorConfig())
 	if err != nil {
 		return err
 	}

cmd/grype/cli/commands/db_update.go

@@ -31,7 +31,7 @@ func DBUpdate(app clio.Application) *cobra.Command {
 }
 
 func runDBUpdate(opts options.Database) error {
-	dbCurator, err := distribution.NewCurator(opts.ToCuratorConfig())
+	dbCurator, err := distribution.NewCurator(opts.ToLegacyCuratorConfig())
 	if err != nil {
 		return err
 	}