Merge pull request #2039 from gabrtv/fix-list-units

fix(deisctl): fix global unit display

Author: Gabriel Monroy

deisctl/backend/fleet/list_units.go

@@ -76,8 +76,7 @@ var (
 
 // ListUnits prints all Deis-related units to Stdout
 func (c *FleetClient) ListUnits() (err error) {
-	var sortable sort.StringSlice
-	states := make(map[string]*schema.UnitState, 0)
+	var states []*schema.UnitState
 
 	unitStates, err := cAPI.UnitStates()
 	if err != nil {
@@ -86,12 +85,10 @@ func (c *FleetClient) ListUnits() (err error) {
 
 	for _, us := range unitStates {
 		if strings.HasPrefix(us.Name, "deis-") {
-			states[us.Name] = us
-			sortable = append(sortable, us.Name)
+			states = append(states, us)
 		}
 	}
-	sortable.Sort()
-	printUnits(states, sortable)
+	printUnits(states)
 	return
 }
 
@@ -110,17 +107,16 @@ func (c *FleetClient) GetLocaljobs() sort.StringSlice {
 }
 
 // printUnits writes units to stdout using a tabwriter
-func printUnits(states map[string]*schema.UnitState, sortable sort.StringSlice) {
+func printUnits(states []*schema.UnitState) {
 	cols := strings.Split(defaultListUnitsFields, ",")
 	for _, s := range cols {
 		if _, ok := listUnitsFields[s]; !ok {
 			fmt.Fprintf(os.Stderr, "Invalid key in output format: %q\n", s)
 		}
 	}
 	fmt.Fprintln(out, strings.ToUpper(strings.Join(cols, "\t")))
-	for _, name := range sortable {
+	for _, us := range states {
 		var f []string
-		us := states[name]
 		for _, c := range cols {
 			f = append(f, listUnitsFields[c](us, false))
 		}