From 23bfbbf66da030479af6d06d68b5c1c10a48d6bf Mon Sep 17 00:00:00 2001 From: Ivo Verberk Date: Sun, 20 Dec 2015 18:02:10 +0100 Subject: [PATCH] Allow short identifiers for node-drain command --- command/node_drain.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/command/node_drain.go b/command/node_drain.go index efb0d13fe..3d1bec199 100644 --- a/command/node_drain.go +++ b/command/node_drain.go @@ -68,8 +68,15 @@ func (c *NodeDrainCommand) Run(args []string) int { return 1 } + // Check if node exists + node, _, err := client.Nodes().Info(nodeID, nil) + if err != nil { + c.Ui.Error(fmt.Sprintf("Error querying node info: %s", err)) + return 1 + } + // Toggle node draining - if _, err := client.Nodes().ToggleDrain(nodeID, enable, nil); err != nil { + if _, err := client.Nodes().ToggleDrain(node.ID, enable, nil); err != nil { c.Ui.Error(fmt.Sprintf("Error toggling drain mode: %s", err)) return 1 }