From 4d604c5138daa78531fe7e3c1dcfcf77f408069b Mon Sep 17 00:00:00 2001
From: Frank Schroeder <frank.schroeder@gmail.com>
Date: Thu, 5 Oct 2017 17:30:25 +0200
Subject: [PATCH] command: simplify 'operator raft'

The cli library can handle subcommands. Therefore, most of the code is
no longer necessary.
---
 command/operator_raft.go | 77 ++++------------------------------------
 1 file changed, 6 insertions(+), 71 deletions(-)

diff --git a/command/operator_raft.go b/command/operator_raft.go
index 421a6f5104..5460a694c1 100644
--- a/command/operator_raft.go
+++ b/command/operator_raft.go
@@ -1,15 +1,19 @@
 package command
 
 import (
-	"flag"
-	"fmt"
 	"strings"
+
+	"github.com/mitchellh/cli"
 )
 
 type OperatorRaftCommand struct {
 	BaseCommand
 }
 
+func (c *OperatorRaftCommand) Run(args []string) int {
+	return cli.RunResultHelp
+}
+
 func (c *OperatorRaftCommand) Help() string {
 	helpText := `
 Usage: consul operator raft <subcommand> [options]
@@ -18,11 +22,6 @@ The Raft operator command is used to interact with Consul's Raft subsystem. The
 command can be used to verify Raft peers or in rare cases to recover quorum by
 removing invalid peers.
 
-Subcommands:
-
-    list-peers     Display the current Raft peer configuration
-    remove-peer    Remove a Consul server from the Raft configuration
-
 `
 
 	return strings.TrimSpace(helpText)
@@ -31,67 +30,3 @@ Subcommands:
 func (c *OperatorRaftCommand) Synopsis() string {
 	return "Provides cluster-level tools for Consul operators"
 }
-
-func (c *OperatorRaftCommand) Run(args []string) int {
-	if result := c.raft(args); result != nil {
-		c.UI.Error(result.Error())
-		return 1
-	}
-	return 0
-}
-
-// raft handles the raft subcommands.
-func (c *OperatorRaftCommand) raft(args []string) error {
-	f := c.BaseCommand.NewFlagSet(c)
-
-	// Parse verb arguments.
-	var listPeers, removePeer bool
-	f.BoolVar(&listPeers, "list-peers", false,
-		"If this flag is provided, the current Raft peer configuration will be "+
-			"displayed. If the cluster is in an outage state without a leader, you may need "+
-			"to set -stale to 'true' to get the configuration from a non-leader server.")
-	f.BoolVar(&removePeer, "remove-peer", false,
-		"If this flag is provided, the Consul server with the given -address will be "+
-			"removed from the Raft configuration.")
-
-	// Parse other arguments.
-	var address string
-	f.StringVar(&address, "address", "",
-		"The address to remove from the Raft configuration.")
-
-	// Leave these flags for backwards compatibility, but hide them
-	// TODO: remove flags/behavior from this command in Consul 0.9
-	c.BaseCommand.HideFlags("list-peers", "remove-peer", "address")
-
-	if err := c.BaseCommand.Parse(args); err != nil {
-		if err == flag.ErrHelp {
-			return nil
-		}
-		return err
-	}
-
-	// Set up a client.
-	client, err := c.BaseCommand.HTTPClient()
-	if err != nil {
-		return fmt.Errorf("error connecting to Consul agent: %s", err)
-	}
-
-	// Dispatch based on the verb argument.
-	if listPeers {
-		result, err := raftListPeers(client, c.BaseCommand.HTTPStale())
-		if err != nil {
-			c.UI.Error(fmt.Sprintf("Error getting peers: %v", err))
-		}
-		c.UI.Output(result)
-	} else if removePeer {
-		if err := raftRemovePeers(address, "", client.Operator()); err != nil {
-			return fmt.Errorf("Error removing peer: %v", err)
-		}
-		c.UI.Output(fmt.Sprintf("Removed peer with address %q", address))
-	} else {
-		c.UI.Output(c.Help())
-		return nil
-	}
-
-	return nil
-}