cluster: use rings.ZoneID and rings.NodeID types

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

pkg/cluster/cluster_import.go

@@ -5,9 +5,8 @@ import (
 	"fmt"
 	"os"
 
-	"gopkg.in/yaml.v3"
-
 	"git.jpi.io/amery/jpictl/pkg/rings"
+	"gopkg.in/yaml.v3"
 )
 
 func (m *Cluster) init(opts *ScanOptions) error {

pkg/cluster/cluster_scan.go

@@ -7,7 +7,6 @@ import (
 	"strings"
 
 	"darvaza.org/core"
-
 	"git.jpi.io/amery/jpictl/pkg/rings"
 )
 

pkg/cluster/env.go

@@ -53,7 +53,7 @@ func (m *Env) Regions() []string {
 	var regions []string
 
 	m.ForEachRegion(func(r *Region) bool {
-		if r.IsPrimary() {
+		if r.Cluster != nil {
 			regions = append(regions, r.Name)
 		}
 
@@ -166,7 +166,7 @@ func genEnvZoneRegion(z *Zone) string {
 	var region string
 
 	z.ForEachRegion(func(r *Region) bool {
-		if r.IsPrimary() {
+		if r.Cluster != nil {
 			region = r.Name
 			return true
 		}

pkg/cluster/regions.go

@@ -3,8 +3,6 @@ package cluster
 import (
 	"bytes"
 	"path/filepath"
-
-	"git.jpi.io/amery/jpictl/pkg/rings"
 )
 
 var (
@@ -26,15 +24,8 @@ type Region struct {
 	zones []*Zone
 
 	Name    string
-	ID      rings.RegionID `json:",omitempty" yaml:",omitempty"`
-	Cluster *string        `json:",omitempty" yaml:",omitempty"`
-	Regions []string       `json:",omitempty" yaml:",omitempty"`
-}
-
-// IsPrimary() indicates the region is primary and corresponds
-// to a kubernetes cluster.
-func (r *Region) IsPrimary() bool {
-	return r != nil && r.Cluster != nil
+	Cluster *string  `json:",omitempty" yaml:",omitempty"`
+	Regions []string `json:",omitempty" yaml:",omitempty"`
 }
 
 // ForEachRegion calls a function for each Region of the cluster
@@ -100,7 +91,8 @@ func (m *Cluster) initRegions(_ *ScanOptions) error {
 		m.finishRegion(r)
 	}
 
-	return m.finishRegions()
+	m.sortRegions()
+	return nil
 }
 
 func (m *Cluster) setRegionZones(name string, zones ...*Zone) {
@@ -218,63 +210,6 @@ func (m *Cluster) finishRegion(r *Region) {
 	r.Regions = sub
 }
 
-func (m *Cluster) finishRegions() error {
-	var max rings.RegionID
-	var missing bool
-
-	m.sortRegions()
-
-	// check IDs
-	ids := make(map[rings.RegionID]bool)
-	fn := func(r *Region) bool {
-		var term bool
-
-		switch {
-		case !r.IsPrimary():
-			// ignore secondary
-		case !r.ID.Valid():
-			// primary without ID
-			missing = true
-		case ids[r.ID]:
-			// duplicate
-			m.error(nil).WithField("region", r.Name).Print("duplicate ID")
-			missing = true
-			r.ID = 0
-		default:
-			ids[r.ID] = true
-
-			if r.ID > max {
-				max = r.ID
-			}
-		}
-
-		return term
-	}
-	m.ForEachRegion(fn)
-
-	if missing {
-		// assign missing IDs
-		fn := func(r *Region) bool {
-			var term bool
-
-			switch {
-			case !r.IsPrimary():
-				// ignore secondary
-			case r.ID.Valid():
-				// already has an ID
-			default:
-				r.ID = max + 1
-				max = r.ID
-			}
-
-			return term
-		}
-
-		m.ForEachRegion(fn)
-	}
-	return nil
-}
-
 func (m *Cluster) getRegion(name string) (*Region, bool) {
 	for i := range m.Regions {
 		r := &m.Regions[i]