add and fix tests from rebase

Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>

cmd/grype/cli/commands/root.go

@@ -1,6 +1,7 @@
 package commands
 
 import (
+ "context"
  "errors"
  "fmt"
  "strings"
@@ -73,12 +74,12 @@ You can also pipe in Syft JSON directly:
  Args: validateRootArgs,
  SilenceUsage: true,
  SilenceErrors: true,
- RunE: func(_ *cobra.Command, args []string) error {
+ RunE: func(cmd *cobra.Command, args []string) error {
  userInput := ""
  if len(args) > 0 {
  userInput = args[0]
  }
- return runGrype(app, opts, userInput)
+ return runGrype(cmd.Context(), app, opts, userInput)
  },
  ValidArgsFunction: dockerImageValidArgsFunction,
  }, opts)
@@ -106,7 +107,7 @@ var ignoreLinuxKernelHeaders = []match.IgnoreRule{
 }
 
 //nolint:funlen
-func runGrype(app clio.Application, opts *options.Grype, userInput string) (errs error) {
+func runGrype(ctx context.Context, app clio.Application, opts *options.Grype, userInput string) (errs error) {
  writer, err := format.MakeScanResultWriter(opts.Outputs, opts.File, format.PresentationConfig{
  TemplateFilePath: opts.OutputTemplateFile,
  ShowSuppressed: opts.ShowSuppressed,
@@ -194,7 +195,7 @@ func runGrype(app clio.Application, opts *options.Grype, userInput string) (errs
  }),
  }
 
- remainingMatches, ignoredMatches, err := vulnMatcher.FindMatches(packages, pkgContext)
+ remainingMatches, ignoredMatches, err := vulnMatcher.FindMatches(ctx, packages, pkgContext)
  if err != nil {
  if !errors.Is(err, grypeerr.ErrAboveSeverityThreshold) {
  return err

go.mod

@@ -29,7 +29,7 @@ require (
  github.com/glebarez/sqlite v1.11.0
  github.com/go-test/deep v1.1.0
  github.com/google/go-cmp v0.6.0
- github.com/google/go-containerregistry v0.19.1
+ github.com/google/go-containerregistry v0.19.1 // indirect
  github.com/google/uuid v1.6.0
  github.com/gookit/color v1.5.4
  github.com/hako/durafmt v0.0.0-20210608085754-5c1018a4e16b
@@ -61,7 +61,10 @@ require (
  gorm.io/gorm v1.25.10
 )
 
-require github.com/openvex/discovery v0.1.0
+require (
+ github.com/openvex/discovery v0.1.0
+ golang.org/x/sync v0.7.0
+)
 
 require (
  cloud.google.com/go v0.110.10 // indirect
@@ -285,7 +288,6 @@ require (
  golang.org/x/mod v0.17.0 // indirect
  golang.org/x/net v0.25.0 // indirect
  golang.org/x/oauth2 v0.19.0 // indirect
- golang.org/x/sync v0.7.0 // indirect
  golang.org/x/sys v0.20.0 // indirect
  golang.org/x/term v0.20.0 // indirect
  golang.org/x/text v0.15.0 // indirect

grype/deprecated.go

@@ -1,6 +1,8 @@
 package grype
 
 import (
+ "context"
+
  "github.com/anchore/grype/grype/match"
  "github.com/anchore/grype/grype/matcher"
  "github.com/anchore/grype/grype/pkg"
@@ -40,7 +42,7 @@ func FindVulnerabilitiesForPackage(store store.Store, d *linux.Release, matchers
  NormalizeByCVE: false,
  }
 
- actualResults, _, err := runner.FindMatches(packages, pkg.Context{
+ actualResults, _, err := runner.FindMatches(context.Background(), packages, pkg.Context{
  Distro: d,
  })
  if err != nil || actualResults == nil {