internal/vulncheck: improve progress message for binaries

Change-Id: Ib5b4b335e44d3ca3e72f4772b7e03fca615e7ae7
Reviewed-on: https://go-review.googlesource.com/c/vuln/+/580158
Auto-Submit: Zvonimir Pavlinovic <[email protected]>
Reviewed-by: Maceo Thompson <[email protected]>
Run-TryBot: Zvonimir Pavlinovic <[email protected]>
LUCI-TryBot-Result: Go LUCI <[email protected]>
TryBot-Result: Gopher Robot <[email protected]>

cmd/govulncheck/testdata/common/testfiles/binary-call/binary_call_json.ct

@@ -24,7 +24,7 @@ $ govulncheck -format json -mode binary ${common_vuln_binary}
 }
 {
   "progress": {
-    "message": "Checking the code against the vulnerabilities..."
+    "message": "Checking the binary against the vulnerabilities..."
   }
 }
 {

cmd/govulncheck/testdata/common/testfiles/binary-call/binary_vendored_json.ct

@@ -24,7 +24,7 @@ $ govulncheck -format json -mode binary ${common_vendored_binary}
 }
 {
   "progress": {
-    "message": "Checking the code against the vulnerabilities..."
+    "message": "Checking the binary against the vulnerabilities..."
   }
 }
 {

cmd/govulncheck/testdata/common/testfiles/binary-module/binary_module_json.ct

@@ -24,7 +24,7 @@ $ govulncheck -format json -mode binary -scan module ${common_vuln_binary}
 }
 {
   "progress": {
-    "message": "Checking the code against the vulnerabilities..."
+    "message": "Checking the binary against the vulnerabilities..."
   }
 }
 {

cmd/govulncheck/testdata/common/testfiles/binary-package/binary_package_json.ct

@@ -24,7 +24,7 @@ $ govulncheck -format json -mode binary -scan package ${common_vuln_binary}
 }
 {
   "progress": {
-    "message": "Checking the code against the vulnerabilities..."
+    "message": "Checking the binary against the vulnerabilities..."
   }
 }
 {

internal/vulncheck/binary.go

@@ -63,7 +63,7 @@ func binary(ctx context.Context, handler govulncheck.Handler, bin *Bin, cfg *gov
 		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
 	}
 

internal/vulncheck/source.go

@@ -71,7 +71,7 @@ func source(ctx context.Context, handler govulncheck.Handler, cfg *govulncheck.C
 		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
 	}
 

internal/vulncheck/vulncheck.go

@@ -17,8 +17,9 @@ import (
 )
 
 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.