zones: allow iterators to terminate

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/wireguard/config.go

@@ -1,7 +1,6 @@
 package wireguard
 
 import (
-	"encoding/base64"
 	"errors"
 	"fmt"
 	"io"
@@ -32,13 +31,13 @@ func (f *Config) Peers() int {
 // InterfaceConfig represents the [Interface] section
 type InterfaceConfig struct {
 	Address    netip.Addr
-	PrivateKey []byte
+	PrivateKey BinaryKey
 	ListenPort uint16
 }
 
 // PeerConfig represents a [Peer] section
 type PeerConfig struct {
-	PublicKey  []byte
+	PublicKey  BinaryKey
 	Endpoint   EndpointAddress
 	AllowedIPs []netip.Prefix
 }
@@ -129,19 +128,19 @@ type interfaceConfig struct {
 }
 
 func (p interfaceConfig) Export() (InterfaceConfig, error) {
+	var err error
+
 	out := InterfaceConfig{
 		Address:    p.Address,
 		ListenPort: p.ListenPort,
 	}
 
-	b, err := base64.StdEncoding.DecodeString(p.PrivateKey)
+	out.PrivateKey, err = BinaryKeyFromBase64(p.PrivateKey)
 	if err != nil {
 		err = core.Wrap(err, "PrivateKey")
 		return InterfaceConfig{}, err
 	}
 
-	out.PrivateKey = b
-
 	return out, nil
 }
 
@@ -163,8 +162,7 @@ func (v *intermediateConfig) ExportPeer(i int) (PeerConfig, error) {
 	}
 
 	// PublicKey
-	s = v.Peer.PublicKey[i]
+	out.PublicKey, err = BinaryKeyFromBase64(v.Peer.PublicKey[i])
-	out.PublicKey, err = base64.StdEncoding.DecodeString(s)
 	if err != nil {
 		err = core.Wrap(err, "PublicKey")
 		return out, err

pkg/wireguard/keys.go

@@ -1,6 +1,7 @@
 package wireguard
 
 import (
+	"bytes"
 	"encoding/base64"
 )
 
@@ -16,6 +17,11 @@ func (k BinaryKey) IsZero() bool {
 	return len(k) == 0
 }
 
+// Equal checks if two keys are identical
+func (k BinaryKey) Equal(alter BinaryKey) bool {
+	return bytes.Equal(k, alter)
+}
+
 // BinaryKeyFromBase64 decodes a base64-based string into
 // a [BinaryKey]
 func BinaryKeyFromBase64(data string) (BinaryKey, error) {

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

@@ -16,9 +16,10 @@ type Machine struct {
 
 	zone *Zone
 	id   int
-	Name string
+	Name string `toml:"name"`
 
-	PublicAddresses []netip.Addr
+	PublicAddresses []netip.Addr `toml:"public,omitempty"`
+	RingAddresses   []*RingInfo  `toml:"rings,omitempty"`
 }
 
 func (m *Machine) String() string {

pkg/zones/machine_rings.go

@@ -0,0 +1,66 @@
+package zones
+
+import (
+	"bytes"
+	"fmt"
+	"os"
+
+	"darvaza.org/core"
+
+	"git.jpi.io/amery/jpictl/pkg/wireguard"
+)
+
+// GetWireguardConfig reads a wgN.conf file
+func (m *Machine) GetWireguardConfig(ring int) (*wireguard.Config, error) {
+	data, err := m.ReadFile("wg%v.conf", ring)
+	if err != nil {
+		return nil, err
+	}
+
+	r := bytes.NewReader(data)
+	return wireguard.NewConfigFromReader(r)
+}
+
+func (m *Machine) tryApplyWireguardConfig(ring int) error {
+	wg, err := m.GetWireguardConfig(ring)
+	switch {
+	case os.IsNotExist(err):
+		return nil
+	case err != nil:
+		return err
+	default:
+		return m.applyWireguardConfig(ring, wg)
+	}
+}
+
+func (m *Machine) applyWireguardConfig(ring int, wg *wireguard.Config) error {
+	addr := wg.GetAddress()
+	zoneID, nodeID, ok := Rings[ring].Decode(addr)
+	if !ok {
+		return fmt.Errorf("%s: invalid wg%v address: %s", m.Name, ring, addr)
+	}
+
+	if err := m.applyZoneNodeID(zoneID, nodeID); err != nil {
+		err = core.Wrapf(err, "%s: wg%v:%s", m.Name, ring, addr)
+		return err
+	}
+
+	return nil
+}
+
+func (m *Machine) applyZoneNodeID(zoneID, nodeID int) error {
+	switch {
+	case zoneID == 0:
+		return fmt.Errorf("invalid %s", "zoneID")
+	case nodeID == 0:
+		return fmt.Errorf("invalid %s", "nodeID")
+	case m.ID() != nodeID:
+		return fmt.Errorf("invalid %s: %v ≠ %v", "zoneID", m.ID(), nodeID)
+	case m.zone.ID != 0 && m.zone.ID != zoneID:
+		return fmt.Errorf("invalid %s: %v ≠ %v", "zoneID", m.zone.ID, zoneID)
+	case m.zone.ID == 0:
+		m.zone.ID = zoneID
+	}
+
+	return nil
+}

pkg/zones/machine_scan.go

@@ -1,86 +1,11 @@
 package zones
 
 import (
-	"bytes"
 	"context"
-	"fmt"
-	"log"
 	"net/netip"
-	"os"
 	"time"
-
-	"git.jpi.io/amery/jpictl/pkg/wireguard"
 )
 
-// GetWireguardConfig reads a wgN.conf file
-func (m *Machine) GetWireguardConfig(ring int) (*wireguard.Config, error) {
-	data, err := m.ReadFile("wg%v.conf", ring)
-	if err != nil {
-		return nil, err
-	}
-
-	r := bytes.NewReader(data)
-	return wireguard.NewConfigFromReader(r)
-}
-
-func (m *Machine) tryWireguardZeroConfig() error {
-	wg, err := m.GetWireguardConfig(0)
-	switch {
-	case os.IsNotExist(err):
-		return nil
-	case err != nil:
-		return err
-	default:
-		return m.applyWireguardZeroConfig(wg)
-	}
-}
-
-func (m *Machine) applyWireguardZeroConfig(wg *wireguard.Config) error {
-	addr := wg.GetAddress()
-	zoneID, nodeID, ok := ParseRingZeroAddress(addr)
-	if !ok {
-		return fmt.Errorf("%s: invalid %s address: %s", m.Name, "wg1", addr)
-	}
-
-	if err := m.applyZoneNodeID(zoneID, nodeID); err != nil {
-		return err
-	}
-
-	log.Println(m.Name, "wg0", addr, zoneID, nodeID)
-	return nil
-}
-
-func (m *Machine) tryWireguardOneConfig() error {
-	wg, err := m.GetWireguardConfig(1)
-	switch {
-	case os.IsNotExist(err):
-		return nil
-	case err != nil:
-		return err
-	default:
-		return m.applyWireguardOneConfig(wg)
-	}
-}
-
-func (m *Machine) applyWireguardOneConfig(wg *wireguard.Config) error {
-	addr := wg.GetAddress()
-	zoneID, nodeID, ok := ParseRingOneAddress(addr)
-	if !ok {
-		return fmt.Errorf("%s: invalid %s address: %s", m.Name, "wg1", addr)
-	}
-
-	if err := m.applyZoneNodeID(zoneID, nodeID); err != nil {
-		return err
-	}
-
-	log.Println(m.Name, "wg1", addr, zoneID, nodeID)
-	return nil
-}
-
-func (*Machine) applyZoneNodeID(_, _ int) error {
-	return nil
-}
-
 func (m *Machine) lookupNetIP() ([]netip.Addr, error) {
 	timeout := 2 * time.Second
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
@@ -101,12 +26,10 @@ func (m *Machine) updatePublicAddresses() error {
 }
 
 func (m *Machine) scan() error {
-	if err := m.tryWireguardZeroConfig(); err != nil {
+	for i := 0; i < RingsCount; i++ {
-		return err
+		if err := m.tryApplyWireguardConfig(i); err != nil {
-	}
+			return err
-
+		}
-	if err := m.tryWireguardOneConfig(); err != nil {
-		return err
 	}
 
 	return m.updatePublicAddresses()

pkg/zones/rings.go

@@ -18,10 +18,10 @@ const (
 // RingInfo contains represents the Wireguard endpoint details
 // for a Machine on a particular ring
 type RingInfo struct {
-	Ring    int
+	Ring    int                `toml:"ring"`
-	Enabled bool
+	Enabled bool               `toml:"enabled,omitempty"`
-	Keys    *wireguard.KeyPair
+	Keys    *wireguard.KeyPair `toml:"keys,omitempty"`
-	Address netip.Addr
+	Address netip.Addr         `toml:"address,omitempty"`
 }
 
 // RingAddressEncoder provides encoder/decoder access for a particular

pkg/zones/scan.go

@@ -31,10 +31,9 @@ func (m *Zones) scan() error {
 
 func (m *Zones) scanMachines() error {
 	var err error
-	m.ForEachMachine(func(p *Machine) {
+	m.ForEachMachine(func(p *Machine) bool {
-		if err == nil {
+		err = p.scan()
-			err = p.scan()
+		return err != nil
-		}
 	})
 	return err
 }

pkg/zones/zones.go

@@ -32,18 +32,24 @@ type Zones struct {
 }
 
 // ForEachMachine calls a function for each Machine in the cluster
-func (m *Zones) ForEachMachine(fn func(*Machine)) {
+func (m *Zones) ForEachMachine(fn func(*Machine) bool) {
 	for _, z := range m.Zones {
 		for _, p := range z.Machines {
-			fn(p)
+			if fn(p) {
+				// terminate
+				return
+			}
 		}
 	}
 }
 
 // ForEachZone calls a function for each Zone in the cluster
-func (m *Zones) ForEachZone(fn func(*Zone)) {
+func (m *Zones) ForEachZone(fn func(*Zone) bool) {
 	for _, p := range m.Zones {
-		fn(p)
+		if fn(p) {
+			// terminate
+			return
+		}
 	}
 }