From 346caef81d9ef851fc4ace0422810656830e3c59 Mon Sep 17 00:00:00 2001 From: Keith Zantow Date: Thu, 12 Dec 2024 11:22:26 -0500 Subject: [PATCH] chore: move v5 differ package Signed-off-by: Keith Zantow --- cmd/grype/cli/commands/db_diff.go | 2 +- grype/{ => db/v5}/differ/differ.go | 0 grype/{ => db/v5}/differ/differ_test.go | 0 grype/{ => db/v5}/differ/test-fixtures/dbs/base/5/metadata.json | 0 .../v5}/differ/test-fixtures/dbs/base/5/vulnerability.db | 0 .../{ => db/v5}/differ/test-fixtures/dbs/target/5/metadata.json | 0 .../v5}/differ/test-fixtures/dbs/target/5/vulnerability.db | 0 .../v5}/differ/test-fixtures/snapshot/TestPresent_Json.golden | 0 .../v5}/differ/test-fixtures/snapshot/TestPresent_Table.golden | 0 9 files changed, 1 insertion(+), 1 deletion(-) rename grype/{ => db/v5}/differ/differ.go (100%) rename grype/{ => db/v5}/differ/differ_test.go (100%) rename grype/{ => db/v5}/differ/test-fixtures/dbs/base/5/metadata.json (100%) rename grype/{ => db/v5}/differ/test-fixtures/dbs/base/5/vulnerability.db (100%) rename grype/{ => db/v5}/differ/test-fixtures/dbs/target/5/metadata.json (100%) rename grype/{ => db/v5}/differ/test-fixtures/dbs/target/5/vulnerability.db (100%) rename grype/{ => db/v5}/differ/test-fixtures/snapshot/TestPresent_Json.golden (100%) rename grype/{ => db/v5}/differ/test-fixtures/snapshot/TestPresent_Table.golden (100%) diff --git a/cmd/grype/cli/commands/db_diff.go b/cmd/grype/cli/commands/db_diff.go index c41a8496d3f..6ff85f3eafb 100644 --- a/cmd/grype/cli/commands/db_diff.go +++ b/cmd/grype/cli/commands/db_diff.go @@ -9,7 +9,7 @@ import ( "github.com/anchore/clio" "github.com/anchore/grype/cmd/grype/cli/options" "github.com/anchore/grype/grype/db/legacy/distribution" - "github.com/anchore/grype/grype/differ" + "github.com/anchore/grype/grype/db/v5/differ" "github.com/anchore/grype/internal/bus" "github.com/anchore/grype/internal/log" ) diff --git a/grype/differ/differ.go b/grype/db/v5/differ/differ.go similarity index 100% rename from grype/differ/differ.go rename to grype/db/v5/differ/differ.go diff --git a/grype/differ/differ_test.go b/grype/db/v5/differ/differ_test.go similarity index 100% rename from grype/differ/differ_test.go rename to grype/db/v5/differ/differ_test.go diff --git a/grype/differ/test-fixtures/dbs/base/5/metadata.json b/grype/db/v5/differ/test-fixtures/dbs/base/5/metadata.json similarity index 100% rename from grype/differ/test-fixtures/dbs/base/5/metadata.json rename to grype/db/v5/differ/test-fixtures/dbs/base/5/metadata.json diff --git a/grype/differ/test-fixtures/dbs/base/5/vulnerability.db b/grype/db/v5/differ/test-fixtures/dbs/base/5/vulnerability.db similarity index 100% rename from grype/differ/test-fixtures/dbs/base/5/vulnerability.db rename to grype/db/v5/differ/test-fixtures/dbs/base/5/vulnerability.db diff --git a/grype/differ/test-fixtures/dbs/target/5/metadata.json b/grype/db/v5/differ/test-fixtures/dbs/target/5/metadata.json similarity index 100% rename from grype/differ/test-fixtures/dbs/target/5/metadata.json rename to grype/db/v5/differ/test-fixtures/dbs/target/5/metadata.json diff --git a/grype/differ/test-fixtures/dbs/target/5/vulnerability.db b/grype/db/v5/differ/test-fixtures/dbs/target/5/vulnerability.db similarity index 100% rename from grype/differ/test-fixtures/dbs/target/5/vulnerability.db rename to grype/db/v5/differ/test-fixtures/dbs/target/5/vulnerability.db diff --git a/grype/differ/test-fixtures/snapshot/TestPresent_Json.golden b/grype/db/v5/differ/test-fixtures/snapshot/TestPresent_Json.golden similarity index 100% rename from grype/differ/test-fixtures/snapshot/TestPresent_Json.golden rename to grype/db/v5/differ/test-fixtures/snapshot/TestPresent_Json.golden diff --git a/grype/differ/test-fixtures/snapshot/TestPresent_Table.golden b/grype/db/v5/differ/test-fixtures/snapshot/TestPresent_Table.golden similarity index 100% rename from grype/differ/test-fixtures/snapshot/TestPresent_Table.golden rename to grype/db/v5/differ/test-fixtures/snapshot/TestPresent_Table.golden