indexer: align affectedManifests call with matcher definitions

This change attempts to make the matching process consistent across both
the vulnerability matching and the manifest matching that is performed
by the affectedManifests logic. It reduces the number of queries to 1
per matcher per vulnerability.

Signed-off-by: crozzy <joseph.crosland@gmail.com>

Author: crozzy

alpine/matcher.go

@@ -35,11 +35,11 @@ func (*Matcher) Filter(record *claircore.IndexRecord) bool {
 }
 
 // Query implements driver.Matcher.
-func (*Matcher) Query() []driver.MatchConstraint {
-	return []driver.MatchConstraint{
-		driver.DistributionDID,
-		driver.DistributionName,
-		driver.DistributionPrettyName,
+func (*Matcher) Query() []claircore.MatchConstraint {
+	return []claircore.MatchConstraint{
+		claircore.DistributionDID,
+		claircore.DistributionName,
+		claircore.DistributionPrettyName,
 	}
 }
 

aws/matcher.go

@@ -36,10 +36,10 @@ func (*Matcher) Filter(record *claircore.IndexRecord) bool {
 	return false
 }
 
-func (*Matcher) Query() []driver.MatchConstraint {
-	return []driver.MatchConstraint{
-		driver.DistributionDID,
-		driver.DistributionVersionID,
+func (*Matcher) Query() []claircore.MatchConstraint {
+	return []claircore.MatchConstraint{
+		claircore.DistributionDID,
+		claircore.DistributionVersionID,
 	}
 }