Merge pull request #675 from nautsio/f-cli-short-ids

Shorten CLI identifiers

api/nodes_test.go

@@ -87,7 +87,7 @@ func TestNodes_Info(t *testing.T) {
 	nodes := c.Nodes()
 
 	// Retrieving a non-existent node returns error
-	_, _, err := nodes.Info("nope", nil)
+	_, _, err := nodes.Info("12345678-abcd-efab-cdef-123456789abc", nil)
 	if err == nil || !strings.Contains(err.Error(), "not found") {
 		t.Fatalf("expected not found error, got: %#v", err)
 	}
@@ -215,7 +215,7 @@ func TestNodes_ForceEvaluate(t *testing.T) {
 	nodes := c.Nodes()
 
 	// Force-eval on a non-existent node fails
-	_, _, err := nodes.ForceEvaluate("nope", nil)
+	_, _, err := nodes.ForceEvaluate("12345678-abcd-efab-cdef-123456789abc", nil)
 	if err == nil || !strings.Contains(err.Error(), "not found") {
 		t.Fatalf("expected not found error, got: %#v", err)
 	}

client/client.go

@@ -450,6 +450,12 @@ func (c *Client) setupNode() error {
 		node = &structs.Node{}
 		c.config.Node = node
 	}
+	// Generate an iD for the node
+	var err error
+	node.ID, err = c.nodeID()
+	if err != nil {
+		return fmt.Errorf("node ID setup failed: %v", err)
+	}
 	if node.Attributes == nil {
 		node.Attributes = make(map[string]string)
 	}
@@ -462,13 +468,6 @@ func (c *Client) setupNode() error {
 	if node.Resources == nil {
 		node.Resources = &structs.Resources{}
 	}
-	if node.ID == "" {
-		id, err := c.nodeID()
-		if err != nil {
-			return fmt.Errorf("node ID setup failed: %v", err)
-		}
-		node.ID = id
-	}
 	if node.Datacenter == "" {
 		node.Datacenter = "dc1"
 	}

command/agent/agent.go

@@ -220,7 +220,6 @@ func (a *Agent) setupClient() error {
 	conf.Node = new(structs.Node)
 	conf.Node.Datacenter = a.config.Datacenter
 	conf.Node.Name = a.config.NodeName
-	conf.Node.ID = a.config.Client.NodeID
 	conf.Node.Meta = a.config.Client.Meta
 	conf.Node.NodeClass = a.config.Client.NodeClass
 

command/agent/command.go

@@ -82,7 +82,6 @@ func (c *Command) readConfig() *Config {
 	// Client-only options
 	flags.StringVar(&cmdConfig.Client.StateDir, "state-dir", "", "")
 	flags.StringVar(&cmdConfig.Client.AllocDir, "alloc-dir", "", "")
-	flags.StringVar(&cmdConfig.Client.NodeID, "node-id", "", "")
 	flags.StringVar(&cmdConfig.Client.NodeClass, "node-class", "", "")
 	flags.StringVar(&servers, "servers", "", "")
 	flags.Var((*sliceflag.StringFlag)(&meta), "meta", "")

command/agent/config.go

@@ -135,10 +135,6 @@ type ClientConfig struct {
 	// Servers is a list of known server addresses. These are as "host:port"
 	Servers []string `hcl:"servers"`
 
-	// NodeID is the unique node identifier to use. A UUID is used
-	// if not provided, and stored in the data directory
-	NodeID string `hcl:"node_id"`
-
 	// NodeClass is used to group the node by class
 	NodeClass string `hcl:"node_class"`
 
@@ -492,9 +488,6 @@ func (a *ClientConfig) Merge(b *ClientConfig) *ClientConfig {
 	if b.AllocDir != "" {
 		result.AllocDir = b.AllocDir
 	}
-	if b.NodeID != "" {
-		result.NodeID = b.NodeID
-	}
 	if b.NodeClass != "" {
 		result.NodeClass = b.NodeClass
 	}

command/agent/config_test.go

@@ -35,7 +35,6 @@ func TestConfig_Merge(t *testing.T) {
 			Enabled:   false,
 			StateDir:  "/tmp/state1",
 			AllocDir:  "/tmp/alloc1",
-			NodeID:    "node1",
 			NodeClass: "class1",
 			Options: map[string]string{
 				"foo": "bar",
@@ -96,7 +95,6 @@ func TestConfig_Merge(t *testing.T) {
 			Enabled:   true,
 			StateDir:  "/tmp/state2",
 			AllocDir:  "/tmp/alloc2",
-			NodeID:    "node2",
 			NodeClass: "class2",
 			Servers:   []string{"server2"},
 			Meta: map[string]string{
@@ -413,7 +411,6 @@ func TestConfig_LoadConfigString(t *testing.T) {
 			StateDir:  "/tmp/client-state",
 			AllocDir:  "/tmp/alloc",
 			Servers:   []string{"a.b.c:80", "127.0.0.1:1234"},
-			NodeID:    "xyz123",
 			NodeClass: "linux-medium-64bit",
 			Meta: map[string]string{
 				"foo": "bar",

command/agent/node_endpoint_test.go

@@ -58,7 +58,14 @@ func TestHTTP_NodesList(t *testing.T) {
 
 func TestHTTP_NodesPrefixList(t *testing.T) {
 	httpTest(t, nil, func(s *TestServer) {
-		ids := []string{"aaaaa", "aaaab", "aaabb", "aabbb", "abbbb", "bbbbb"}
+		ids := []string{
+			"12345678-abcd-efab-cdef-123456789abc",
+			"12345678-aaaa-efab-cdef-123456789abc",
+			"1234aaaa-abcd-efab-cdef-123456789abc",
+			"1234bbbb-abcd-efab-cdef-123456789abc",
+			"1234cccc-abcd-efab-cdef-123456789abc",
+			"1234dddd-abcd-efab-cdef-123456789abc",
+		}
 		for i := 0; i < 5; i++ {
 			// Create the node
 			node := mock.Node()
@@ -74,7 +81,7 @@ func TestHTTP_NodesPrefixList(t *testing.T) {
 		}
 
 		// Make the HTTP request
-		req, err := http.NewRequest("GET", "/v1/nodes?prefix=aaa", nil)
+		req, err := http.NewRequest("GET", "/v1/nodes?prefix=12345678", nil)
 		if err != nil {
 			t.Fatalf("err: %v", err)
 		}
@@ -99,7 +106,7 @@ func TestHTTP_NodesPrefixList(t *testing.T) {
 
 		// Check the nodes
 		n := obj.([]*structs.NodeListStub)
-		if len(n) != 3 {
+		if len(n) != 2 {
 			t.Fatalf("bad: %#v", n)
 		}
 	})

command/alloc_status.go

@@ -26,10 +26,12 @@ General Options:
 
   ` + generalOptionsUsage() + `
 
-Alloc Status Options:
 
   -short
     Display short output. Shows only the most recent task event.
+
+  -verbose
+    Show full information.
 `
 
 	return strings.TrimSpace(helpText)
@@ -40,11 +42,12 @@ func (c *AllocStatusCommand) Synopsis() string {
 }
 
 func (c *AllocStatusCommand) Run(args []string) int {
-	var short bool
+	var short, verbose bool
 
 	flags := c.Meta.FlagSet("alloc-status", FlagSetClient)
 	flags.Usage = func() { c.Ui.Output(c.Help()) }
 	flags.BoolVar(&short, "short", false, "")
+	flags.BoolVar(&verbose, "verbose", false, "")
 
 	if err := flags.Parse(args); err != nil {
 		return 1
@@ -65,6 +68,12 @@ func (c *AllocStatusCommand) Run(args []string) int {
 		return 1
 	}
 
+	// Truncate the id unless full length is requested
+	length := shortId
+	if verbose {
+		length = fullId
+	}
+
 	// Query the allocation info
 	alloc, _, err := client.Allocations().Info(allocID, nil)
 	if err != nil {
@@ -83,12 +92,13 @@ func (c *AllocStatusCommand) Run(args []string) int {
 			out[0] = "ID|EvalID|JobID|TaskGroup|DesiredStatus|ClientStatus"
 			for i, alloc := range allocs {
 				out[i+1] = fmt.Sprintf("%s|%s|%s|%s|%s|%s",
-					alloc.ID,
-					alloc.EvalID,
+					alloc.ID[:length],
+					alloc.EvalID[:length],
 					alloc.JobID,
 					alloc.TaskGroup,
 					alloc.DesiredStatus,
-					alloc.ClientStatus)
+					alloc.ClientStatus,
+				)
 			}
 			c.Ui.Output(fmt.Sprintf("Prefix matched multiple allocations\n\n%s", formatList(out)))
 			return 0
@@ -103,10 +113,10 @@ func (c *AllocStatusCommand) Run(args []string) int {
 
 	// Format the allocation data
 	basic := []string{
-		fmt.Sprintf("ID|%s", alloc.ID),
-		fmt.Sprintf("EvalID|%s", alloc.EvalID),
+		fmt.Sprintf("ID|%s", alloc.ID[:length]),
+		fmt.Sprintf("EvalID|%s", alloc.EvalID[:length]),
 		fmt.Sprintf("Name|%s", alloc.Name),
-		fmt.Sprintf("NodeID|%s", alloc.NodeID),
+		fmt.Sprintf("NodeID|%s", alloc.NodeID[:length]),
 		fmt.Sprintf("JobID|%s", alloc.JobID),
 		fmt.Sprintf("ClientStatus|%s", alloc.ClientStatus),
 		fmt.Sprintf("NodesEvaluated|%d", alloc.Metrics.NodesEvaluated),
@@ -126,7 +136,7 @@ func (c *AllocStatusCommand) Run(args []string) int {
 
 	// Format the detailed status
 	c.Ui.Output("\n==> Status")
-	dumpAllocStatus(c.Ui, alloc)
+	dumpAllocStatus(c.Ui, alloc, length)
 
 	return 0
 }

command/eval_monitor.go

@@ -29,7 +29,13 @@ Usage: nomad eval-monitor [options] <evaluation>
 
 General Options:
 
-  ` + generalOptionsUsage()
+  ` + generalOptionsUsage() + `
+
+Eval Monitor Options:
+
+  -verbose
+    Show full information.
+`
 	return strings.TrimSpace(helpText)
 }
 
@@ -38,12 +44,22 @@ func (c *EvalMonitorCommand) Synopsis() string {
 }
 
 func (c *EvalMonitorCommand) Run(args []string) int {
+	var verbose bool
+
 	flags := c.Meta.FlagSet("eval-monitor", FlagSetClient)
 	flags.Usage = func() { c.Ui.Output(c.Help()) }
+	flags.BoolVar(&verbose, "verbose", false, "")
+
 	if err := flags.Parse(args); err != nil {
 		return 1
 	}
 
+	// Truncate the id unless full length is requested
+	length := shortId
+	if verbose {
+		length = fullId
+	}
+
 	// Check that we got exactly one eval ID
 	args = flags.Args()
 	if len(args) != 1 {
@@ -60,6 +76,6 @@ func (c *EvalMonitorCommand) Run(args []string) int {
 	}
 
 	// Start monitoring
-	mon := newMonitor(c.Ui, client)
+	mon := newMonitor(c.Ui, client, length)
 	return mon.monitor(evalID, true)
 }

command/eval_monitor_test.go

@@ -37,7 +37,7 @@ func TestEvalMonitorCommand_Fails(t *testing.T) {
 	ui.ErrorWriter.Reset()
 
 	// Fails on connection failure
-	if code := cmd.Run([]string{"-address=nope", "nope"}); code != 1 {
+	if code := cmd.Run([]string{"-address=nope", "12345678-abcd-efab-cdef-123456789abc"}); code != 1 {
 		t.Fatalf("expected exit code 1, got: %d", code)
 	}
 	if out := ui.ErrorWriter.String(); !strings.Contains(out, "Error reading evaluation") {

command/meta.go

@@ -15,6 +15,10 @@ const (
 	// Names of environment variables used to supply various
 	// config options to the Nomad CLI.
 	EnvNomadAddress = "NOMAD_ADDR"
+
+	// Constants for CLI identifier length
+	shortId = 8
+	fullId  = 36
 )
 
 // FlagSetFlags is an enum to define what flags are present in the