Merge pull request #3137 from hashicorp/b-deployment-ordering

Sort task groups when displaying a deployment

CHANGELOG.md

@@ -3,6 +3,7 @@
 BUG FIXES:
  * api: Search handles prefix longer than allowed UUIDs [GH-3138]
  * api: Search endpoint handles even UUID prefixes with hyphens [GH-3120]
+ * cli: Sort task groups when displaying a deployment [GH-3137]
  * api: Don't merge empty update stanza from job into task groups [GH-3139]
  * cli: All status commands handle even UUID prefixes with hyphens [GH-3122]
  * cli: Fix autocompletion of paths that include directories on zsh [GH-3129] 

command/deployment_status.go

@@ -2,6 +2,7 @@ package command
 
 import (
 	"fmt"
+	"sort"
 	"strings"
 
 	"github.com/hashicorp/nomad/api"
@@ -189,7 +190,9 @@ func formatDeployment(d *api.Deployment, uuidLength int) string {
 func formatDeploymentGroups(d *api.Deployment, uuidLength int) string {
 	// Detect if we need to add these columns
 	canaries, autorevert := false, false
-	for _, state := range d.TaskGroups {
+	tgNames := make([]string, 0, len(d.TaskGroups))
+	for name, state := range d.TaskGroups {
+		tgNames = append(tgNames, name)
 		if state.AutoRevert {
 			autorevert = true
 		}
@@ -198,6 +201,9 @@ func formatDeploymentGroups(d *api.Deployment, uuidLength int) string {
 		}
 	}
 
+	// Sort the task group names to get a reliable ordering
+	sort.Strings(tgNames)
+
 	// Build the row string
 	rowString := "Task Group|"
 	if autorevert {
@@ -215,7 +221,8 @@ func formatDeploymentGroups(d *api.Deployment, uuidLength int) string {
 	rows := make([]string, len(d.TaskGroups)+1)
 	rows[0] = rowString
 	i := 1
-	for tg, state := range d.TaskGroups {
+	for _, tg := range tgNames {
+		state := d.TaskGroups[tg]
 		row := fmt.Sprintf("%s|", tg)
 		if autorevert {
 			row += fmt.Sprintf("%v|", state.AutoRevert)