Merge pull request #50

Reviewed-on: #50

go.mod

@@ -4,7 +4,7 @@ go 1.19
 
 require (
 	asciigoat.org/ini v0.2.5
-	darvaza.org/core v0.13.3
+	darvaza.org/core v0.13.1
 	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.13.3 h1:DOsidY49WXsWiJulOIxDq578h/3ekgx0trWxbvgv5bc=
-darvaza.org/core v0.13.3/go.mod h1:47Ydh67KnzjLNu1mzX3r2zpphbxQqEaihMsUq5GflQ4=
+darvaza.org/core v0.13.1 h1:ZoAfZ3OLnw+t28qMQQxXrDIkETmT2h5gAO6F1XuBpwg=
+darvaza.org/core v0.13.1/go.mod h1:47Ydh67KnzjLNu1mzX3r2zpphbxQqEaihMsUq5GflQ4=
 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/errors.go

@@ -1,13 +1,6 @@
 package cluster
 
-import (
-	"errors"
-	"io/fs"
-
-	"darvaza.org/core"
-
-	"git.jpi.io/amery/jpictl/pkg/rings"
-)
+import "errors"
 
 var (
 	// ErrInvalidName indicates the name isn't valid
@@ -21,9 +14,3 @@ var (
 	// the intended purpose
 	ErrInvalidNode = errors.New("invalid node")
 )
-
-// ErrInvalidRing returns an error indicating the [rings.RingID]
-// can't be used for the intended purpose
-func ErrInvalidRing(ringID rings.RingID) error {
-	return core.QuietWrap(fs.ErrInvalid, "invalid ring %v", ringID)
-}

pkg/cluster/machine_rings.go

@@ -13,22 +13,14 @@ import (
 )
 
 // GetWireguardKeys reads a wgN.key/wgN.pub files
-func (m *Machine) GetWireguardKeys(ringID rings.RingID) (wireguard.KeyPair, error) {
+func (m *Machine) GetWireguardKeys(ring int) (wireguard.KeyPair, error) {
 	var (
 		data []byte
 		err  error
 		out  wireguard.KeyPair
 	)
 
-	ring, err := AsWireguardInterfaceID(ringID)
-	if err != nil {
-		// invalid ring
-		return out, err
-	}
-
-	keyFile, pubFile, _ := ring.Files()
-
-	data, err = m.ReadFile(keyFile)
+	data, err = m.ReadFile("wg%v.key", ring)
 	if err != nil {
 		// failed to read
 		return out, err
@@ -37,11 +29,11 @@ func (m *Machine) GetWireguardKeys(ringID rings.RingID) (wireguard.KeyPair, erro
 	out.PrivateKey, err = wireguard.PrivateKeyFromBase64(string(data))
 	if err != nil {
 		// bad key
-		err = core.Wrap(err, keyFile)
+		err = core.Wrap(err, "wg%v.key", ring)
 		return out, err
 	}
 
-	data, err = m.ReadFile(pubFile)
+	data, err = m.ReadFile("wg%v.pub", ring)
 	switch {
 	case os.IsNotExist(err):
 		// no wgN.pub is fine
@@ -53,7 +45,7 @@ func (m *Machine) GetWireguardKeys(ringID rings.RingID) (wireguard.KeyPair, erro
 		out.PublicKey, err = wireguard.PublicKeyFromBase64(string(data))
 		if err != nil {
 			// bad key
-			err = core.Wrap(err, pubFile)
+			err = core.Wrap(err, "wg%v.pub", ring)
 			return out, err
 		}
 	}
@@ -62,8 +54,8 @@ func (m *Machine) GetWireguardKeys(ringID rings.RingID) (wireguard.KeyPair, erro
 	return out, err
 }
 
-func (m *Machine) tryReadWireguardKeys(ringID rings.RingID) error {
-	kp, err := m.GetWireguardKeys(ringID)
+func (m *Machine) tryReadWireguardKeys(ring int) error {
+	kp, err := m.GetWireguardKeys(ring)
 	switch {
 	case os.IsNotExist(err):
 		// ignore
@@ -74,25 +66,20 @@ func (m *Machine) tryReadWireguardKeys(ringID rings.RingID) error {
 	default:
 		// import keys
 		ri := &RingInfo{
-			Ring: MustWireguardInterfaceID(ringID),
+			Ring: ring,
 			Keys: kp,
 		}
 
-		return m.applyRingInfo(ringID, ri)
+		return m.applyRingInfo(ring, ri)
 	}
 }
 
 // RemoveWireguardKeys deletes wgN.key and wgN.pub from
 // the machine's config directory
-func (m *Machine) RemoveWireguardKeys(ringID rings.RingID) error {
-	ring, err := AsWireguardInterfaceID(ringID)
-	if err != nil {
-		return err
-	}
+func (m *Machine) RemoveWireguardKeys(ring int) error {
+	var err error
 
-	keyFile, pubFile, _ := ring.Files()
-
-	err = m.RemoveFile(pubFile)
+	err = m.RemoveFile("wg%v.pub", ring)
 	switch {
 	case os.IsNotExist(err):
 		// ignore
@@ -100,7 +87,7 @@ func (m *Machine) RemoveWireguardKeys(ringID rings.RingID) error {
 		return err
 	}
 
-	err = m.RemoveFile(keyFile)
+	err = m.RemoveFile("wg%v.key", ring)
 	if os.IsNotExist(err) {
 		// ignore
 		err = nil
@@ -110,13 +97,8 @@ func (m *Machine) RemoveWireguardKeys(ringID rings.RingID) error {
 }
 
 // GetWireguardConfig reads a wgN.conf file
-func (m *Machine) GetWireguardConfig(ringID rings.RingID) (*wireguard.Config, error) {
-	ring, err := AsWireguardInterfaceID(ringID)
-	if err != nil {
-		return nil, err
-	}
-
-	data, err := m.ReadFile(ring.ConfFile())
+func (m *Machine) GetWireguardConfig(ring int) (*wireguard.Config, error) {
+	data, err := m.ReadFile("wg%v.conf", ring)
 	if err != nil {
 		return nil, err
 	}
@@ -125,7 +107,7 @@ func (m *Machine) GetWireguardConfig(ringID rings.RingID) (*wireguard.Config, er
 	return wireguard.NewConfigFromReader(r)
 }
 
-func (m *Machine) tryApplyWireguardConfig(ring rings.RingID) error {
+func (m *Machine) tryApplyWireguardConfig(ring int) error {
 	wg, err := m.GetWireguardConfig(ring)
 	switch {
 	case os.IsNotExist(err):
@@ -137,7 +119,7 @@ func (m *Machine) tryApplyWireguardConfig(ring rings.RingID) error {
 	}
 }
 
-func (m *Machine) applyWireguardConfigNode(ring rings.RingID, wg *wireguard.Config) error {
+func (m *Machine) applyWireguardConfigNode(ring int, wg *wireguard.Config) error {
 	addr := wg.GetAddress()
 	if !core.IsZero(addr) {
 		zoneID, nodeID, ok := Rings[ring].Decode(addr)
@@ -157,7 +139,7 @@ func (m *Machine) applyWireguardConfigNode(ring rings.RingID, wg *wireguard.Conf
 	return nil
 }
 
-func (m *Machine) applyWireguardConfig(ring rings.RingID, wg *wireguard.Config) error {
+func (m *Machine) applyWireguardConfig(ring int, wg *wireguard.Config) error {
 	if err := m.applyWireguardConfigNode(ring, wg); err != nil {
 		return err
 	}
@@ -181,9 +163,9 @@ func (m *Machine) applyWireguardConfig(ring rings.RingID, wg *wireguard.Config)
 	return nil
 }
 
-func (m *Machine) getRingInfo(ring rings.RingID) (*RingInfo, bool) {
+func (m *Machine) getRingInfo(ring int) (*RingInfo, bool) {
 	for _, ri := range m.Rings {
-		if ri.RingID() == ring {
+		if ri.Ring == ring {
 			return ri, ri.Enabled
 		}
 	}
@@ -191,7 +173,7 @@ func (m *Machine) getRingInfo(ring rings.RingID) (*RingInfo, bool) {
 	return nil, false
 }
 
-func (m *Machine) applyRingInfo(ring rings.RingID, new *RingInfo) error {
+func (m *Machine) applyRingInfo(ring int, new *RingInfo) error {
 	cur, _ := m.getRingInfo(ring)
 	if cur == nil {
 		// first, append
@@ -207,11 +189,9 @@ func (m *Machine) applyRingInfo(ring rings.RingID, new *RingInfo) error {
 	return cur.Merge(new)
 }
 
-func (m *Machine) applyWireguardInterfaceConfig(ring rings.RingID,
-	data wireguard.InterfaceConfig) error {
-	//
+func (m *Machine) applyWireguardInterfaceConfig(ring int, data wireguard.InterfaceConfig) error {
 	ri := &RingInfo{
-		Ring:    MustWireguardInterfaceID(ring),
+		Ring:    ring,
 		Enabled: true,
 		Keys: wireguard.KeyPair{
 			PrivateKey: data.PrivateKey,
@@ -221,7 +201,7 @@ func (m *Machine) applyWireguardInterfaceConfig(ring rings.RingID,
 	return m.applyRingInfo(ring, ri)
 }
 
-func (m *Machine) applyWireguardPeerConfig(ring rings.RingID, pc wireguard.PeerConfig) error {
+func (m *Machine) applyWireguardPeerConfig(ring int, pc wireguard.PeerConfig) error {
 	peer, found := m.getPeerByName(pc.Endpoint.Name())
 	switch {
 	case !found:
@@ -233,7 +213,7 @@ func (m *Machine) applyWireguardPeerConfig(ring rings.RingID, pc wireguard.PeerC
 	default:
 		// apply RingInfo
 		ri := &RingInfo{
-			Ring:    MustWireguardInterfaceID(ring),
+			Ring:    ring,
 			Enabled: true,
 			Keys: wireguard.KeyPair{
 				PublicKey: pc.PublicKey,
@@ -266,7 +246,7 @@ func (m *Machine) setRingDefaults(ri *RingInfo) error {
 		m.info().
 			WithField("subsystem", "wireguard").
 			WithField("node", m.Name).
-			WithField("ring", ri.Ring.RingID()).
+			WithField("ring", ri.Ring).
 			Print("generating key pair")
 
 		kp, err := wireguard.NewKeyPair()
@@ -280,13 +260,8 @@ func (m *Machine) setRingDefaults(ri *RingInfo) error {
 
 // RemoveWireguardConfig deletes wgN.conf from the machine's
 // config directory.
-func (m *Machine) RemoveWireguardConfig(ringID rings.RingID) error {
-	ring, err := AsWireguardInterfaceID(ringID)
-	if err != nil {
-		return err
-	}
-
-	err = m.RemoveFile(ring.ConfFile())
+func (m *Machine) RemoveWireguardConfig(ring int) error {
+	err := m.RemoveFile("wg%v.conf", ring)
 	if os.IsNotExist(err) {
 		err = nil
 	}
@@ -294,12 +269,7 @@ func (m *Machine) RemoveWireguardConfig(ringID rings.RingID) error {
 	return err
 }
 
-func (m *Machine) createRingInfo(ringID rings.RingID, enabled bool) (*RingInfo, error) {
-	ring, err := AsWireguardInterfaceID(ringID)
-	if err != nil {
-		return nil, err
-	}
-
+func (m *Machine) createRingInfo(ring int, enabled bool) (*RingInfo, error) {
 	keys, err := wireguard.NewKeyPair()
 	if err != nil {
 		return nil, err
@@ -311,7 +281,7 @@ func (m *Machine) createRingInfo(ringID rings.RingID, enabled bool) (*RingInfo,
 		Keys:    keys,
 	}
 
-	err = m.applyRingInfo(ringID, ri)
+	err = m.applyRingInfo(ring, ri)
 	if err != nil {
 		return nil, err
 	}

pkg/cluster/machine_scan.go

@@ -9,7 +9,6 @@ import (
 	"time"
 
 	"darvaza.org/core"
-
 	"git.jpi.io/amery/jpictl/pkg/rings"
 )
 
@@ -39,8 +38,8 @@ func (m *Machine) init() error {
 		return core.Wrap(err, m.Name)
 	}
 
-	for _, ring := range Rings {
-		if err := m.tryReadWireguardKeys(ring.ID); err != nil {
+	for i := 0; i < RingsCount; i++ {
+		if err := m.tryReadWireguardKeys(i); err != nil {
 			return core.Wrap(err, m.Name)
 		}
 	}
@@ -73,12 +72,12 @@ func (m *Machine) setID() error {
 
 // scan is called once we know about all zones and machine names
 func (m *Machine) scan(_ *ScanOptions) error {
-	for _, ring := range Rings {
-		if err := m.tryApplyWireguardConfig(ring.ID); err != nil {
+	for i := 0; i < RingsCount; i++ {
+		if err := m.tryApplyWireguardConfig(i); err != nil {
 			m.error(err).
 				WithField("subsystem", "wireguard").
 				WithField("node", m.Name).
-				WithField("ring", ring.ID).
+				WithField("ring", i).
 				Print()
 			return err
 		}

pkg/cluster/rings.go

@@ -4,86 +4,28 @@ import (
 	"fmt"
 	"io/fs"
 	"net/netip"
-	"strconv"
 
 	"git.jpi.io/amery/jpictl/pkg/rings"
 	"git.jpi.io/amery/jpictl/pkg/wireguard"
 )
 
 const (
+	// RingsCount indicates how many wireguard rings we have
+	RingsCount = 2
 	// RingZeroPort is the port wireguard uses for ring0
 	RingZeroPort = 51800
 	// RingOnePort is the port wireguard uses for ring1
 	RingOnePort = 51810
 )
 
-// WireguardInterfaceID represents the number in the `wg%v`
-// interface name.
-type WireguardInterfaceID uint
-
-// AsWireguardInterfaceID returns the [WireguardInterfaceID] for
-// a valid [rings.RingID].
-func AsWireguardInterfaceID(ring rings.RingID) (WireguardInterfaceID, error) {
-	switch ring {
-	case rings.RingZeroID:
-		return 0, nil
-	case rings.RingOneID:
-		return 1, nil
-	default:
-		return 0, ErrInvalidRing(ring)
-	}
-}
-
-// MustWireguardInterfaceID returns the [WireguardInterfaceID] for
-// a valid [rings.RingID], and panics if it's not.
-func MustWireguardInterfaceID(ring rings.RingID) WireguardInterfaceID {
-	id, err := AsWireguardInterfaceID(ring)
-	if err != nil {
-		panic(err)
-	}
-	return id
-}
-
-// RingID tells the [rings.RingID] of the [WireguardInterfaceID].
-func (wi WireguardInterfaceID) RingID() rings.RingID {
-	return rings.RingID(wi + 1)
-}
-
-// PubFile returns "wgN.pub"
-func (wi WireguardInterfaceID) PubFile() string {
-	return fmt.Sprintf("wg%v.pub", wi)
-}
-
-// KeyFile returns "wgN.key"
-func (wi WireguardInterfaceID) KeyFile() string {
-	return fmt.Sprintf("wg%v.key", wi)
-}
-
-// ConfFile returns "wgN.conf"
-func (wi WireguardInterfaceID) ConfFile() string {
-	return fmt.Sprintf("wg%v.conf", wi)
-}
-
-// Files returns all wgN.ext file names.
-func (wi WireguardInterfaceID) Files() (keyFile, pubFile, confFile string) {
-	prefix := "wg" + strconv.Itoa(int(wi))
-
-	return prefix + ".key", prefix + ".pub", prefix + ".conf"
-}
-
 // RingInfo contains represents the Wireguard endpoint details
 // for a Machine on a particular ring
 type RingInfo struct {
-	Ring    WireguardInterfaceID
+	Ring    int
 	Enabled bool
 	Keys    wireguard.KeyPair
 }
 
-// RingID returns the [rings.RingID] for this [RingInfo].
-func (ri *RingInfo) RingID() rings.RingID {
-	return rings.RingID(ri.Ring + 1)
-}
-
 // Merge attempts to combine two RingInfo structs
 func (ri *RingInfo) Merge(alter *RingInfo) error {
 	switch {
@@ -109,7 +51,7 @@ func (ri *RingInfo) unsafeMerge(alter *RingInfo) error {
 		ri.Enabled = true
 	}
 
-	// fill the gaps on our key pair
+	// fill the gaps on our keypair
 	if ri.Keys.PrivateKey.IsZero() {
 		ri.Keys.PrivateKey = alter.Keys.PrivateKey
 	}
@@ -134,7 +76,7 @@ func canMergeKeyPairs(p1, p2 wireguard.KeyPair) bool {
 // RingAddressEncoder provides encoder/decoder access for a particular
 // Wireguard ring
 type RingAddressEncoder struct {
-	ID     rings.RingID
+	ID     int
 	Port   uint16
 	Encode func(zoneID rings.ZoneID, nodeID rings.NodeID) (netip.Addr, bool)
 	Decode func(addr netip.Addr) (zoneID rings.ZoneID, nodeID rings.NodeID, ok bool)
@@ -143,20 +85,20 @@ type RingAddressEncoder struct {
 var (
 	// RingZero is a wg0 address encoder/decoder
 	RingZero = RingAddressEncoder{
-		ID:     rings.RingZeroID,
+		ID:     0,
 		Port:   RingZeroPort,
 		Decode: ParseRingZeroAddress,
 		Encode: RingZeroAddress,
 	}
 	// RingOne is a wg1 address encoder/decoder
 	RingOne = RingAddressEncoder{
-		ID:     rings.RingOneID,
+		ID:     1,
 		Port:   RingOnePort,
 		Decode: ParseRingOneAddress,
 		Encode: RingOneAddress,
 	}
 	// Rings provides indexed access to the ring address encoders
-	Rings = []RingAddressEncoder{
+	Rings = [RingsCount]RingAddressEncoder{
 		RingZero,
 		RingOne,
 	}
@@ -381,20 +323,10 @@ func (rp *RingPeer) AllowCIDR(addr netip.Addr, bits int) {
 }
 
 // NewRing composes a new Ring for Wireguard setup
-func NewRing(z ZoneIterator, m MachineIterator, ringID rings.RingID) (*Ring, error) {
-	var r *Ring
-	for _, ring := range Rings {
-		if ringID == ring.ID {
-			r = &Ring{
-				RingAddressEncoder: ring,
-				ZoneIterator:       z,
-			}
-			break
-		}
-	}
-
-	if r == nil {
-		return nil, ErrInvalidRing(ringID)
+func NewRing(z ZoneIterator, m MachineIterator, ring int) (*Ring, error) {
+	r := &Ring{
+		RingAddressEncoder: Rings[ring],
+		ZoneIterator:       z,
 	}
 
 	m.ForEachMachine(func(p *Machine) bool {

pkg/cluster/sync.go

@@ -35,13 +35,13 @@ func (m *Cluster) SyncMkdirAll() error {
 func (m *Cluster) SyncAllWireguard() error {
 	var err error
 
-	for _, ring := range Rings {
-		err = m.WriteWireguardKeys(ring.ID)
+	for ring := 0; ring < RingsCount; ring++ {
+		err = m.WriteWireguardKeys(ring)
 		if err != nil {
 			return err
 		}
 
-		err = m.SyncWireguardConfig(ring.ID)
+		err = m.SyncWireguardConfig(ring)
 		if err != nil {
 			return err
 		}

pkg/cluster/wireguard.go

@@ -3,8 +3,6 @@ package cluster
 import (
 	"io/fs"
 	"os"
-
-	"git.jpi.io/amery/jpictl/pkg/rings"
 )
 
 var (
@@ -28,22 +26,22 @@ var (
 // A WireguardConfigPruner deletes wgN.conf on all machines under
 // its scope with the specified ring disabled
 type WireguardConfigPruner interface {
-	PruneWireguardConfig(ring rings.RingID) error
+	PruneWireguardConfig(ring int) error
 }
 
 // PruneWireguardConfig removes wgN.conf files of machines with
 // the corresponding ring disabled on all zones
-func (m *Cluster) PruneWireguardConfig(ring rings.RingID) error {
+func (m *Cluster) PruneWireguardConfig(ring int) error {
 	return pruneWireguardConfig(m, ring)
 }
 
 // PruneWireguardConfig removes wgN.conf files of machines with
 // the corresponding ring disabled.
-func (z *Zone) PruneWireguardConfig(ring rings.RingID) error {
+func (z *Zone) PruneWireguardConfig(ring int) error {
 	return pruneWireguardConfig(z, ring)
 }
 
-func pruneWireguardConfig(m MachineIterator, ring rings.RingID) error {
+func pruneWireguardConfig(m MachineIterator, ring int) error {
 	var err error
 
 	m.ForEachMachine(func(p *Machine) bool {
@@ -61,10 +59,10 @@ func pruneWireguardConfig(m MachineIterator, ring rings.RingID) error {
 
 // PruneWireguardConfig deletes the wgN.conf file if its
 // presence on the ring is disabled
-func (m *Machine) PruneWireguardConfig(ringID rings.RingID) error {
-	_, ok := m.getRingInfo(ringID)
+func (m *Machine) PruneWireguardConfig(ring int) error {
+	_, ok := m.getRingInfo(ring)
 	if !ok {
-		return m.RemoveWireguardConfig(ringID)
+		return m.RemoveWireguardConfig(ring)
 	}
 
 	return nil
@@ -73,16 +71,16 @@ func (m *Machine) PruneWireguardConfig(ringID rings.RingID) error {
 // A WireguardConfigWriter rewrites all wgN.conf on all machines under
 // its scope attached to that ring
 type WireguardConfigWriter interface {
-	WriteWireguardConfig(ring rings.RingID) error
+	WriteWireguardConfig(ring int) error
 }
 
 // WriteWireguardConfig rewrites all wgN.conf on all machines
 // attached to that ring
-func (m *Cluster) WriteWireguardConfig(ring rings.RingID) error {
+func (m *Cluster) WriteWireguardConfig(ring int) error {
 	switch ring {
-	case rings.RingZeroID:
+	case 0:
 		return writeWireguardConfig(m, m, ring)
-	case rings.RingOneID:
+	case 1:
 		var err error
 		m.ForEachZone(func(z *Zone) bool {
 			err = writeWireguardConfig(m, z, ring)
@@ -90,24 +88,24 @@ func (m *Cluster) WriteWireguardConfig(ring rings.RingID) error {
 		})
 		return err
 	default:
-		return ErrInvalidRing(ring)
+		return fs.ErrInvalid
 	}
 }
 
 // WriteWireguardConfig rewrites all wgN.conf on all machines
 // on the Zone attached to that ring
-func (z *Zone) WriteWireguardConfig(ring rings.RingID) error {
+func (z *Zone) WriteWireguardConfig(ring int) error {
 	switch ring {
-	case rings.RingZeroID:
+	case 0:
 		return writeWireguardConfig(z.zones, z.zones, ring)
-	case rings.RingOneID:
+	case 1:
 		return writeWireguardConfig(z.zones, z, ring)
 	default:
-		return ErrInvalidRing(ring)
+		return fs.ErrInvalid
 	}
 }
 
-func writeWireguardConfig(z ZoneIterator, m MachineIterator, ring rings.RingID) error {
+func writeWireguardConfig(z ZoneIterator, m MachineIterator, ring int) error {
 	r, err := NewRing(z, m, ring)
 	if err != nil {
 		return err
@@ -123,7 +121,7 @@ func writeWireguardConfig(z ZoneIterator, m MachineIterator, ring rings.RingID)
 
 // WriteWireguardConfig rewrites the wgN.conf file of this Machine
 // if enabled
-func (m *Machine) WriteWireguardConfig(ring rings.RingID) error {
+func (m *Machine) WriteWireguardConfig(ring int) error {
 	r, err := NewRing(m.zone.zones, m.zone, ring)
 	if err != nil {
 		return err
@@ -133,17 +131,12 @@ func (m *Machine) WriteWireguardConfig(ring rings.RingID) error {
 }
 
 func (m *Machine) writeWireguardRingConfig(r *Ring) error {
-	ring, err := AsWireguardInterfaceID(r.ID)
-	if err != nil {
-		return err
-	}
-
 	wg, err := r.ExportConfig(m)
 	if err != nil {
 		return nil
 	}
 
-	f, err := m.CreateTruncFile(ring.ConfFile())
+	f, err := m.CreateTruncFile("wg%v.conf", r.ID)
 	if err != nil {
 		return err
 	}
@@ -156,16 +149,16 @@ func (m *Machine) writeWireguardRingConfig(r *Ring) error {
 // A WireguardConfigSyncer updates all wgN.conf on all machines under
 // its scope reflecting the state of the ring
 type WireguardConfigSyncer interface {
-	SyncWireguardConfig(ring rings.RingID) error
+	SyncWireguardConfig(ring int) error
 }
 
 // SyncWireguardConfig updates all wgN.conf files for the specified
 // ring
-func (m *Cluster) SyncWireguardConfig(ring rings.RingID) error {
+func (m *Cluster) SyncWireguardConfig(ring int) error {
 	switch ring {
-	case rings.RingZeroID:
+	case 0:
 		return syncWireguardConfig(m, m, ring)
-	case rings.RingOneID:
+	case 1:
 		var err error
 		m.ForEachZone(func(z *Zone) bool {
 			err = syncWireguardConfig(m, z, ring)
@@ -173,24 +166,24 @@ func (m *Cluster) SyncWireguardConfig(ring rings.RingID) error {
 		})
 		return err
 	default:
-		return ErrInvalidRing(ring)
+		return fs.ErrInvalid
 	}
 }
 
 // SyncWireguardConfig updates all wgN.conf files for the specified
 // ring
-func (z *Zone) SyncWireguardConfig(ring rings.RingID) error {
+func (z *Zone) SyncWireguardConfig(ring int) error {
 	switch ring {
-	case rings.RingZeroID:
+	case 0:
 		return syncWireguardConfig(z.zones, z.zones, ring)
-	case rings.RingOneID:
+	case 1:
 		return syncWireguardConfig(z.zones, z, ring)
 	default:
-		return ErrInvalidRing(ring)
+		return fs.ErrInvalid
 	}
 }
 
-func syncWireguardConfig(z ZoneIterator, m MachineIterator, ring rings.RingID) error {
+func syncWireguardConfig(z ZoneIterator, m MachineIterator, ring int) error {
 	r, err := NewRing(z, m, ring)
 	if err != nil {
 		return err
@@ -210,27 +203,27 @@ func syncWireguardConfig(z ZoneIterator, m MachineIterator, ring rings.RingID) e
 
 // SyncWireguardConfig updates all wgN.conf files for the specified
 // ring
-func (m *Machine) SyncWireguardConfig(ring rings.RingID) error {
+func (m *Machine) SyncWireguardConfig(ring int) error {
 	return m.zone.SyncWireguardConfig(ring)
 }
 
 // A WireguardKeysWriter writes the Wireguard Keys for all machines
 // under its scope for the specified ring
 type WireguardKeysWriter interface {
-	WriteWireguardKeys(ring rings.RingID) error
+	WriteWireguardKeys(ring int) error
 }
 
 // WriteWireguardKeys rewrites all wgN.{key,pub} files
-func (m *Cluster) WriteWireguardKeys(ring rings.RingID) error {
+func (m *Cluster) WriteWireguardKeys(ring int) error {
 	return writeWireguardKeys(m, ring)
 }
 
 // WriteWireguardKeys rewrites all wgN.{key,pub} files on this zone
-func (z *Zone) WriteWireguardKeys(ring rings.RingID) error {
+func (z *Zone) WriteWireguardKeys(ring int) error {
 	return writeWireguardKeys(z, ring)
 }
 
-func writeWireguardKeys(m MachineIterator, ring rings.RingID) error {
+func writeWireguardKeys(m MachineIterator, ring int) error {
 	var err error
 
 	m.ForEachMachine(func(p *Machine) bool {
@@ -247,12 +240,12 @@ func writeWireguardKeys(m MachineIterator, ring rings.RingID) error {
 }
 
 // WriteWireguardKeys writes the wgN.key/wgN.pub files
-func (m *Machine) WriteWireguardKeys(ringID rings.RingID) error {
+func (m *Machine) WriteWireguardKeys(ring int) error {
 	var err error
 	var key, pub string
 	var ri *RingInfo
 
-	ri, _ = m.getRingInfo(ringID)
+	ri, _ = m.getRingInfo(ring)
 	if ri != nil {
 		key = ri.Keys.PrivateKey.String()
 		pub = ri.Keys.PublicKey.String()
@@ -265,13 +258,12 @@ func (m *Machine) WriteWireguardKeys(ringID rings.RingID) error {
 		pub = ri.Keys.PrivateKey.Public().String()
 	}
 
-	keyFile, pubFile, _ := ri.Ring.Files()
-	err = m.WriteStringFile(key+"\n", keyFile)
+	err = m.WriteStringFile(key+"\n", "wg%v.key", ring)
 	if err != nil {
 		return err
 	}
 
-	err = m.WriteStringFile(pub+"\n", pubFile)
+	err = m.WriteStringFile(pub+"\n", "wg%v.pub", ring)
 	if err != nil {
 		return err
 	}