Fix flags for agentctl

Signed-off-by: Ondrej Fabry <ofabry@cisco.com>
ligato · Oct 15, 2019 · db9690e · db9690e
1 parent fc5a019
commit db9690e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/cmd/agentctl/cli/flags.go b/cmd/agentctl/cli/flags.go
@@ -68,7 +68,7 @@ func (opts *ClientOptions) InstallFlags(flags *pflag.FlagSet) {
 // complete
 func (opts *ClientOptions) SetDefaultOptions(flags *pflag.FlagSet) {
 	client.DefaultPortHTTP = opts.PortHTTP
-	client.DefaultPortHTTP = opts.PortHTTP
+	client.DefaultPortGRPC = opts.PortGRPC
 }
 
 // SetLogLevel sets the logrus logging level

diff --git a/cmd/agentctl/commands/root.go b/cmd/agentctl/commands/root.go
@@ -83,9 +83,10 @@ func NewRootNamed(name string, agentCli *cli.AgentCli) *Root {
 func (root *Root) PrepareCommand() (*cobra.Command, error) {
 	cmd, args, err := root.HandleGlobalFlags()
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("handle global flags failed: %v", err)
 	}
 	if debug.IsEnabledFor("flags") {
+		fmt.Printf("flag.Args() = %v\n", args)
 		cmd.DebugFlags()
 	}
 	cmd.SetArgs(args)
@@ -114,6 +115,7 @@ func newRoot(cmd *cobra.Command, agentCli *cli.AgentCli, opts *cli.ClientOptions
 func (root *Root) HandleGlobalFlags() (*cobra.Command, []string, error) {
 	cmd := root.cmd
 	flags := pflag.NewFlagSet(cmd.Name(), pflag.ContinueOnError)
+	flags.SetInterspersed(false)
 
 	// We need the single parse to see both sets of flags.
 	flags.AddFlagSet(cmd.Flags())