internal/vulncheck: improve progress message for binaries
Change-Id: Ib5b4b335e44d3ca3e72f4772b7e03fca615e7ae7
Reviewed-on: https://go-review.googlesource.com/c/vuln/+/580158
Auto-Submit: Zvonimir Pavlinovic <zpavlinovic@google.com>
Reviewed-by: Maceo Thompson <maceothompson@google.com>
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>
diff --git a/cmd/govulncheck/testdata/common/testfiles/binary-call/binary_call_json.ct b/cmd/govulncheck/testdata/common/testfiles/binary-call/binary_call_json.ct
index b48f574..2fd2240 100644
--- a/cmd/govulncheck/testdata/common/testfiles/binary-call/binary_call_json.ct
+++ b/cmd/govulncheck/testdata/common/testfiles/binary-call/binary_call_json.ct
@@ -24,7 +24,7 @@
}
{
"progress": {
- "message": "Checking the code against the vulnerabilities..."
+ "message": "Checking the binary against the vulnerabilities..."
}
}
{
diff --git a/cmd/govulncheck/testdata/common/testfiles/binary-call/binary_vendored_json.ct b/cmd/govulncheck/testdata/common/testfiles/binary-call/binary_vendored_json.ct
index 94a8669..30f1556 100644
--- a/cmd/govulncheck/testdata/common/testfiles/binary-call/binary_vendored_json.ct
+++ b/cmd/govulncheck/testdata/common/testfiles/binary-call/binary_vendored_json.ct
@@ -24,7 +24,7 @@
}
{
"progress": {
- "message": "Checking the code against the vulnerabilities..."
+ "message": "Checking the binary against the vulnerabilities..."
}
}
{
diff --git a/cmd/govulncheck/testdata/common/testfiles/binary-module/binary_module_json.ct b/cmd/govulncheck/testdata/common/testfiles/binary-module/binary_module_json.ct
index 7eb8029..c94989d 100644
--- a/cmd/govulncheck/testdata/common/testfiles/binary-module/binary_module_json.ct
+++ b/cmd/govulncheck/testdata/common/testfiles/binary-module/binary_module_json.ct
@@ -24,7 +24,7 @@
}
{
"progress": {
- "message": "Checking the code against the vulnerabilities..."
+ "message": "Checking the binary against the vulnerabilities..."
}
}
{
diff --git a/cmd/govulncheck/testdata/common/testfiles/binary-package/binary_package_json.ct b/cmd/govulncheck/testdata/common/testfiles/binary-package/binary_package_json.ct
index 43e08c4..9d81fd6 100644
--- a/cmd/govulncheck/testdata/common/testfiles/binary-package/binary_package_json.ct
+++ b/cmd/govulncheck/testdata/common/testfiles/binary-package/binary_package_json.ct
@@ -24,7 +24,7 @@
}
{
"progress": {
- "message": "Checking the code against the vulnerabilities..."
+ "message": "Checking the binary against the vulnerabilities..."
}
}
{
diff --git a/internal/vulncheck/binary.go b/internal/vulncheck/binary.go
index dbe8975..243dfb5 100644
--- a/internal/vulncheck/binary.go
+++ b/internal/vulncheck/binary.go
@@ -63,7 +63,7 @@
return nil, err
}
- if err := handler.Progress(&govulncheck.Progress{Message: checkingVulnsMessage}); err != nil {
+ if err := handler.Progress(&govulncheck.Progress{Message: checkingBinVulnsMessage}); err != nil {
return nil, err
}
diff --git a/internal/vulncheck/source.go b/internal/vulncheck/source.go
index e008717..4754500 100644
--- a/internal/vulncheck/source.go
+++ b/internal/vulncheck/source.go
@@ -71,7 +71,7 @@
return nil, err
}
- if err := handler.Progress(&govulncheck.Progress{Message: checkingVulnsMessage}); err != nil {
+ if err := handler.Progress(&govulncheck.Progress{Message: checkingSrcVulnsMessage}); err != nil {
return nil, err
}
diff --git a/internal/vulncheck/vulncheck.go b/internal/vulncheck/vulncheck.go
index ac61087..3c4cabf 100644
--- a/internal/vulncheck/vulncheck.go
+++ b/internal/vulncheck/vulncheck.go
@@ -17,8 +17,9 @@
)
const (
- fetchingVulnsMessage = "Fetching vulnerabilities from the database..."
- checkingVulnsMessage = "Checking the code against the vulnerabilities..."
+ fetchingVulnsMessage = "Fetching vulnerabilities from the database..."
+ checkingSrcVulnsMessage = "Checking the code against the vulnerabilities..."
+ checkingBinVulnsMessage = "Checking the binary against the vulnerabilities..."
)
// Result contains information on detected vulnerabilities.
