env: export FSID

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

cmd/jpictl/config.go

@@ -17,6 +17,5 @@ var cfg = &Config{
 func (cfg *Config) LoadZones(resolve bool) (*zones.Zones, error) {
 	return zones.New(cfg.Base, cfg.Domain,
 		zones.ResolvePublicAddresses(resolve),
-		zones.WithLogger(log),
 	)
 }

cmd/jpictl/log.go

@@ -7,7 +7,6 @@ import (
 	"darvaza.org/slog"
 )
 
-// TODO: make log level configurable via flags
 var (
 	log = zerolog.New(nil, slog.Debug)
 )

go.mod

@@ -8,7 +8,6 @@ require (
 	darvaza.org/resolver v0.5.4
 	darvaza.org/sidecar v0.0.2
 	darvaza.org/slog v0.5.3
-	darvaza.org/slog/handlers/discard v0.4.5
 	github.com/burntSushi/toml v0.3.1
 	github.com/gofrs/uuid/v5 v5.0.0
 	github.com/hack-pad/hackpadfs v0.2.1

go.sum

@@ -10,8 +10,6 @@ darvaza.org/sidecar v0.0.2 h1:4H8FUxc43kkLjxdShN1CoxLTcoHQsZjDVwm7kt6eIK0=
 darvaza.org/sidecar v0.0.2/go.mod h1:yFC3Qt3j+uS7n9CMpLxwrA68z+FNJhENoenBc9zBJJo=
 darvaza.org/slog v0.5.3 h1:sQzmZXgqRh9oFMKBwEYrEpucLvKJVZxaxa2bHIA6GJ0=
 darvaza.org/slog v0.5.3/go.mod h1:59d+yi+C7gn4pDDuwbbOKawERpdXthFFk1Yc+Sv6XB0=
-darvaza.org/slog/handlers/discard v0.4.5 h1:RRykOItNolHyiUav57lG/GFBL33rcljoa0nWTpY+T0g=
-darvaza.org/slog/handlers/discard v0.4.5/go.mod h1:HYHfISQjMqcPbPoPZ92ib/u7s9JcXvF6OaygpPFwdF8=
 darvaza.org/slog/handlers/filter v0.4.5 h1:CX1bMzldd67e3y3s3Sh4jK8Lyo0WMvTGBB2lD315jhc=
 darvaza.org/slog/handlers/filter v0.4.5/go.mod h1:OuH9rHYg9CIErTJCZliMnFexBfP/HJ9PZ1V1VwSCZ1g=
 darvaza.org/slog/handlers/zerolog v0.4.5 h1:W4cgGORx4wImr+RL96CWSQGTdkZzKX6YHXPSYJvdoB4=

pkg/zones/ceph.go

@@ -17,7 +17,7 @@ func (m *Zones) GetCephFSID() (uuid.UUID, error) {
 		// generate one
 		v, err := uuid.NewV4()
 		if err != nil {
-			return uuid.Nil, err
+			return uuid.Nil, nil
 		}
 		m.CephFSID = v
 	}

pkg/zones/errors.go

@@ -1,16 +0,0 @@
-package zones
-
-import "errors"
-
-var (
-	// ErrInvalidName indicates the name isn't valid
-	ErrInvalidName = errors.New("invalid name")
-
-	// ErrUnknownNode indicates there is a reference to a node
-	// we don't have on the tree
-	ErrUnknownNode = errors.New("node does not exist")
-
-	// ErrInvalidNode indicates the nodes can't be used for
-	// the intended purpose
-	ErrInvalidNode = errors.New("invalid node")
-)

pkg/zones/log.go

@@ -1,49 +0,0 @@
-package zones
-
-import "darvaza.org/slog"
-
-type logger interface {
-	withDebug() (slog.Logger, bool)
-	withInfo() (slog.Logger, bool)
-
-	debug() slog.Logger
-	info() slog.Logger
-	warn(error) slog.Logger
-	error(error) slog.Logger
-}
-
-var (
-	_ logger = (*Zones)(nil)
-)
-
-func (z *Zones) withDebug() (slog.Logger, bool) {
-	return z.debug().WithEnabled()
-}
-
-func (z *Zones) withInfo() (slog.Logger, bool) {
-	return z.debug().WithEnabled()
-}
-
-func (z *Zones) debug() slog.Logger {
-	return z.log.Debug()
-}
-
-func (z *Zones) info() slog.Logger {
-	return z.log.Info()
-}
-
-func (z *Zones) warn(err error) slog.Logger {
-	l := z.log.Warn()
-	if err != nil {
-		l = l.WithField(slog.ErrorFieldName, err)
-	}
-	return l
-}
-
-func (z *Zones) error(err error) slog.Logger {
-	l := z.log.Error()
-	if err != nil {
-		l = l.WithField(slog.ErrorFieldName, err)
-	}
-	return l
-}

pkg/zones/machine.go

@@ -9,9 +9,7 @@ import (
 
 // A Machine is a machine on a Zone
 type Machine struct {
-	zone   *Zone
+	zone *Zone
-	logger `toml:"-" json:"-" yaml:"-"`
-
 	ID   int    `toml:"id"`
 	Name string `toml:"-" json:"-" yaml:"-"`
 

pkg/zones/machine_rings.go

@@ -2,7 +2,6 @@ package zones
 
 import (
 	"bytes"
-	"errors"
 	"fmt"
 	"os"
 
@@ -136,11 +135,7 @@ func (m *Machine) applyWireguardConfig(ring int, wg *wireguard.Config) error {
 	}
 
 	for _, peer := range wg.Peer {
-		err := m.applyWireguardPeerConfig(ring, peer)
+		if err := m.applyWireguardPeerConfig(ring, peer); err != nil {
-		switch {
-		case errors.Is(err, ErrUnknownNode):
-			// ignore unknown peers
-		case err != nil:
 			err = core.Wrapf(err, "%s: wg%v:%s", m.Name, ring, addr)
 			return err
 		}
@@ -188,10 +183,8 @@ func (m *Machine) applyWireguardPeerConfig(ring int, pc wireguard.PeerConfig) er
 	switch {
 	case !found:
 		// unknown
-		return core.Wrap(ErrUnknownNode, pc.Endpoint.Host)
 	case ring == 1 && m.zone != peer.zone:
 		// invalid zone
-		return core.Wrap(ErrInvalidNode, peer.Name)
 	default:
 		// apply RingInfo
 		ri := &RingInfo{
@@ -204,6 +197,8 @@ func (m *Machine) applyWireguardPeerConfig(ring int, pc wireguard.PeerConfig) er
 
 		return peer.applyRingInfo(ring, ri)
 	}
+
+	return fmt.Errorf("%q: invalid peer endpoint", pc.Endpoint.Host)
 }
 
 func (m *Machine) applyZoneNodeID(zoneID, nodeID int) error {

pkg/zones/machine_scan.go

@@ -4,10 +4,7 @@ import (
 	"context"
 	"net/netip"
 	"strconv"
-	"strings"
 	"time"
-
-	"darvaza.org/core"
 )
 
 // LookupNetIP uses the DNS Resolver to get the public addresses associated
@@ -33,32 +30,21 @@ func (m *Machine) UpdatePublicAddresses() error {
 
 func (m *Machine) init() error {
 	if err := m.setID(); err != nil {
-		return core.Wrap(err, m.Name)
+		return err
 	}
 
 	for i := 0; i < RingsCount; i++ {
 		if err := m.tryReadWireguardKeys(i); err != nil {
-			return core.Wrap(err, m.Name)
+			return err
 		}
 	}
-
 	return nil
 }
 
 func (m *Machine) setID() error {
 	zoneName := m.zone.Name
+	suffix := m.Name[len(zoneName)+1:]
 
-	l := len(zoneName)
-	switch {
-	case len(m.Name) < l+2:
-		return ErrInvalidName
-	case !strings.HasPrefix(m.Name, zoneName):
-		return ErrInvalidName
-	case m.Name[l] != '-':
-		return ErrInvalidName
-	}
-
-	suffix := m.Name[l+1:]
 	id, err := strconv.ParseInt(suffix, 10, 8)
 	if err != nil {
 		return err

pkg/zones/options.go

@@ -5,12 +5,10 @@ import (
 	"path/filepath"
 
 	"darvaza.org/resolver"
-	"darvaza.org/slog"
-	"darvaza.org/slog/handlers/discard"
 	"github.com/hack-pad/hackpadfs/os"
 )
 
-// A ScanOption pre-configures the Zones before scanning
+// A ScanOption preconfigures the Zones before scanning
 type ScanOption func(*Zones, *ScanOptions) error
 
 // ScanOptions contains flags used by the initial scan
@@ -19,10 +17,6 @@ type ScanOptions struct {
 	// pre-populate Machine.PublicAddresses during the
 	// initial scan
 	DontResolvePublicAddresses bool
-
-	// Logger specifies the logger to be used. otherwise
-	// the scanner will be mute
-	slog.Logger
 }
 
 // ResolvePublicAddresses instructs the scanner to use
@@ -61,19 +55,6 @@ func WithResolver(h resolver.Resolver) ScanOption {
 	}
 }
 
-// WithLogger specifies what to use for logging
-func WithLogger(log slog.Logger) ScanOption {
-	return func(m *Zones, opt *ScanOptions) error {
-		if log == nil {
-			log = discard.New()
-		}
-
-		opt.Logger = log
-		m.log = log
-		return nil
-	}
-}
-
 func (m *Zones) setDefaults(opt *ScanOptions) error {
 	if m.resolver == nil {
 		h := resolver.NewCloudflareLookuper()
@@ -83,12 +64,6 @@ func (m *Zones) setDefaults(opt *ScanOptions) error {
 		}
 	}
 
-	if opt.Logger == nil {
-		if err := WithLogger(nil)(m, opt); err != nil {
-			return err
-		}
-	}
-
 	return nil
 }
 

pkg/zones/scan.go

@@ -3,8 +3,6 @@ package zones
 import (
 	"io/fs"
 	"sort"
-
-	"darvaza.org/core"
 )
 
 func (m *Zones) scan(opts *ScanOptions) error {
@@ -33,32 +31,22 @@ func (m *Zones) scanDirectory(_ *ScanOptions) error {
 
 	for _, e := range entries {
 		if e.IsDir() {
-			z, err := m.newZone(e.Name())
+			z := &Zone{
-			switch {
+				zones: m,
-			case err != nil:
+				Name:  e.Name(),
-				return core.Wrap(err, e.Name())
-			case z.Machines.Len() > 0:
-				m.Zones = append(m.Zones, z)
 			}
+
+			if err := z.scan(); err != nil {
+				return err
+			}
+
+			m.Zones = append(m.Zones, z)
 		}
 	}
 
 	return nil
 }
 
-func (m *Zones) newZone(name string) (*Zone, error) {
-	z := &Zone{
-		zones:  m,
-		logger: m,
-		Name:   name,
-	}
-
-	if err := z.scan(); err != nil {
-		return nil, err
-	}
-	return z, nil
-}
-
 func (m *Zones) scanMachines(opts *ScanOptions) error {
 	var err error
 	m.ForEachMachine(func(p *Machine) bool {
@@ -144,9 +132,8 @@ func (z *Zone) scan() error {
 	for _, e := range entries {
 		if e.IsDir() {
 			m := &Machine{
-				zone:   z,
+				zone: z,
-				logger: z,
+				Name: e.Name(),
-				Name:   e.Name(),
 			}
 
 			if err := m.init(); err != nil {

pkg/zones/zones.go

@@ -6,7 +6,6 @@ import (
 	"sort"
 
 	"darvaza.org/resolver"
-	"darvaza.org/slog"
 	"github.com/gofrs/uuid/v5"
 )
 
@@ -87,8 +86,7 @@ func FilterMachines(m MachineIterator, cond func(*Machine) bool) (Machines, int)
 
 // Zone represents one zone in a cluster
 type Zone struct {
-	zones  *Zones
+	zones *Zones
-	logger `toml:"-" json:"-" yaml:"-"`
 
 	ID   int    `toml:"id"`
 	Name string `toml:"name"`
@@ -143,7 +141,6 @@ func (z *Zone) GatewayIDs() ([]int, int) {
 // Zones represents all zones in a cluster
 type Zones struct {
 	dir      fs.FS
-	log      slog.Logger
 	resolver resolver.Resolver
 	domain   string