cluster: sort regions, for `jpictl dump`' sake

Signed-off-by: Alejandro Mery <amery@jpi.io>

pkg/cluster/regions.go

@@ -56,6 +56,7 @@ func (m *Cluster) initRegions(_ *ScanOptions) error {
 
 	// first regions defined by zones
 	m.ForEachZone(func(z *Zone) bool {
+		SortRegions(z.Regions)
 		for _, region := range z.Regions {
 			regions[region] = append(regions[region], z)
 		}
@@ -74,6 +75,7 @@ func (m *Cluster) initRegions(_ *ScanOptions) error {
 		m.finishRegion(r)
 	}
 
+	m.sortRegions()
 	return nil
 }
 

pkg/cluster/regions_utils.go

@@ -8,7 +8,13 @@ import "sort"
 func SortRegions(regions []string) []string {
 	sort.Slice(regions, func(i, j int) bool {
 		r1, r2 := regions[i], regions[j]
+		return regionLess(r1, r2)
+	})
+
+	return regions
+}
 
+func regionLess(r1, r2 string) bool {
 	switch {
 	case len(r1) < 4:
 		switch {
@@ -24,6 +30,12 @@ func SortRegions(regions []string) []string {
 	default:
 		return r1 < r2
 	}
+}
+
+func (m *Cluster) sortRegions() {
+	sort.Slice(m.Regions, func(i, j int) bool {
+		r1 := m.Regions[i].Name
+		r2 := m.Regions[j].Name
+		return regionLess(r1, r2)
 	})
-	return regions
 }