Revert "cmd/govulncheck: add -cpuprofile flag"

This reverts commit 9bf256343acc20d22586789d07aecf887d8a5aea.

Reason for revert: not needed

Change-Id: I70d04b25e4a6dba6a7b3aa2b4fa54d38393531fd
Reviewed-on: https://go-review.googlesource.com/c/vuln/+/458176
TryBot-Result: Gopher Robot <[email protected]>
Run-TryBot: Zvonimir Pavlinovic <[email protected]>
Reviewed-by: Alan Donovan <[email protected]>

Author: softdev050

cmd/govulncheck/main.go

@@ -10,8 +10,6 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
-	"runtime/pprof"
-
 	"strings"
 
 	"golang.org/x/tools/go/buildutil"
@@ -26,9 +24,7 @@ var (
 	jsonFlag    = flag.Bool("json", false, "output JSON")
 	verboseFlag = flag.Bool("v", false, "print a full call stack for each vulnerability")
 	testFlag    = flag.Bool("test", false, "analyze test files. Only valid for source code.")
-	cpuprofile  = flag.String("cpuprofile", "", "write CPU profile to file")
-
-	tagsFlag buildutil.TagsFlag
+	tagsFlag    buildutil.TagsFlag
 
 	// testmode flags. See main_testmode.go.
 	dirFlag string
@@ -62,16 +58,6 @@ For details, see https://pkg.go.dev/golang.org/x/vuln/cmd/govulncheck.
 		os.Exit(1)
 	}
 
-	// Profiling support.
-	if *cpuprofile != "" {
-		f, err := os.Create(*cpuprofile)
-		if err != nil {
-			fmt.Fprintln(os.Stderr, err)
-			os.Exit(1)
-		}
-		pprof.StartCPUProfile(f)
-	}
-
 	patterns := flag.Args()
 
 	sourceAnalysis := true
@@ -80,18 +66,14 @@ For details, see https://pkg.go.dev/golang.org/x/vuln/cmd/govulncheck.
 	}
 	validateFlags(sourceAnalysis)
 
-	err := doGovulncheck(patterns, sourceAnalysis)
-	pprof.StopCPUProfile()
-	if err != nil {
-		if code, ok := err.(exitCode); ok {
-			os.Exit(int(code))
-		}
-		die("govulncheck: %v", err)
+	if err := doGovulncheck(patterns, sourceAnalysis); err != nil {
+		die(fmt.Sprintf("govulncheck: %v", err))
 	}
 }
 
-// doGovulncheck performs the main govulncheck functionality and
-// returns an error, possibly an exitCode.
+// doGovulncheck performs main govulncheck functionality and exits the
+// program upon success with an appropriate exit status. Otherwise,
+// returns an error.
 func doGovulncheck(patterns []string, sourceAnalysis bool) error {
 	ctx := context.Background()
 	dir := filepath.FromSlash(dirFlag)
@@ -145,11 +127,11 @@ func doGovulncheck(patterns []string, sourceAnalysis bool) error {
 
 	if *jsonFlag {
 		// Following golang.org/x/tools/go/analysis/singlechecker,
-		// -json mode is always a success.
+		// return 0 exit code in -json mode.
 		if err := printJSON(res); err != nil {
 			return err
 		}
-		return nil // success
+		os.Exit(0)
 	}
 
 	printText(res, *verboseFlag, sourceAnalysis)
@@ -162,21 +144,16 @@ func doGovulncheck(patterns []string, sourceAnalysis bool) error {
 	if sourceAnalysis {
 		for _, v := range res.Vulns {
 			if v.IsCalled() {
-				return exitCode(3)
+				os.Exit(3)
 			}
 		}
 	} else if len(res.Vulns) > 0 {
-		return exitCode(3)
+		os.Exit(3)
 	}
+	os.Exit(0)
 	return nil
 }
 
-// exitCode is an error returned by doGovulncheck to indicate
-// that the the program should silently exit with the specified code.
-type exitCode int
-
-func (code exitCode) Error() string { return fmt.Sprintf("exit code %d", code) }
-
 func validateFlags(source bool) {
 	if !source {
 		if *testFlag {

cmd/govulncheck/main_command_118_test.go

@@ -36,10 +36,7 @@ func TestCommand(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-
-	// Comment this out to log all command output (very verbose).
-	ts.DisableLogging = true
-
+	ts.DisableLogging = false
 	// Define a command that runs govulncheck with our local DB. We can't use
 	// cmdtest.Program for this because it doesn't let us set the environment,
 	// and that is the only way to tell govulncheck about an alternative vuln

cmd/govulncheck/testdata/usage.ct

@@ -3,8 +3,6 @@ usage:
 	govulncheck [flags] package...
 	govulncheck [flags] binary
 
-  -cpuprofile string
-    	write CPU profile to file
   -dir string
     	directory to use for loading source files
   -json
@@ -24,8 +22,6 @@ usage:
 	govulncheck [flags] package...
 	govulncheck [flags] binary
 
-  -cpuprofile string
-    	write CPU profile to file
   -dir string
     	directory to use for loading source files
   -json