Revert "[cmd/*] Switch to pflag for all CLI flag parsing (vitessio#10619

)"

This reverts commit c3f4a99.

Signed-off-by: Dirkjan Bussink <[email protected]>

go/cmd/mysqlctl/mysqlctl.go

@@ -25,8 +25,6 @@ import (
 	"os"
 	"time"
 
-	"github.com/spf13/pflag"
-
 	"vitess.io/vitess/go/cmd"
 	"vitess.io/vitess/go/exit"
 	"vitess.io/vitess/go/flagutil"
@@ -250,7 +248,7 @@ func main() {
 		exit.Return(1)
 	}
 	dbconfigs.RegisterFlags(dbconfigs.Dba)
-	_flag.Parse(pflag.NewFlagSet("mysqlctl", pflag.ExitOnError))
+	_flag.Parse()
 
 	tabletAddr = netutil.JoinHostPort("localhost", int32(*port))
 

go/cmd/query_analyzer/query_analyzer.go

@@ -24,8 +24,6 @@ import (
 	"os"
 	"sort"
 
-	"github.com/spf13/pflag"
-
 	"vitess.io/vitess/go/exit"
 	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/sqlparser"
@@ -61,7 +59,7 @@ func (a stats) Less(i, j int) bool { return a[i].Count > a[j].Count }
 
 func main() {
 	defer exit.Recover()
-	_flag.Parse(pflag.NewFlagSet("query_analyzer", pflag.ExitOnError))
+	_flag.Parse()
 	for _, filename := range _flag.Args() {
 		fmt.Printf("processing: %s\n", filename)
 		if err := processFile(filename); err != nil {

go/cmd/topo2topo/topo2topo.go

@@ -22,8 +22,6 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/spf13/pflag"
-
 	"vitess.io/vitess/go/exit"
 	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/logutil"
@@ -55,7 +53,7 @@ func main() {
 	defer exit.RecoverAll()
 	defer logutil.Flush()
 
-	_flag.Parse(pflag.NewFlagSet("topo2topo", pflag.ExitOnError))
+	_flag.Parse()
 	args := _flag.Args()
 	if len(args) != 0 {
 		flag.Usage()

go/cmd/vtbench/vtbench.go

@@ -23,8 +23,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/spf13/pflag"
-
 	"vitess.io/vitess/go/exit"
 	"vitess.io/vitess/go/vt/dbconfigs"
 	"vitess.io/vitess/go/vt/log"
@@ -106,7 +104,7 @@ func main() {
 	defer exit.Recover()
 
 	flag.Lookup("logtostderr").Value.Set("true")
-	_flag.Parse(pflag.NewFlagSet("vtbench", pflag.ExitOnError))
+	_flag.Parse()
 
 	clientProto := vtbench.MySQL
 	switch *protocol {

go/cmd/vtclient/vtclient.go

@@ -31,7 +31,6 @@ import (
 	"time"
 
 	"github.com/olekukonko/tablewriter"
-	"github.com/spf13/pflag"
 
 	"vitess.io/vitess/go/vt/concurrency"
 	"vitess.io/vitess/go/vt/log"
@@ -148,7 +147,7 @@ func main() {
 }
 
 func run() (*results, error) {
-	_flag.Parse(pflag.NewFlagSet("vtclient", pflag.ExitOnError))
+	_flag.Parse()
 	args := _flag.Args()
 
 	if len(args) == 0 {

go/cmd/vtctlclient/main.go

@@ -25,8 +25,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/spf13/pflag"
-
 	"vitess.io/vitess/go/exit"
 	"vitess.io/vitess/go/trace"
 	"vitess.io/vitess/go/vt/log"
@@ -72,7 +70,7 @@ func checkDeprecations(args []string) {
 func main() {
 	defer exit.Recover()
 
-	_flag.Parse(pflag.NewFlagSet("vtctlclient", pflag.ExitOnError))
+	_flag.Parse()
 
 	closer := trace.StartTracing("vtctlclient")
 	defer trace.LogErrorsWhenClosing(closer)

go/cmd/vtgate/vtgate.go

@@ -142,7 +142,7 @@ func main() {
 		log.Exitf("tablet_types_to_wait should contain at least one serving tablet type")
 	}
 
-	err := CheckCellFlags(context.Background(), resilientServer, *cell, vtgate.CellsToWatch)
+	err := CheckCellFlags(context.Background(), resilientServer, *cell, *vtgate.CellsToWatch)
 	if err != nil {
 		log.Exitf("cells_to_watch validation failed: %v", err)
 	}

go/cmd/vtgr/main.go

@@ -18,8 +18,6 @@ import (
 	"flag"
 	"strings"
 
-	"github.com/spf13/pflag"
-
 	"vitess.io/vitess/go/vt/vtgr"
 
 	// Include deprecation warnings for soon-to-be-unsupported flag invocations.
@@ -28,7 +26,7 @@ import (
 
 func main() {
 	clustersToWatch := flag.String("clusters_to_watch", "", "Comma-separated list of keyspaces or keyspace/shards that this instance will monitor and repair. Defaults to all clusters in the topology. Example: \"ks1,ks2/-80\"")
-	_flag.Parse(pflag.NewFlagSet("vtgr", pflag.ExitOnError))
+	_flag.Parse()
 
 	// openTabletDiscovery will open up a connection to topo server
 	// and populate the tablets in memory

go/cmd/vttlstest/vttlstest.go

@@ -21,8 +21,6 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/spf13/pflag"
-
 	"vitess.io/vitess/go/exit"
 	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/logutil"
@@ -139,7 +137,7 @@ func main() {
 	_flag.SetUsage(flag.CommandLine, _flag.UsageOptions{
 		Preface: func(w io.Writer) { fmt.Fprint(w, doc) },
 	})
-	_flag.Parse(pflag.NewFlagSet("vttlstest", pflag.ExitOnError))
+	_flag.Parse()
 	args := _flag.Args()
 	if len(args) == 0 {
 		flag.Usage()

go/cmd/zk/zkcmd.go

@@ -33,7 +33,6 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/spf13/pflag"
 	"github.com/z-division/go-zookeeper/zk"
 	"golang.org/x/term"
 
@@ -141,11 +140,10 @@ func main() {
 	defer exit.Recover()
 	defer logutil.Flush()
 
-	fs := pflag.NewFlagSet("zkcmd", pflag.ExitOnError)
-	_flag.SetUsage(flag.CommandLine, _flag.UsageOptions{ // TODO: hmmm
+	_flag.SetUsage(flag.CommandLine, _flag.UsageOptions{
 		Epilogue: func(w io.Writer) { fmt.Fprint(w, doc) },
 	})
-	_flag.Parse(fs)
+	_flag.Parse()
 	args := _flag.Args()
 	if len(args) == 0 {
 		flag.Usage()

go/cmd/zkctl/zkctl.go

@@ -24,8 +24,6 @@ import (
 	"io"
 	"os"
 
-	"github.com/spf13/pflag"
-
 	"vitess.io/vitess/go/exit"
 	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/logutil"
@@ -62,7 +60,7 @@ func main() {
 	defer exit.Recover()
 	defer logutil.Flush()
 
-	_flag.Parse(pflag.NewFlagSet("zkctl", pflag.ExitOnError))
+	_flag.Parse()
 	args := _flag.Args()
 
 	if len(args) == 0 {

go/cmd/zkctld/zkctld.go

@@ -25,8 +25,6 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/spf13/pflag"
-
 	"vitess.io/vitess/go/exit"
 	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/logutil"
@@ -47,7 +45,7 @@ func main() {
 	defer exit.Recover()
 	defer logutil.Flush()
 
-	_flag.Parse(pflag.NewFlagSet("zkctld", pflag.ExitOnError))
+	_flag.Parse()
 
 	zkConfig := zkctl.MakeZkConfigFromString(*zkCfg, uint32(*myID))
 	zkd := zkctl.NewZkd(zkConfig)