From fe932c2694da202850c641c667f4e6b1a1f5e2ce Mon Sep 17 00:00:00 2001 From: Mahmood Ali Date: Fri, 4 Oct 2019 13:06:12 -0400 Subject: [PATCH] cli: show full id for single node or alloc status Show full ID on individual alloc or node status views. Shortening the ID isn't very helpful in these cases, and makes looking up the full id slightly more complicated when user needs to interact with API. List views are unmodified and show short id unless `-vebose` flag is passed. Before ``` $ nomad node status -self | head -n2 ID = 21fc51f9 Name = mars-2.local $ nomad alloc status 15ae54cd | head -n3 ID = 15ae54cd-08dd-3681-03cf-4c23ace7e7c3 Eval ID = a6b15f86 Name = example.cache[0] ``` After: ``` $ nomad node status -self | head -n2 ID = 21fc51f9-fd39-0fa0-fb41-f34c7aa36101 Name = mars-2.local $ nomad alloc status 15ae54cd | head -n3 ID = 15ae54cd-08dd-3681-03cf-4c23ace7e7c3 Eval ID = a6b15f86-ca8e-e536-b544-4bfb43137ff3 Name = example.cache[0] ``` --- command/alloc_status.go | 2 +- command/node_status.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/command/alloc_status.go b/command/alloc_status.go index 2022379986d6..1184534c6a39 100644 --- a/command/alloc_status.go +++ b/command/alloc_status.go @@ -234,7 +234,7 @@ func formatAllocBasicInfo(alloc *api.Allocation, client *api.Client, uuidLength } basic := []string{ - fmt.Sprintf("ID|%s", limit(alloc.ID, uuidLength)), + fmt.Sprintf("ID|%s", alloc.ID), fmt.Sprintf("Eval ID|%s", limit(alloc.EvalID, uuidLength)), fmt.Sprintf("Name|%s", alloc.Name), fmt.Sprintf("Node ID|%s", limit(alloc.NodeID, uuidLength)), diff --git a/command/node_status.go b/command/node_status.go index 2084af2a65d5..4bbf443b9da2 100644 --- a/command/node_status.go +++ b/command/node_status.go @@ -333,7 +333,7 @@ func formatDrain(n *api.Node) string { func (c *NodeStatusCommand) formatNode(client *api.Client, node *api.Node) int { // Format the header output basic := []string{ - fmt.Sprintf("ID|%s", limit(node.ID, c.length)), + fmt.Sprintf("ID|%s", node.ID), fmt.Sprintf("Name|%s", node.Name), fmt.Sprintf("Class|%s", node.NodeClass), fmt.Sprintf("DC|%s", node.Datacenter),