Make adding --dc and --wait-index variables a bit clearer

mantl · Jul 24, 2015 · 4b0a864 · 4b0a864
1 parent ef885c6
commit 4b0a864
Show file tree

Hide file tree

Showing 39 changed files with 107 additions and 72 deletions.
diff --git a/command/acl_clone.go b/command/acl_clone.go
@@ -22,7 +22,7 @@ Options:
 }
 
 func (c *ACLCloneCommand) Run(args []string) int {
-	flags := c.Meta.FlagSet(false)
+	flags := c.Meta.FlagSet()
 	flags.Usage = func() { c.UI.Output(c.Help()) }
 
 	if err := flags.Parse(args); err != nil {

diff --git a/command/acl_create.go b/command/acl_create.go
@@ -44,7 +44,7 @@ func (c *ACLCreateCommand) Run(args []string) int {
 	var isManagement bool
 	var aclName string
 
-	flags := c.Meta.FlagSet(false)
+	flags := c.Meta.FlagSet()
 	flags.StringVar(&aclName, "name", "", "")
 	flags.BoolVar(&isManagement, "management", false, "")
 	flags.Var((funcVar)(func(s string) error {

diff --git a/command/acl_destroy.go b/command/acl_destroy.go
@@ -22,7 +22,7 @@ Options:
 }
 
 func (c *ACLDestroyCommand) Run(args []string) int {
-	flags := c.Meta.FlagSet(false)
+	flags := c.Meta.FlagSet()
 	flags.Usage = func() { c.UI.Output(c.Help()) }
 
 	if err := flags.Parse(args); err != nil {

diff --git a/command/acl_info.go b/command/acl_info.go
@@ -22,7 +22,7 @@ Options:
 }
 
 func (c *ACLInfoCommand) Run(args []string) int {
-	flags := c.Meta.FlagSet(false)
+	flags := c.Meta.FlagSet()
 	flags.Usage = func() { c.UI.Output(c.Help()) }
 
 	if err := flags.Parse(args); err != nil {

diff --git a/command/acl_list.go b/command/acl_list.go
@@ -22,7 +22,7 @@ Options:
 }
 
 func (c *ACLListCommand) Run(args []string) int {
-	flags := c.Meta.FlagSet(false)
+	flags := c.Meta.FlagSet()
 	flags.Usage = func() { c.UI.Output(c.Help()) }
 
 	if err := flags.Parse(args); err != nil {

diff --git a/command/acl_update.go b/command/acl_update.go
@@ -35,7 +35,7 @@ func (c *ACLUpdateCommand) Run(args []string) int {
 	var isManagement bool
 	var aclName string
 
-	flags := c.Meta.FlagSet(false)
+	flags := c.Meta.FlagSet()
 	flags.StringVar(&aclName, "name", "", "")
 	flags.BoolVar(&isManagement, "management", false, "")
 

diff --git a/command/agent_checks.go b/command/agent_checks.go
@@ -21,7 +21,7 @@ Options:
 }
 
 func (c *AgentChecksCommand) Run(args []string) int {
-	flags := c.Meta.FlagSet(false)
+	flags := c.Meta.FlagSet()
 	flags.Usage = func() { c.UI.Output(c.Help()) }
 
 	if err := flags.Parse(args); err != nil {

diff --git a/command/agent_force_leave.go b/command/agent_force_leave.go
@@ -21,7 +21,7 @@ Options:
 }
 
 func (c *AgentForceLeaveCommand) Run(args []string) int {
-	flags := c.Meta.FlagSet(false)
+	flags := c.Meta.FlagSet()
 	flags.Usage = func() { c.UI.Output(c.Help()) }
 
 	if err := flags.Parse(args); err != nil {

diff --git a/command/agent_join.go b/command/agent_join.go
@@ -25,7 +25,7 @@ Options:
 }
 
 func (c *AgentJoinCommand) Run(args []string) int {
-	flags := c.Meta.FlagSet(false)
+	flags := c.Meta.FlagSet()
 	flags.BoolVar(&c.joinWAN, "wan", false, "")
 	flags.Usage = func() { c.UI.Output(c.Help()) }
 

diff --git a/command/agent_maintenance.go b/command/agent_maintenance.go
@@ -28,7 +28,7 @@ Options:
 }
 
 func (c *AgentMaintenanceCommand) Run(args []string) int {
-	flags := c.Meta.FlagSet(false)
+	flags := c.Meta.FlagSet()
 	flags.BoolVar(&c.enabled, "enabled", true, "")
 	flags.StringVar(&c.reason, "reason", "", "")
 	flags.Usage = func() { c.UI.Output(c.Help()) }

diff --git a/command/agent_members.go b/command/agent_members.go
@@ -25,7 +25,7 @@ Options:
 }
 
 func (c *AgentMembersCommand) Run(args []string) int {
-	flags := c.Meta.FlagSet(false)
+	flags := c.Meta.FlagSet()
 	flags.BoolVar(&c.wanFlag, "wan", false, "")
 	flags.Usage = func() { c.UI.Output(c.Help()) }
 

diff --git a/command/agent_self.go b/command/agent_self.go
@@ -21,7 +21,7 @@ Options:
 }
 
 func (c *AgentSelfCommand) Run(args []string) int {
-	flags := c.Meta.FlagSet(false)
+	flags := c.Meta.FlagSet()
 	flags.Usage = func() { c.UI.Output(c.Help()) }
 
 	if err := flags.Parse(args); err != nil {

diff --git a/command/agent_services.go b/command/agent_services.go
@@ -21,7 +21,7 @@ Options:
 }
 
 func (c *AgentServicesCommand) Run(args []string) int {
-	flags := c.Meta.FlagSet(false)
+	flags := c.Meta.FlagSet()
 	flags.Usage = func() { c.UI.Output(c.Help()) }
 
 	if err := flags.Parse(args); err != nil {

diff --git a/command/check_deregister.go b/command/check_deregister.go
@@ -21,7 +21,7 @@ Options:
 }
 
 func (c *CheckDeregisterCommand) Run(args []string) int {
-	flags := c.Meta.FlagSet(false)
+	flags := c.Meta.FlagSet()
 	flags.Usage = func() { c.UI.Output(c.Help()) }
 
 	if err := flags.Parse(args); err != nil {

diff --git a/command/check_fail.go b/command/check_fail.go
@@ -25,7 +25,7 @@ Options:
 }
 
 func (c *CheckFailCommand) Run(args []string) int {
-	flags := c.Meta.FlagSet(false)
+	flags := c.Meta.FlagSet()
 	flags.StringVar(&c.note, "note", "", "")
 	flags.Usage = func() { c.UI.Output(c.Help()) }
 

diff --git a/command/check_pass.go b/command/check_pass.go
@@ -25,7 +25,7 @@ Options:
 }
 
 func (c *CheckPassCommand) Run(args []string) int {
-	flags := c.Meta.FlagSet(false)
+	flags := c.Meta.FlagSet()
 	flags.StringVar(&c.note, "note", "", "")
 	flags.Usage = func() { c.UI.Output(c.Help()) }
 

diff --git a/command/check_register.go b/command/check_register.go
@@ -51,7 +51,7 @@ Options:
 }
 
 func (c *CheckRegisterCommand) Run(args []string) int {
-	flags := c.Meta.FlagSet(false)
+	flags := c.Meta.FlagSet()
 	flags.StringVar(&c.id, "id", "", "")
 	flags.StringVar(&c.http, "http", "", "")
 	flags.StringVar(&c.script, "script", "", "")

diff --git a/command/check_warn.go b/command/check_warn.go
@@ -25,7 +25,7 @@ Options:
 }
 
 func (c *CheckWarnCommand) Run(args []string) int {
-	flags := c.Meta.FlagSet(false)
+	flags := c.Meta.FlagSet()
 	flags.StringVar(&c.note, "note", "", "")
 	flags.Usage = func() { c.UI.Output(c.Help()) }
 

diff --git a/command/health_checks.go b/command/health_checks.go
@@ -22,7 +22,8 @@ Options:
 }
 
 func (c *HealthChecksCommand) Run(args []string) int {
-	flags := c.Meta.FlagSet(true)
+	c.AddDataCenter()
+	flags := c.Meta.FlagSet()
 	flags.Usage = func() { c.UI.Output(c.Help()) }
 
 	if err := flags.Parse(args); err != nil {

diff --git a/command/health_node.go b/command/health_node.go
@@ -22,7 +22,8 @@ Options:
 }
 
 func (c *HealthNodeCommand) Run(args []string) int {
-	flags := c.Meta.FlagSet(true)
+	c.AddDataCenter()
+	flags := c.Meta.FlagSet()
 	flags.Usage = func() { c.UI.Output(c.Help()) }
 
 	if err := flags.Parse(args); err != nil {

diff --git a/command/health_service.go b/command/health_service.go
@@ -29,7 +29,8 @@ Options:
 }
 
 func (c *HealthServiceCommand) Run(args []string) int {
-	flags := c.Meta.FlagSet(true)
+	c.AddDataCenter()
+	flags := c.Meta.FlagSet()
 	flags.StringVar(&c.tag, "tag", "", "")
 	flags.BoolVar(&c.passingOnly, "passing", false, "")
 	flags.Usage = func() { c.UI.Output(c.Help()) }

diff --git a/command/health_state.go b/command/health_state.go
@@ -22,7 +22,8 @@ Options:
 }
 
 func (c *HealthStateCommand) Run(args []string) int {
-	flags := c.Meta.FlagSet(true)
+	c.AddDataCenter()
+	flags := c.Meta.FlagSet()
 	flags.Usage = func() { c.UI.Output(c.Help()) }
 
 	if err := flags.Parse(args); err != nil {

diff --git a/command/kv_delete.go b/command/kv_delete.go
@@ -9,6 +9,8 @@ import (
 
 type KVDeleteCommand struct {
 	Meta
+	modifyIndex	string
+	doRecurse	bool
 }
 
 func (c *KVDeleteCommand) Help() string {
@@ -30,12 +32,10 @@ Options:
 }
 
 func (c *KVDeleteCommand) Run (args[]string) int {
-	var modifyIndex string
-	var doRecurse bool
-
-	flags := c.Meta.FlagSet(true)
-	flags.StringVar(&modifyIndex, "modifyindex", "", "")
-	flags.BoolVar(&doRecurse, "recurse", false, "")
+	c.AddDataCenter()
+	flags := c.Meta.FlagSet()
+	flags.StringVar(&c.modifyIndex, "modifyindex", "", "")
+	flags.BoolVar(&c.doRecurse, "recurse", false, "")
 	flags.Usage = func() { c.UI.Output(c.Help()) }
 
 	if err := flags.Parse(args); err != nil {
@@ -62,14 +62,14 @@ func (c *KVDeleteCommand) Run (args[]string) int {
 	writeOpts := c.WriteOptions()
 
 	switch {
-	case doRecurse:
+	case c.doRecurse:
 		_, err := client.DeleteTree(path, writeOpts)
 		if err != nil {
 			c.UI.Error(err.Error())
 			return 1
 		}
-	case modifyIndex != "":
-		m, err := strconv.ParseUint(modifyIndex, 0, 64)
+	case c.modifyIndex != "":
+		m, err := strconv.ParseUint(c.modifyIndex, 0, 64)
 		if err != nil {
 			c.UI.Error(err.Error())
 			return 1

diff --git a/command/kv_lock.go b/command/kv_lock.go
@@ -44,7 +44,8 @@ func (c *KVLockCommand) Run(args []string) int {
 
 	c.cleanSession = false
 
-	flags := c.Meta.FlagSet(true)
+	c.AddDataCenter()
+	flags := c.Meta.FlagSet()
 	flags.StringVar(&c.behavior, "behavior", "release", "")
 	flags.StringVar(&c.ttl, "ttl", "", "")
 	flags.DurationVar(&c.lockDelay, "lock-delay", time.Second * 15, "")

diff --git a/command/kv_read.go b/command/kv_read.go
@@ -6,6 +6,9 @@ import (
 
 type KVReadCommand struct {
 	Meta
+	format		OutputFormat
+	fieldsRaw	string
+	recurse		bool
 }
 
 func (c *KVReadCommand) Help() string {
@@ -33,16 +36,14 @@ Options:
 }
 
 func (c *KVReadCommand) Run(args []string) int {
-	var format OutputFormat
-	var fieldsRaw string
-	var recurse bool
-
-	flags := c.Meta.FlagSet(true)
-	flags.StringVar(&fieldsRaw, "fields", "value", "")
-	flags.StringVar(&format.Type, "format", "text", "")
-	flags.StringVar(&format.Delimiter, "delimiter", " ", "")
-	flags.BoolVar(&format.Header, "header", false, "")
-	flags.BoolVar(&recurse, "recurse", false, "")
+	c.AddDataCenter()
+
+	flags := c.Meta.FlagSet()
+	flags.StringVar(&c.fieldsRaw, "fields", "value", "")
+	flags.StringVar(&c.format.Type, "format", "text", "")
+	flags.StringVar(&c.format.Delimiter, "delimiter", " ", "")
+	flags.BoolVar(&c.format.Header, "header", false, "")
+	flags.BoolVar(&c.recurse, "recurse", false, "")
 	flags.Usage = func() { c.UI.Output(c.Help()) }
 
 	if err := flags.Parse(args); err != nil {
@@ -68,9 +69,9 @@ func (c *KVReadCommand) Run(args []string) int {
 
 	queryOpts := c.QueryOptions()
 
-	kvo := NewKVOutput(c.UI, fieldsRaw)
+	kvo := NewKVOutput(c.UI, c.fieldsRaw)
 
-	if recurse {
+	if c.recurse {
 		kvlist, _, err := client.List(path, queryOpts)
 		if err != nil {
 			c.UI.Error(err.Error())
@@ -81,7 +82,7 @@ func (c *KVReadCommand) Run(args []string) int {
 			return 0
 		}
 
-		kvo.OutputList(&kvlist, format)
+		kvo.OutputList(&kvlist, c.format)
 	} else {
 		kv, _, err := client.Get(path, queryOpts)
 		if err != nil {
@@ -93,7 +94,7 @@ func (c *KVReadCommand) Run(args []string) int {
 			return 0
 		}
 
-		kvo.Output(kv, format)
+		kvo.Output(kv, c.format)
 	}
 
 	return 0

diff --git a/command/kv_unlock.go b/command/kv_unlock.go
@@ -30,7 +30,8 @@ Options:
 }
 
 func (c *KVUnlockCommand) Run(args []string) int {
-	flags := c.Meta.FlagSet(true)
+	c.AddDataCenter()
+	flags := c.Meta.FlagSet()
 	flags.StringVar(&c.session, "session", "", "")
 	flags.BoolVar(&c.noDestroy, "no-destroy", false, "")
 	flags.Usage = func() { c.UI.Output(c.Help()) }

diff --git a/command/kv_write.go b/command/kv_write.go
@@ -11,6 +11,8 @@ import (
 
 type KVWriteCommand struct {
 	Meta
+	modifyIndex	string
+	dataFlags	string
 }
 
 func (c *KVWriteCommand) Help() string {
@@ -31,12 +33,10 @@ Options:
 }
 
 func (c *KVWriteCommand) Run(args []string) int {
-	var modifyIndex string
-	var dataFlags string
-
-	flags := c.Meta.FlagSet(true)
-	flags.StringVar(&modifyIndex, "cas", "", "")
-	flags.StringVar(&dataFlags, "flags", "", "")
+	c.AddDataCenter()
+	flags := c.Meta.FlagSet()
+	flags.StringVar(&c.modifyIndex, "cas", "", "")
+	flags.StringVar(&c.dataFlags, "flags", "", "")
 	flags.Usage = func() { c.UI.Output(c.Help()) }
 
 	if err := flags.Parse(args); err != nil {
@@ -70,10 +70,10 @@ func (c *KVWriteCommand) Run(args []string) int {
 
 	// &flags=
 	//
-	if dataFlags != "" {
-		f, err := strconv.ParseUint(dataFlags, 0, 64)
+	if c.dataFlags != "" {
+		f, err := strconv.ParseUint(c.dataFlags, 0, 64)
 		if err != nil {
-			c.UI.Error(fmt.Sprintf("Error parsing flags: %v", dataFlags))
+			c.UI.Error(fmt.Sprintf("Error parsing flags: %v", c.dataFlags))
 			c.UI.Error("")
 			return 1
 		}
@@ -89,17 +89,17 @@ func (c *KVWriteCommand) Run(args []string) int {
 
 	writeOpts := c.WriteOptions()
 
-	if modifyIndex == "" {
+	if c.modifyIndex == "" {
 		_, err := client.Put(kv, writeOpts)
 		if err != nil {
 			c.UI.Error(err.Error())
 			return 1
 		}
 	} else {
 		// Check-and-Set
-		i, err := strconv.ParseUint(modifyIndex, 0, 64)
+		i, err := strconv.ParseUint(c.modifyIndex, 0, 64)
 		if err != nil {
-			c.UI.Error(fmt.Sprintf("Error parsing modifyIndex: %v", modifyIndex))
+			c.UI.Error(fmt.Sprintf("Error parsing modifyIndex: %v", c.modifyIndex))
 			c.UI.Error("")
 			return 1
 		}