zones: Machine.Zone()

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

pkg/wireguard/config.go

@@ -15,19 +15,24 @@ import (
 )
 
 var configTemplate = template.Must(template.New("config").Funcs(template.FuncMap{
-	"StringsJoin": strings.Join,
+	"PrefixJoin": func(a []netip.Prefix, sep string) string {
+		s := make([]string, len(a))
+		for i, p := range a {
+			s[i] = p.String()
+		}
+		return strings.Join(s, sep)
+	},
 }).Parse(`[Interface]
 Address = {{.Interface.Address}}
 PrivateKey = {{.Interface.PrivateKey}}
 ListenPort = {{.Interface.ListenPort}}
-{{range .Peer}}
+{{- range .Peer }}
 
 [Peer]
-# {{.Endpoint.Name}}
 PublicKey = {{.PublicKey}}
 Endpoint = {{.Endpoint}}
-AllowedIPs = {{ StringsJoin .AllowedIPs ", "}}
+AllowedIPs = {{ PrefixJoin .AllowedIPs ", "}}
-{{end}}
+{{- end }}
 `))
 
 // Config represents a wgN.conf file

pkg/zones/env.go

@@ -32,14 +32,11 @@ func (m *Zones) writeEnvZone(w io.Writer, z *Zone) {
 
 	// ZONE{zoneID}_GW
 	gatewayID := getRingZeroGatewayID(z)
-	if gatewayID > 0 {
+	m.writeEnvVar(w, fmt.Sprintf("%v", gatewayID), "ZONE%v_%s", zoneID, "GW")
-		m.writeEnvVar(w, fmt.Sprintf("%v", gatewayID), "ZONE%v_%s", zoneID, "GW")
 
-		// ZONE{zoneID}_IP
+	// ZONE{zoneID}_IP
-		if ip, ok := RingZeroAddress(zoneID, gatewayID); ok {
+	ip, _ := RingZeroAddress(zoneID, gatewayID)
-			m.writeEnvVar(w, ip.String(), "ZONE%v_%s", zoneID, "IP")
+	m.writeEnvVar(w, ip.String(), "ZONE%v_%s", zoneID, "IP")
-		}
-	}
 }
 
 func (m *Zones) writeEnvVarFn(w io.Writer, fn func(*Zones) string, name string, args ...any) {
@@ -82,9 +79,13 @@ func genEnvZoneNodes(z *Zone) string {
 }
 
 func getRingZeroGatewayID(z *Zone) int {
-	var gatewayID int
+	var firstNodeID, gatewayID int
 
 	z.ForEachMachine(func(p *Machine) bool {
+		if firstNodeID == 0 {
+			firstNodeID = p.ID
+		}
+
 		if p.IsGateway() {
 			gatewayID = p.ID
 		}
@@ -92,5 +93,10 @@ func getRingZeroGatewayID(z *Zone) int {
 		return gatewayID != 0
 	})
 
-	return gatewayID
+	switch {
+	case gatewayID == 0:
+		return firstNodeID
+	default:
+		return gatewayID
+	}
 }

pkg/zones/machine.go

@@ -43,22 +43,9 @@ func (m *Machine) IsGateway() bool {
 	return ok
 }
 
-// SetGateway enables/disables a Machine ring0 integration
+// Zone indicates the [Zone] this machine belongs to
-func (m *Machine) SetGateway(enabled bool) error {
+func (m *Machine) Zone() int {
-	ri, found := m.getRingInfo(0)
+	return m.zone.ID
-	switch {
-	case !found && !enabled:
-		return nil
-	case !found:
-		var err error
-
-		if ri, err = m.createRingInfo(0, false); err != nil {
-			return err
-		}
-	}
-
-	ri.Enabled = enabled
-	return m.SyncWireguardConfig(0)
 }
 
 func (m *Machine) getPeerByName(name string) (*Machine, bool) {

pkg/zones/machine_rings.go

@@ -261,54 +261,3 @@ func (m *Machine) RemoveWireguardConfig(ring int) error {
 
 	return err
 }
-
-// SyncWireguardConfig updates all wgN.conf files for the specified
-// ring
-func (m *Machine) SyncWireguardConfig(ring int) error {
-	return m.zone.SyncWireguardConfig(ring)
-}
-
-func (m *Machine) WriteWireguardConfig(ring int) error {
-	r, err := m.zone.GetRing(ring)
-	if err != nil {
-		return err
-	}
-
-	return m.writeWireguardRing(r)
-}
-
-func (m *Machine) writeWireguardRing(r *Ring) error {
-	wg, err := r.ExportConfig(m.ID)
-	if err != nil {
-		return nil
-	}
-
-	f, err := m.CreateTruncFile("wg%v.conf", r.Ring)
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-
-	_, err = wg.WriteTo(f)
-	return err
-}
-
-func (m *Machine) createRingInfo(ring int, enabled bool) (*RingInfo, error) {
-	keys, err := wireguard.NewKeyPair()
-	if err != nil {
-		return nil, err
-	}
-
-	ri := &RingInfo{
-		Ring:    ring,
-		Enabled: enabled,
-		Keys:    keys,
-	}
-
-	err = m.applyRingInfo(ring, ri)
-	if err != nil {
-		return nil, err
-	}
-
-	return ri, nil
-}

pkg/zones/rings.go

@@ -175,7 +175,7 @@ func RingOneAddress(zoneID, nodeID int) (netip.Addr, bool) {
 	case !ValidZoneID(zoneID) || !ValidNodeID(nodeID):
 		return netip.Addr{}, false
 	default:
-		a4 := [4]uint8{10, 0, uint8(zoneID << 4), uint8(nodeID)}
+		a4 := [4]uint8{10, uint8(zoneID << 4), 0, uint8(nodeID)}
 		return netip.AddrFrom4(a4), true
 	}
 }

pkg/zones/scan.go

@@ -11,7 +11,6 @@ func (m *Zones) scan() error {
 		m.scanMachines,
 		m.scanZoneIDs,
 		m.scanSort,
-		m.scanGateways,
 	} {
 		if err := fn(); err != nil {
 			return err
@@ -116,16 +115,6 @@ func (m *Zones) scanSort() error {
 	return nil
 }
 
-func (m *Zones) scanGateways() error {
-	var err error
-
-	m.ForEachZone(func(z *Zone) bool {
-		_, _, err = z.GetGateway()
-		return err != nil
-	})
-	return err
-}
-
 func (z *Zone) scan() error {
 	// each directory is a machine
 	entries, err := fs.ReadDir(z.zones.dir, z.Name)
@@ -150,41 +139,3 @@ func (z *Zone) scan() error {
 
 	return nil
 }
-
-// GetGateway returns the first gateway found, if none
-// files will be created to enable the first [Machine] to
-// be one
-func (z *Zone) GetGateway() (*Machine, bool, error) {
-	var first *Machine
-	var gateway *Machine
-
-	z.zones.ForEachMachine(func(p *Machine) bool {
-		switch {
-		case p.IsGateway():
-			// found
-			gateway = p
-		case first == nil:
-			// remember
-			first = p
-		default:
-			// keep looking
-		}
-
-		return gateway != nil
-	})
-
-	switch {
-	case gateway != nil:
-		// found one
-		return gateway, false, nil
-	case first != nil:
-		// make one
-		if err := first.SetGateway(true); err != nil {
-			return first, false, err
-		}
-		return first, true, nil
-	default:
-		// Zone without nodes?
-		panic("unreachable")
-	}
-}

pkg/zones/sync.go

@@ -18,12 +18,12 @@ func (m *Zones) SyncAllWireguard() error {
 	var err error
 
 	for ring := 0; ring < RingsCount; ring++ {
-		err = m.WriteWireguardKeys(ring)
+		err = m.PruneWireguardConfig(ring)
 		if err != nil {
 			return err
 		}
 
-		err = m.SyncWireguardConfig(ring)
+		err = m.WriteWireguardKeys(ring)
 		if err != nil {
 			return err
 		}

pkg/zones/zone_rings.go

@@ -1,52 +1,33 @@
 package zones
 
-import (
+import "os"
-	"os"
-
-	"git.jpi.io/amery/jpictl/pkg/wireguard"
-)
-
-type Ring struct {
-	Ring int
-}
-
-func (*Ring) ExportConfig(_ int) (*wireguard.Config, error) {
-	return nil, nil
-}
-
-func (*Zone) GetRing(_ int) (*Ring, error) {
-	return &Ring{}, nil
-}
-
-// SyncWireguardConfig updates all wgN.conf files for the specified
-// ring
-func (z *Zone) SyncWireguardConfig(ring int) error {
-	err := z.PruneWireguardConfig(ring)
-	if err != nil {
-		return err
-	}
-
-	r, err := z.GetRing(ring)
-	if err != nil {
-		return err
-	}
-
-	z.ForEachMachine(func(p *Machine) bool {
-		if _, ok := p.getRingInfo(ring); ok {
-			err = p.writeWireguardRing(r)
-		}
-		return err != nil
-	})
-
-	return err
-}
 
 // PruneWireguardConfig removes wgN.conf files of machines with
 // the corresponding ring disabled.
 func (z *Zone) PruneWireguardConfig(ring int) error {
+	return pruneWireguardConfig(z, ring)
+}
+
+// WriteWireguardKeys rewrites all wgN.{key,pub} files on this zone
+func (z *Zone) WriteWireguardKeys(ring int) error {
+	return writeWireguardKeys(z, ring)
+}
+
+// PruneWireguardConfig removes wgN.conf files of machines with
+// the corresponding ring disabled on all zones
+func (m *Zones) PruneWireguardConfig(ring int) error {
+	return pruneWireguardConfig(m, ring)
+}
+
+// WriteWireguardKeys rewrites all wgN.{key,pub} files
+func (m *Zones) WriteWireguardKeys(ring int) error {
+	return writeWireguardKeys(m, ring)
+}
+
+func pruneWireguardConfig(m MachineIterator, ring int) error {
 	var err error
 
-	z.ForEachMachine(func(p *Machine) bool {
+	m.ForEachMachine(func(p *Machine) bool {
 		_, ok := p.getRingInfo(ring)
 		if !ok {
 			err = p.RemoveWireguardConfig(ring)
@@ -57,11 +38,10 @@ func (z *Zone) PruneWireguardConfig(ring int) error {
 	return err
 }
 
-// WriteWireguardKeys rewrites all wgN.{key,pub} files on this zone
+func writeWireguardKeys(m MachineIterator, ring int) error {
-func (z *Zone) WriteWireguardKeys(ring int) error {
 	var err error
 
-	z.ForEachMachine(func(p *Machine) bool {
+	m.ForEachMachine(func(p *Machine) bool {
 		err = p.WriteWireguardKeys(ring)
 		if os.IsNotExist(err) {
 			// ignore
@@ -73,38 +53,3 @@ func (z *Zone) WriteWireguardKeys(ring int) error {
 
 	return err
 }
-
-// PruneWireguardConfig removes wgN.conf files of machines with
-// the corresponding ring disabled on all zones
-func (m *Zones) PruneWireguardConfig(ring int) error {
-	var err error
-
-	m.ForEachZone(func(z *Zone) bool {
-		err = z.PruneWireguardConfig(ring)
-		return err != nil
-	})
-
-	return err
-}
-
-// WriteWireguardKeys rewrites all wgN.{key,pub} files
-func (m *Zones) WriteWireguardKeys(ring int) error {
-	var err error
-
-	m.ForEachZone(func(z *Zone) bool {
-		err = z.WriteWireguardKeys(ring)
-		return err != nil
-	})
-
-	return err
-}
-
-// SyncWireguardConfig updates all wgN.conf files for the specified
-// ring
-func (m *Zones) SyncWireguardConfig(ring int) error {
-	err := m.PruneWireguardConfig(ring)
-	if err != nil {
-		return err
-	}
-
-}

pkg/zones/zones.go

@@ -10,6 +10,16 @@ import (
 	"darvaza.org/resolver"
 )
 
+var (
+	_ MachineIterator = (*Zone)(nil)
+	_ MachineIterator = (*Zones)(nil)
+)
+
+// A MachineIterator is a set of Machines we can iterate on
+type MachineIterator interface {
+	ForEachMachine(func(*Machine) bool)
+}
+
 // Zone represents one zone in a cluster
 type Zone struct {
 	zones *Zones
@@ -34,31 +44,6 @@ func (z *Zone) ForEachMachine(fn func(*Machine) bool) {
 	}
 }
 
-// SetGateway configures a machine to be the zone's ring0 gateway
-func (z *Zone) SetGateway(gatewayID int, enabled bool) error {
-	var err error
-	var found bool
-
-	z.ForEachMachine(func(p *Machine) bool {
-		if p.ID == gatewayID {
-			found = true
-			err = p.SetGateway(enabled)
-
-			return true
-		}
-		return false
-	})
-
-	switch {
-	case err != nil:
-		return err
-	case !found:
-		return fs.ErrNotExist
-	default:
-		return nil
-	}
-}
-
 // Zones represents all zones in a cluster
 type Zones struct {
 	dir      fs.FS