internal/scan: refactor to remove redundant code

Since binary.go already uses build tags, the two removed files are now redundant. Replaced the call to the function in those files to a call to vulncheck.Binary directly. Change-Id: Ib1560a4303df2355ce7c121258aef091bab9ee01 Reviewed-on: https://go-review.googlesource.com/c/vuln/+/514902 Run-TryBot: Maceo Thompson <maceothompson@google.com> TryBot-Result: Gopher Robot <gobot@golang.org> Reviewed-by: Jonathan Amsterdam <jba@google.com>
golang · Aug 1, 2023 · b2f5f90 · b2f5f90
1 parent 81563a3
commit b2f5f90
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 42 deletions.
diff --git a/internal/scan/binary.go b/internal/scan/binary.go
@@ -32,7 +32,7 @@ func runBinary(ctx context.Context, handler govulncheck.Handler, cfg *config, cl
  if err := handler.Progress(p); err != nil {
  return err
  }
- vr, err := binary(ctx, exe, &cfg.Config, client)
+ vr, err := vulncheck.Binary(ctx, exe, &cfg.Config, client)
  if err != nil {
  return fmt.Errorf("govulncheck: %v", err)
  }

diff --git a/internal/scan/binary_118.go b/internal/scan/binary_118.go
diff --git a/internal/scan/binary_not118.go b/internal/scan/binary_not118.go