amery/jpictl
2
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

zones: introduce MachineIterator interface

Browse Source 
Signed-off-by: Alejandro Mery <amery@jpi.io>
This commit is contained in:
Alejandro Mery
2023-08-26 00:09:45 +00:00
parent 609f48a2d1
commit 07b4a22752
2 changed files with 33 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/zones/zone_rings.go
+23 -29
View File
@@ -5,9 +5,29 @@ import "os"
// 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)
@@ -18,11 +38,10 @@ func (z *Zone) PruneWireguardConfig(ring int) error {
return err
}
// WriteWireguardKeys rewrites all wgN.{key,pub} files on this zone
func (z *Zone) WriteWireguardKeys(ring int) error {
func writeWireguardKeys(m MachineIterator, 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
@@ -34,28 +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
}
pkg/zones/zones.go
+10
View File
@@ -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