internal/worker: clean up govulncheck error classification
govulncheck scan endpoints do not load packages directly. This is now
done implicitly by govulncheck command. Hence, we can delete the logic
that handles them in govulncheck_scan.go.
For similar reasons, we delete govulncheck vuln db error handling logic.
govulncheck reads from a local db now so this logic is not suitable any
more.
Change-Id: Ic739fb6fc5f021360d3479e836b4ca2f450f33da
Reviewed-on: https://go-review.googlesource.com/c/pkgsite-metrics/+/481916
Run-TryBot: Zvonimir Pavlinovic <zpavlinovic@google.com>
Reviewed-by: Jonathan Amsterdam <jba@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
diff --git a/internal/worker/govulncheck_scan.go b/internal/worker/govulncheck_scan.go
index 0b37fa0..c9cdc55 100644
--- a/internal/worker/govulncheck_scan.go
+++ b/internal/worker/govulncheck_scan.go
@@ -201,9 +201,6 @@
row.ScanMemory = int64(stats.scanMemory)
if err != nil {
switch {
- case errors.Is(err, derrors.LoadPackagesNoGoModError) ||
- errors.Is(err, derrors.LoadPackagesNoGoSumError):
- // errors already classified by package loading.
case isMissingGoMod(err) || isNoModulesSpecified(err):
// Covers the missing go.mod file cases when running govulncheck in the sandbox
err = fmt.Errorf("%v: %w", err, derrors.LoadPackagesNoGoModError)
@@ -215,10 +212,6 @@
err = fmt.Errorf("%v: %w", err, derrors.LoadPackagesMissingGoSumEntryError)
case isReplacingWithLocalPath(err):
err = fmt.Errorf("%v: %w", err, derrors.LoadPackagesImportedLocalError)
- case errors.Is(err, derrors.LoadPackagesError):
- // general load packages error
- case isVulnDBConnection(err):
- err = fmt.Errorf("%v: %w", err, derrors.ScanModuleGovulncheckDBConnectionError)
default:
err = fmt.Errorf("%v: %w", err, derrors.ScanModuleGovulncheckError)
}
@@ -466,18 +459,8 @@
return strings.Contains(err.Error(), "no go.mod file")
}
-func isModVendor(err error) bool {
- return strings.Contains(err.Error(), "-mod=vendor")
-}
-
func isReplacingWithLocalPath(err error) bool {
errStr := err.Error()
matched, err := regexp.MatchString(`replaced by .{0,2}/`, errStr)
return err == nil && matched && strings.Contains(errStr, "go.mod: no such file")
}
-
-func isVulnDBConnection(err error) bool {
- s := err.Error()
- return strings.Contains(s, "https://vuln.go.dev") &&
- strings.Contains(s, "connection")
-}
