remove jvm matcher

Signed-off-by: Alex Goodman <[email protected]>
anchore · Sep 18, 2024 · d997b31 · d997b31
1 parent 8f38ac0
commit d997b31
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 76 deletions.
diff --git a/cmd/grype/cli/commands/root.go b/cmd/grype/cli/commands/root.go
@@ -22,7 +22,6 @@ import (
 	"github.com/anchore/grype/grype/matcher/golang"
 	"github.com/anchore/grype/grype/matcher/java"
 	"github.com/anchore/grype/grype/matcher/javascript"
-	"github.com/anchore/grype/grype/matcher/jvm"
 	"github.com/anchore/grype/grype/matcher/python"
 	"github.com/anchore/grype/grype/matcher/ruby"
 	"github.com/anchore/grype/grype/matcher/stock"
@@ -286,9 +285,6 @@ func getMatchers(opts *options.Grype) []matcher.Matcher {
 				ExternalSearchConfig: opts.ExternalSources.ToJavaMatcherConfig(),
 				UseCPEs:              opts.Match.Java.UseCPEs,
 			},
-			JVM: jvm.MatcherConfig{
-				UseCPEs: opts.Match.JVM.UseCPEs,
-			},
 			Ruby:       ruby.MatcherConfig(opts.Match.Ruby),
 			Python:     python.MatcherConfig(opts.Match.Python),
 			Dotnet:     dotnet.MatcherConfig(opts.Match.Dotnet),

diff --git a/grype/match/matcher_type.go b/grype/match/matcher_type.go
@@ -16,7 +16,6 @@ const (
 	GoModuleMatcher    MatcherType = "go-module-matcher"
 	OpenVexMatcher     MatcherType = "openvex-matcher"
 	RustMatcher        MatcherType = "rust-matcher"
-	JVMMatcher         MatcherType = "jvm-matcher"
 )
 
 var AllMatcherTypes = []MatcherType{
@@ -33,7 +32,6 @@ var AllMatcherTypes = []MatcherType{
 	GoModuleMatcher,
 	OpenVexMatcher,
 	RustMatcher,
-	JVMMatcher,
 }
 
 type MatcherType string
diff --git a/grype/matcher/jvm/matcher.go b/grype/matcher/jvm/matcher.go
diff --git a/grype/matcher/matchers.go b/grype/matcher/matchers.go
@@ -7,7 +7,6 @@ import (
 	"github.com/anchore/grype/grype/matcher/golang"
 	"github.com/anchore/grype/grype/matcher/java"
 	"github.com/anchore/grype/grype/matcher/javascript"
-	"github.com/anchore/grype/grype/matcher/jvm"
 	"github.com/anchore/grype/grype/matcher/msrc"
 	"github.com/anchore/grype/grype/matcher/portage"
 	"github.com/anchore/grype/grype/matcher/python"
@@ -20,7 +19,6 @@ import (
 // Config contains values used by individual matcher structs for advanced configuration
 type Config struct {
 	Java       java.MatcherConfig
-	JVM        jvm.MatcherConfig
 	Ruby       ruby.MatcherConfig
 	Python     python.MatcherConfig
 	Dotnet     dotnet.MatcherConfig
@@ -38,7 +36,6 @@ func NewDefaultMatchers(mc Config) []Matcher {
 		dotnet.NewDotnetMatcher(mc.Dotnet),
 		&rpm.Matcher{},
 		java.NewJavaMatcher(mc.Java),
-		jvm.NewJVMMatcher(mc.JVM),
 		javascript.NewJavascriptMatcher(mc.Javascript),
 		&apk.Matcher{},
 		golang.NewGolangMatcher(mc.Golang),

diff --git a/grype/matcher/stock/matcher.go b/grype/matcher/stock/matcher.go
@@ -32,17 +32,9 @@ func (m *Matcher) Type() match.MatcherType {
 }
 
 func (m *Matcher) Match(store vulnerability.Provider, d *distro.Distro, p pkg.Package) ([]match.Match, error) {
-	if !inboundsForMatcher(p) {
-		return nil, nil
-	}
-
 	criteria := search.CommonCriteria
 	if m.cfg.UseCPEs {
 		criteria = append(criteria, search.ByCPE)
 	}
 	return search.ByCriteria(store, d, p, m.Type(), criteria...)
 }
-
-func inboundsForMatcher(p pkg.Package) bool {
-	return !pkg.IsJvmPackage(p)
-}
diff --git a/grype/matcher/jvm/matcher_test.go → grype/matcher/stock/matcher_test.go b/grype/matcher/jvm/matcher_test.go → grype/matcher/stock/matcher_test.go
@@ -1,4 +1,4 @@
-package jvm
+package stock
 
 import (
 	"testing"
@@ -17,7 +17,7 @@ import (
 	syftPkg "github.com/anchore/syft/syft/pkg"
 )
 
-func TestMatcher(t *testing.T) {
+func TestMatcher_JVMPackage(t *testing.T) {
 	p := pkg.Package{
 		ID:      pkg.ID(uuid.NewString()),
 		Name:    "java_se",
@@ -33,7 +33,8 @@ func TestMatcher(t *testing.T) {
 		},
 	}
 	store := newMockProvider()
-	actual, _ := matcher.Match(store, nil, p)
+	actual, err := matcher.Match(store, nil, p)
+	require.NoError(t, err)
 
 	foundCVEs := strset.New()
 	for _, v := range actual {

diff --git a/test/integration/match_by_image_test.go b/test/integration/match_by_image_test.go
@@ -18,7 +18,6 @@ import (
 	"github.com/anchore/grype/grype/matcher/golang"
 	"github.com/anchore/grype/grype/matcher/java"
 	"github.com/anchore/grype/grype/matcher/javascript"
-	"github.com/anchore/grype/grype/matcher/jvm"
 	"github.com/anchore/grype/grype/matcher/python"
 	"github.com/anchore/grype/grype/matcher/ruby"
 	"github.com/anchore/grype/grype/matcher/rust"
@@ -588,7 +587,7 @@ func addJvmMatches(t *testing.T, theSource source.Source, catalog *syftPkg.Colle
 							"cpe:2.3:a:oracle:jdk:*:*:*:*:*:*:*:*",
 						},
 					},
-					Matcher: match.JVMMatcher,
+					Matcher: match.StockMatcher,
 				},
 			},
 		})
@@ -738,9 +737,6 @@ func TestMatchByImage(t *testing.T) {
 				Java: java.MatcherConfig{
 					UseCPEs: true,
 				},
-				JVM: jvm.MatcherConfig{
-					UseCPEs: true,
-				},
 				Ruby: ruby.MatcherConfig{
 					UseCPEs: true,
 				},