zones: finish scan sorting the content

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

cmd/jpictl/env.go

@@ -1,27 +0,0 @@
-package main
-
-import (
-	"os"
-
-	"github.com/spf13/cobra"
-
-	"git.jpi.io/amery/jpictl/pkg/zones"
-)
-
-// Command
-var envCmd = &cobra.Command{
-	Use:   "env",
-	Short: "generates environment variables for shell scripts",
-	RunE: func(_ *cobra.Command, _ []string) error {
-		m, err := zones.New(cfg.Base, cfg.Domain)
-		if err != nil {
-			return err
-		}
-
-		return m.WriteEnv(os.Stdout)
-	},
-}
-
-func init() {
-	rootCmd.AddCommand(envCmd)
-}

pkg/zones/env.go

@@ -1,9 +0,0 @@
-// Package zones abstracts the cluster zones
-package zones
-
-import "io"
-
-// WriteEnv generates environment variables for shell scripts
-func (*Zones) WriteEnv(io.Writer) error {
-	return nil
-}

pkg/zones/machine.go

@@ -82,3 +82,7 @@ func (m *Machine) getFilename(name string, args ...any) string {
 
 	return filepath.Join(s...)
 }
+
+func (m *Machine) getPeerByName(name string) (*Machine, bool) {
+	return m.zone.zones.GetMachineByName(name)
+}

pkg/zones/machine_rings.go

@@ -45,9 +45,77 @@ func (m *Machine) applyWireguardConfig(ring int, wg *wireguard.Config) error {
 		return err
 	}
 
+	if err := m.applyWireguardInterfaceConfig(ring, wg.Interface); err != nil {
+		err = core.Wrapf(err, "%s: wg%v:%s", m.Name, ring, addr)
+		return err
+	}
+
+	for _, peer := range wg.Peer {
+		if err := m.applyWireguardPeerConfig(ring, peer); err != nil {
+			err = core.Wrapf(err, "%s: wg%v:%s", m.Name, ring, addr)
+			return err
+		}
+	}
+
 	return nil
 }
 
+func (m *Machine) applyRingInfo(ring int, new *RingInfo) error {
+	var cur *RingInfo
+
+	for _, ri := range m.RingAddresses {
+		if ri.Ring == ring {
+			cur = ri
+			break
+		}
+	}
+
+	if cur == nil {
+		// first, append
+		m.RingAddresses = append(m.RingAddresses, new)
+		return nil
+	}
+
+	// extra, merge
+	return cur.Merge(new)
+}
+
+func (m *Machine) applyWireguardInterfaceConfig(ring int, data wireguard.InterfaceConfig) error {
+	ri := &RingInfo{
+		Ring:    ring,
+		Enabled: true,
+		Address: data.Address,
+		Keys: &wireguard.KeyPair{
+			PrivateKey: data.PrivateKey,
+		},
+	}
+
+	return m.applyRingInfo(ring, ri)
+}
+
+func (m *Machine) applyWireguardPeerConfig(ring int, pc wireguard.PeerConfig) error {
+	peer, found := m.getPeerByName(pc.Endpoint.Name())
+	switch {
+	case !found:
+		// unknown
+	case ring == 1 && m.zone != peer.zone:
+		// invalid zone
+	default:
+		// apply RingInfo
+		ri := &RingInfo{
+			Ring:    ring,
+			Enabled: true,
+			Keys: &wireguard.KeyPair{
+				PublicKey: pc.PublicKey,
+			},
+		}
+
+		return peer.applyRingInfo(ring, ri)
+	}
+
+	return fmt.Errorf("%q: invalid peer endpoint", pc.Endpoint.Host)
+}
+
 func (m *Machine) applyZoneNodeID(zoneID, nodeID int) error {
 	switch {
 	case zoneID == 0:

pkg/zones/rings.go

@@ -51,7 +51,6 @@ func (ri *RingInfo) Merge(alter *RingInfo) error {
 		if ri.Keys.PrivateKey.IsZero() {
 			ri.Keys.PrivateKey = alter.Keys.PrivateKey
 		}
-
 		if ri.Keys.PublicKey.IsZero() {
 			ri.Keys.PublicKey = alter.Keys.PublicKey
 		}

pkg/zones/scan.go

@@ -2,9 +2,25 @@ package zones
 
 import (
 	"io/fs"
+	"sort"
 )
 
 func (m *Zones) scan() error {
+	for _, fn := range []func() error{
+		m.scanDirectory,
+		m.scanMachines,
+		m.scanZoneIDs,
+		m.scanSort,
+	} {
+		if err := fn(); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func (m *Zones) scanDirectory() error {
 	// each directory is a zone
 	entries, err := fs.ReadDir(m.dir, ".")
 	if err != nil {
@@ -26,7 +42,7 @@ func (m *Zones) scan() error {
 		}
 	}
 
-	return m.scanMachines()
+	return nil
 }
 
 func (m *Zones) scanMachines() error {
@@ -38,6 +54,67 @@ func (m *Zones) scanMachines() error {
 	return err
 }
 
+func (m *Zones) scanZoneIDs() error {
+	var hasMissing bool
+	var lastZoneID int
+
+	m.ForEachZone(func(z *Zone) bool {
+		switch {
+		case z.ID == 0:
+			hasMissing = true
+		case z.ID > lastZoneID:
+			lastZoneID = z.ID
+		}
+
+		return false
+	})
+
+	if hasMissing {
+		next := lastZoneID + 1
+
+		m.ForEachZone(func(z *Zone) bool {
+			if z.ID == 0 {
+				z.ID, next = next, next+1
+			}
+
+			return false
+		})
+	}
+
+	return nil
+}
+
+func (m *Zones) scanSort() error {
+	sort.SliceStable(m.Zones, func(i, j int) bool {
+		id1 := m.Zones[i].ID
+		id2 := m.Zones[j].ID
+		return id1 < id2
+	})
+
+	m.ForEachZone(func(z *Zone) bool {
+		sort.SliceStable(z.Machines, func(i, j int) bool {
+			id1 := z.Machines[i].ID()
+			id2 := z.Machines[j].ID()
+			return id1 < id2
+		})
+
+		return false
+	})
+
+	m.ForEachMachine(func(p *Machine) bool {
+		sort.SliceStable(p.RingAddresses, func(i, j int) bool {
+			ri1 := p.RingAddresses[i]
+			ri2 := p.RingAddresses[j]
+
+			return ri1.Ring < ri2.Ring
+		})
+
+		return false
+	})
+
+	return nil
+}
+
 func (z *Zone) scan() error {
 	// each directory is a machine
 	entries, err := fs.ReadDir(z.zones.dir, z.Name)