remove v3 and v4 schema usage (#482)

Signed-off-by: Alex Goodman <[email protected]>
anchore · Jan 24, 2025 · ded5a87 · ded5a87
1 parent dce5717
commit ded5a87
Show file tree

Hide file tree

Showing 78 changed files with 3 additions and 8,809 deletions.
diff --git a/manager/src/grype_db_manager/data/schema-info.json b/manager/src/grype_db_manager/data/schema-info.json
@@ -13,12 +13,12 @@
     {
       "schema": "3",
       "grype-version": "v0.40.1",
-      "supported": true
+      "supported": false
     },
     {
       "schema": "4",
       "grype-version": "v0.50.2",
-      "supported": true
+      "supported": false
     },
     {
       "schema": "5",

diff --git a/manager/tests/unit/db/test_schema.py b/manager/tests/unit/db/test_schema.py
@@ -14,4 +14,4 @@ def test_grype_version():
 
 
 def test_supported_schema_versions():
-    assert schema.supported_schema_versions() == [3, 4, 5, 6]
+    assert schema.supported_schema_versions() == [5, 6]
diff --git a/pkg/process/build.go b/pkg/process/build.go
@@ -9,15 +9,11 @@ import (
 
 	"github.com/anchore/grype-db/internal/log"
 	"github.com/anchore/grype-db/pkg/data"
-	v3 "github.com/anchore/grype-db/pkg/process/v3"
-	v4 "github.com/anchore/grype-db/pkg/process/v4"
 	v5 "github.com/anchore/grype-db/pkg/process/v5"
 	v6 "github.com/anchore/grype-db/pkg/process/v6"
 	"github.com/anchore/grype-db/pkg/provider"
 	"github.com/anchore/grype-db/pkg/provider/entry"
 	"github.com/anchore/grype-db/pkg/provider/unmarshal"
-	grypeDBv3 "github.com/anchore/grype/grype/db/v3"
-	grypeDBv4 "github.com/anchore/grype/grype/db/v4"
 	grypeDBv5 "github.com/anchore/grype/grype/db/v5"
 	grypeDBv6 "github.com/anchore/grype/grype/db/v6"
 )
@@ -76,10 +72,6 @@ type providerResults struct {
 
 func getProcessors(cfg BuildConfig) ([]data.Processor, error) {
 	switch cfg.SchemaVersion {
-	case grypeDBv3.SchemaVersion:
-		return v3.Processors(), nil
-	case grypeDBv4.SchemaVersion:
-		return v4.Processors(), nil
 	case grypeDBv5.SchemaVersion:
 		return v5.Processors(v5.NewConfig(v5.WithCPEParts(cfg.IncludeCPEParts), v5.WithInferNVDFixVersions(cfg.InferNVDFixVersions))), nil
 	case grypeDBv6.ModelVersion:
@@ -91,10 +83,6 @@ func getProcessors(cfg BuildConfig) ([]data.Processor, error) {
 
 func getWriter(schemaVersion int, dataAge time.Time, directory string, states provider.States) (data.Writer, error) {
 	switch schemaVersion {
-	case grypeDBv3.SchemaVersion:
-		return v3.NewWriter(directory, dataAge)
-	case grypeDBv4.SchemaVersion:
-		return v4.NewWriter(directory, dataAge)
 	case grypeDBv5.SchemaVersion:
 		return v5.NewWriter(directory, dataAge, states)
 	case grypeDBv6.ModelVersion:

diff --git a/pkg/process/v3/processors.go b/pkg/process/v3/processors.go
diff --git a/pkg/process/v3/transformers/entry.go b/pkg/process/v3/transformers/entry.go
diff --git a/pkg/process/v3/transformers/github/test-fixtures/github-github-npm-0.json b/pkg/process/v3/transformers/github/test-fixtures/github-github-npm-0.json
diff --git a/pkg/process/v3/transformers/github/test-fixtures/github-github-python-0.json b/pkg/process/v3/transformers/github/test-fixtures/github-github-python-0.json
diff --git a/pkg/process/v3/transformers/github/test-fixtures/github-github-python-1.json b/pkg/process/v3/transformers/github/test-fixtures/github-github-python-1.json
diff --git a/pkg/process/v3/transformers/github/test-fixtures/github-withdrawn.json b/pkg/process/v3/transformers/github/test-fixtures/github-withdrawn.json
diff --git a/pkg/process/v3/transformers/github/test-fixtures/multiple-fixed-in-names.json b/pkg/process/v3/transformers/github/test-fixtures/multiple-fixed-in-names.json
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,4 +14,4 @@ def test_grype_version():


		def test_supported_schema_versions():
		assert schema.supported_schema_versions() == [3, 4, 5, 6]
		assert schema.supported_schema_versions() == [5, 6]