Skip to content

Commit 864243b

Browse files
committed
internal/vulncheck: improve error message for fetching vulns
Fixes golang/go#64681 Change-Id: Ie65279bd557d9477b62e7aedcf6ec620536e1e18 Reviewed-on: https://go-review.googlesource.com/c/vuln/+/549375 Run-TryBot: Zvonimir Pavlinovic <zpavlinovic@google.com> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> TryBot-Result: Gopher Robot <gobot@golang.org> Reviewed-by: Maceo Thompson <maceothompson@google.com>
1 parent bcd8b92 commit 864243b

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

all_test.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,9 @@ func TestGovulncheck(t *testing.T) {
9696
case nil:
9797
t.Log("govulncheck: no vulnerabilities detected")
9898
case interface{ ExitCode() int }:
99-
if err.ExitCode() != 0 {
100-
t.Errorf("govulncheck ./... failed with exit code: %d", err.ExitCode())
101-
}
99+
t.Errorf("govulncheck: unexpected exit code %d and error %v", err.ExitCode(), err)
102100
default:
103-
t.Errorf("unrecognized govulncheck command error: %v", err)
101+
t.Errorf("govulncheck: abruptly failed with error %v", err)
104102
}
105103
}
106104

internal/vulncheck/fetch.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ package vulncheck
66

77
import (
88
"context"
9+
"fmt"
910

1011
"golang.org/x/tools/go/packages"
1112
"golang.org/x/vuln/internal/client"
@@ -25,7 +26,7 @@ func FetchVulnerabilities(ctx context.Context, c *client.Client, modules []*pack
2526
}
2627
resps, err := c.ByModules(ctx, mreqs)
2728
if err != nil {
28-
return nil, err
29+
return nil, fmt.Errorf("fetching vulnerabilities: %v", err)
2930
}
3031
var mv []*ModVulns
3132
for i, resp := range resps {

0 commit comments

Comments
 (0)