Merge pull request 'cluster: use typed IDs, introduce Region.ID, and pre-compute primary region' (#49) from pr-amery-regions into main

Reviewed-on: #49

Makefile

@@ -15,7 +15,8 @@ TMPDIR ?= .tmp
 REVIVE ?= $(GOBIN)/revive
 REVIVE_CONF ?= $(TOOLSDIR)/revive.toml
 REVIVE_RUN_ARGS ?= -config $(REVIVE_CONF) -formatter friendly
-REVIVE_INSTALL_URL ?= github.com/mgechev/revive@master
+REVIVE_VERSION ?= v1.3.7
+REVIVE_INSTALL_URL ?= github.com/mgechev/revive@$(REVIVE_VERSION)
 
 GO_INSTALL_URLS = \
 	$(REVIVE_INSTALL_URL) \

pkg/cluster/cluster_import.go

@@ -13,11 +13,11 @@ import (
 func (m *Cluster) init(opts *ScanOptions) error {
 	for _, fn := range []func(*ScanOptions) error{
 		m.initZones,
+		m.initRegions,
 		m.scanZoneIDs,
 		m.scanSort,
 		m.scanGateways,
 		m.initCephMonitors,
-		m.initRegions,
 	} {
 		if err := fn(opts); err != nil {
 			return err

pkg/cluster/cluster_scan.go

@@ -25,9 +25,9 @@ func (m *Cluster) scan(opts *ScanOptions) error {
 	for _, fn := range []func(*ScanOptions) error{
 		m.scanDirectory,
 		m.scanMachines,
+		m.initRegions,
 		m.scanZoneIDs,
 		m.scanSort,
-		m.initRegions,
 		m.scanGateways,
 		m.scanCephMonitors,
 	} {

pkg/cluster/env.go

@@ -163,18 +163,10 @@ func genEnvZoneNodes(z *Zone) string {
 }
 
 func genEnvZoneRegion(z *Zone) string {
-	var region string
+	if z != nil && z.region != nil {
-
+		return z.region.Name
-	z.ForEachRegion(func(r *Region) bool {
+	}
-		if r.IsPrimary() {
+	return ""
-			region = r.Name
-			return true
-		}
-
-		return false
-	})
-
-	return region
 }
 
 func genEnvZoneCephMonNames(m Machines) string {

pkg/cluster/regions.go

@@ -31,7 +31,7 @@ type Region struct {
 	Regions []string       `json:",omitempty" yaml:",omitempty"`
 }
 
-// IsPrimary() indicates the region is primary and corresponds
+// IsPrimary indicates the region is primary and corresponds
 // to a kubernetes cluster.
 func (r *Region) IsPrimary() bool {
 	return r != nil && r.Cluster != nil
@@ -100,7 +100,10 @@ func (m *Cluster) initRegions(_ *ScanOptions) error {
 		m.finishRegion(r)
 	}
 
-	return m.finishRegions()
+	m.sortRegions()
+	m.scanRegionID()
+	m.computeZonesRegion()
+	return nil
 }
 
 func (m *Cluster) setRegionZones(name string, zones ...*Zone) {
@@ -218,12 +221,12 @@ func (m *Cluster) finishRegion(r *Region) {
 	r.Regions = sub
 }
 
-func (m *Cluster) finishRegions() error {
+// revive:disable:cognitive-complexity
+func (m *Cluster) scanRegionID() {
+	// revive:enable:cognitive-complexity
 	var max rings.RegionID
 	var missing bool
 
-	m.sortRegions()
-
 	// check IDs
 	ids := make(map[rings.RegionID]bool)
 	fn := func(r *Region) bool {
@@ -231,7 +234,8 @@ func (m *Cluster) finishRegions() error {
 
 		switch {
 		case !r.IsPrimary():
-			// ignore secondary
+			// secondary, no ID.
+			r.ID = 0
 		case !r.ID.Valid():
 			// primary without ID
 			missing = true
@@ -272,7 +276,35 @@ func (m *Cluster) finishRegions() error {
 
 		m.ForEachRegion(fn)
 	}
-	return nil
+}
+
+func (m *Cluster) computeZonesRegion() {
+	fn := func(r *Region, z *Zone) {
+		if z.region != nil {
+			m.error(nil).
+				WithField("zone", z.Name).
+				WithField("region", []string{
+					z.region.Name,
+					r.Name,
+				}).
+				Print("zone in two regions")
+		} else {
+			z.region = r
+		}
+	}
+
+	m.ForEachRegion(func(r *Region) bool {
+		var term bool
+
+		if r.IsPrimary() {
+			r.ForEachZone(func(z *Zone) bool {
+				fn(r, z)
+				return term
+			})
+		}
+
+		return term
+	})
 }
 
 func (m *Cluster) getRegion(name string) (*Region, bool) {

pkg/cluster/zones.go

@@ -19,6 +19,7 @@ type ZoneIterator interface {
 // affinity.
 type Zone struct {
 	zones  *Cluster
+	region *Region
 	logger `json:"-" yaml:"-"`
 
 	ID      rings.ZoneID