Merge pull request 'cluster: fix wg0.conf generator' (#54) from pr-amery-wg0.conf into main

Reviewed-on: #54

go.mod

@@ -4,7 +4,7 @@ go 1.19
 
 require (
 	asciigoat.org/ini v0.2.5
-	darvaza.org/core v0.14.0
+	darvaza.org/core v0.14.2
 	darvaza.org/resolver v0.9.2
 	darvaza.org/sidecar v0.4.0
 	darvaza.org/slog v0.5.7

go.sum

@@ -4,8 +4,8 @@ asciigoat.org/ini v0.2.5 h1:4gRIp9rU+XQt8+HMqZO5R7GavMv9Yl2+N+je6djDIAE=
 asciigoat.org/ini v0.2.5/go.mod h1:gmXzJ9XFqf1NLk5nQkj04USQ4tMtdRJHNQX6vp3DzjU=
 darvaza.org/cache/x/simplelru v0.1.8 h1:rvFucut4wKYbsYc994yR3P0M08NqlsvZxr5G4QK82tw=
 darvaza.org/cache/x/simplelru v0.1.8/go.mod h1:Mv1isOJTcXYK+aK0AvUe+/3KpRTXDsYga6rdTS/upNs=
-darvaza.org/core v0.14.0 h1:DzvPjfob0QuRgLjVkNt3Fq5Wbx9uE/AHVcYVEbGQQk8=
-darvaza.org/core v0.14.0/go.mod h1:C+B0GRNLB+/asGfxjQ9XZERdk7xaFxzt5xTIBPiNm2M=
+darvaza.org/core v0.14.2 h1:6p0iznuGfVGbBp+CnkZTw1b76j6Q/j4ffDztZXrrlK8=
+darvaza.org/core v0.14.2/go.mod h1:C+B0GRNLB+/asGfxjQ9XZERdk7xaFxzt5xTIBPiNm2M=
 darvaza.org/resolver v0.9.2 h1:sUX6LZ1eN5TzJW7L4m7HM+BvwBeWl8dYYDGVSe+AIhk=
 darvaza.org/resolver v0.9.2/go.mod h1:XWqPhrxoOKNzRuSozOwmE1M6QVqQL28jEdxylnIO8Nw=
 darvaza.org/sidecar v0.4.0 h1:wHghxzLsiT82WDBBUf34aTqtOvRBg4UbxVIJgKNXRVA=

pkg/cluster/env.go

@@ -49,11 +49,27 @@ func (m *Env) Zones(r *Region) []rings.ZoneID {
 		return false
 	})
 
-	core.SliceSort(zones, cmpOrdered[rings.ZoneID])
+	core.SliceSortOrdered(zones)
 	return zones
 }
 
