Skip to content

Fix adding flags to vtctlclient and vtctldclient #11322

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Sep 26, 2022
Merged

Fix adding flags to vtctlclient and vtctldclient #11322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0ab2bf2
feat: fix adding flags to vtctlclient and vtctldclient
GuptaManan100 Sep 22, 2022
e275cd1
feat: add vtctlclient and vtctldclient to flag tests
GuptaManan100 Sep 22, 2022
e7e04fe
feat: remove tracing from both binaries
GuptaManan100 Sep 22, 2022
44bb6fc
Merge remote-tracking branch 'upstream/main' into vtctlclient-fix
GuptaManan100 Sep 23, 2022
05625b9
feat: fix imports in vtctlclient
GuptaManan100 Sep 23, 2022
db44630
Merge remote-tracking branch 'upstream/main' into vtctlclient-fix
GuptaManan100 Sep 23, 2022
58f2f3c
feat: fix test output
GuptaManan100 Sep 23, 2022
2e94295
Merge remote-tracking branch 'upstream/main' into vtctlclient-fix
GuptaManan100 Sep 26, 2022
e563df8
feat: fix vtctdclient output
GuptaManan100 Sep 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions go/cmd/vtctldclient/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ import (

"vitess.io/vitess/go/cmd/vtctldclient/command"
"vitess.io/vitess/go/exit"
"vitess.io/vitess/go/vt/grpcclient"
"vitess.io/vitess/go/vt/grpccommon"
"vitess.io/vitess/go/vt/log"
"vitess.io/vitess/go/vt/logutil"
"vitess.io/vitess/go/vt/servenv"
Expand All @@ -34,6 +36,8 @@ func main() {
command.Root.PersistentFlags().AddGoFlagSet(flag.CommandLine)
log.RegisterFlags(command.Root.PersistentFlags())
logutil.RegisterFlags(command.Root.PersistentFlags())
grpcclient.RegisterFlags(command.Root.PersistentFlags())
grpccommon.RegisterFlags(command.Root.PersistentFlags())
servenv.RegisterMySQLServerFlags(command.Root.PersistentFlags())

// hack to get rid of an "ERROR: logging before flag.Parse"
Expand Down
9 changes: 9 additions & 0 deletions go/flags/endtoend/flags_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,12 @@ var (
//go:embed vtorc.txt
vtorcTxt string

//go:embed vtctlclient.txt
vtctlclientTxt string

//go:embed vtctldclient.txt
vtctldclientTxt string

//go:embed vttestserver.txt
vttestserverTxt string

Expand All @@ -59,6 +65,8 @@ var (
"vtgr": vtgrTxt,
"vttablet": vttabletTxt,
"vtctld": vtctldTxt,
"vtctlclient": vtctlclientTxt,
"vtctldclient": vtctldclientTxt,
"vtorc": vtorcTxt,
"vttestserver": vttestserverTxt,
}
Expand All @@ -71,6 +79,7 @@ func TestHelpOutput(t *testing.T) {
cmd := exec.Command(binary, args...)
output := bytes.Buffer{}
cmd.Stderr = &output
cmd.Stdout = &output
err := cmd.Run()
require.NoError(t, err)
utils.MustMatch(t, helptext, output.String())
Expand Down
Loading