-// Regions returns the list of primary regions
+// RegionsNames returns a sorted list of primary regions names
+func (m *Env) RegionsNames() []string {
+	var regions []string
+
+	m.ForEachRegion(func(r *Region) bool {
+		if r.IsPrimary() {
+			regions = append(regions, r.Name)
+		}
+
+		return false
+	})
+
+	core.SliceSortOrdered(regions)
+	return regions
+}
+
+// Regions returns a sorted list of primary regions IDs
 func (m *Env) Regions() (regions []rings.RegionID) {
 	m.ForEachRegion(func(r *Region) bool {
 		if r.IsPrimary() {
@@ -63,7 +79,7 @@ func (m *Env) Regions() (regions []rings.RegionID) {
 		return false
 	})
 
-	core.SliceSort(regions, cmpOrdered[rings.RegionID])
+	core.SliceSortOrdered(regions)
 	return regions
 }
 
@@ -75,18 +91,38 @@ func (m *Env) WriteTo(w io.Writer) (int64, error) {
 		m.writeEnvVar(&buf, m.cephFSID, "FSID")
 	}
 
-	m.writeEnvVar(&buf, genEnvInts(m.Regions()), "REGIONS")
-
-	m.ForEachRegion(func(r *Region) bool {
-		if r.IsPrimary() {
-			m.writeEnvRegion(&buf, r)
-		}
-		return false
+	regions := m.getRegions()
+	ids := core.SliceMap(regions, func(_ []rings.RegionID, r *Region) (out []rings.RegionID) {
+		return append(out, r.ID)
 	})
+	names := core.SliceMap(regions, func(_ []string, r *Region) (out []string) {
+		return append(out, r.Name)
+	})
+
+	m.writeEnvVar(&buf, genEnvInts(ids), "REGIONS")
+	m.writeEnvVar(&buf, genEnvStrings(names), "REGIONS_NAMES")
+
+	for _, r := range regions {
+		m.writeEnvRegion(&buf, r)
+	}
 
 	return buf.WriteTo(w)
 }
 
+func (m *Env) getRegions() (out []*Region) {
+	m.ForEachRegion(func(r *Region) bool {
+		if r.IsPrimary() {
+			out = append(out, r)
+		}
+		return false
+	})
+
+	core.SliceSortFn(out, func(a, b *Region) bool {
+		return a.ID < b.ID
+	})
+
+	return out
+}
 func (m *Env) writeEnvRegion(w io.Writer, r *Region) {
 	regionID := r.ID
 
@@ -106,23 +142,23 @@ func (m *Env) writeEnvZone(w io.Writer, r *Region, z *Zone) {
 	zonePrefix := fmt.Sprintf("REGION%v_ZONE%v", r.ID, z.ID)
 	monPrefix := zonePrefix + "_MON"
 
-	// ZONE{zoneID}
+	// REGION{regionID}_ZONE{zoneID}
 	m.writeEnvVar(w, genEnvZoneNodes(z), zonePrefix)
 
-	// ZONE{zoneID}_NAME
+	// REGION{regionID}_ZONE{zoneID}_NAME
 	m.writeEnvVar(w, z.Name, zonePrefix+"_NAME")
 
-	// ZONE{zoneID}_GW
+	// REGION{regionID}_ZONE{zoneID}_GW
 	gateways, _ := z.GatewayIDs()
 	m.writeEnvVar(w, genEnvInts(gateways), zonePrefix+"_GW")
 
 	// Ceph
 	monitors := z.GetCephMonitors()
-	// MON{zoneID}_NAME
+	// REGION{regionID}_MON{zone_ID}
 	m.writeEnvVar(w, genEnvZoneCephMonNames(monitors), monPrefix)
-	// MON{zoneID}_IP
+	// REGION{regionID}_MON{zone_ID}_IP
 	m.writeEnvVar(w, genEnvZoneCephMonIPs(monitors), monPrefix+"_IP")
-	// MON{zoneID}_ID
+	// REGION{regionID}_MON{zone_ID}_ID
 	m.writeEnvVar(w, genEnvZoneCephMonIDs(monitors), monPrefix+"_ID")
 }
 
@@ -180,13 +216,6 @@ func genEnvZoneNodes(z *Zone) string {
 	return ""
 }
 
-func genEnvZoneRegion(z *Zone) string {
-	if z != nil && z.region != nil {
-		return z.region.Name
-	}
-	return ""
-}
-
 func genEnvZoneCephMonNames(m Machines) string {
 	var buf strings.Builder
 	m.ForEachMachine(func(p *Machine) bool {
@@ -227,14 +256,3 @@ func genEnvZoneCephMonIDs(m Machines) string {
 	})
 	return buf.String()
 }
-
-func cmpOrdered[T core.Ordered](a, b T) int {
-	switch {
-	case a == b:
-		return 0
-	case a < b:
-		return -1
-	default:
-		return 1
-	}
-}

pkg/cluster/rings.go

@@ -202,7 +202,7 @@ func (r *Ring) AddPeer(p *Machine) bool {
 	}
 
 	switch {
-	case r.ID == 0:
+	case r.ID == rings.RingZeroID:
 		r.setRingZeroAllowedIPs(rp)
 	case p.IsGateway():
 		r.setRingOneGatewayAllowedIPs(rp)