Merge pull request 'wireguard: switch from gcfg to asciigoat.org/ini/basic' (#8) from pr-amery-wireguard-ini into main

Reviewed-on: #8

pkg/cluster/cluster_scan.go

@@ -4,7 +4,6 @@ import (
 	"io/fs"
 	"path"
 	"sort"
-	"strings"
 
 	"darvaza.org/core"
 )
@@ -13,10 +12,6 @@ const (
 	// ZoneRegionsFileName indicates the file containing
 	// region names as references
 	ZoneRegionsFileName = "regions"
-
-	// RegionClusterTokenFileName contains the kubernetes
-	// token of the cluster this region represents
-	RegionClusterTokenFileName = "k8s_token"
 )
 
 func (m *Cluster) scan(opts *ScanOptions) error {
@@ -191,8 +186,6 @@ func (z *Zone) scan() error {
 		switch {
 		case name == ZoneRegionsFileName:
 			err = z.loadRegions()
-		case name == RegionClusterTokenFileName:
-			err = z.loadClusterToken()
 		case e.IsDir():
 			err = z.scanSubdirectory(name)
 		default:
@@ -225,32 +218,6 @@ func (z *Zone) loadRegions() error {
 	return err
 }
 
-func (z *Zone) loadClusterToken() error {
-	var token string
-
-	filename := path.Join(z.Name, RegionClusterTokenFileName)
-	lines, err := z.zones.ReadLines(filename)
-	if err != nil {
-		return err
-	}
-
-	// first non-empty line
-	for _, s := range lines {
-		s = strings.TrimSpace(s)
-		if s != "" {
-			token = s
-			break
-		}
-	}
-
-	err = z.zones.setRegionClusterToken(z.Name, token)
-	if err != nil {
-		err = core.Wrap(err, filename)
-	}
-
-	return err
-}
-
 func (z *Zone) scanSubdirectory(name string) error {
 	m := &Machine{
 		zone:   z,

pkg/cluster/regions.go

@@ -8,23 +8,14 @@ import (
 var (
 	_ MachineIterator = (*Region)(nil)
 	_ ZoneIterator    = (*Region)(nil)
-
-	_ RegionIterator = (*Zone)(nil)
-	_ RegionIterator = (*Cluster)(nil)
 )
 
-// A RegionIterator is a set of Regions we can iterate on
-type RegionIterator interface {
-	ForEachRegion(func(*Region) bool)
-}
-
 // Region represents a group of zones geographically related
 type Region struct {
 	m     *Cluster
 	zones []*Zone
 
 	Name    string
-	Cluster *string  `json:",omitempty" yaml:",omitempty"`
 	Regions []string `json:",omitempty" yaml:",omitempty"`
 }
 
@@ -115,26 +106,6 @@ func (m *Cluster) setRegionZones(name string, zones ...*Zone) {
 	})
 }
 
-func (m *Cluster) setRegionClusterToken(name string, token string) error {
-	for i := range m.Regions {
-		r := &m.Regions[i]
-
-		if r.Name == name {
-			// found
-			r.Cluster = &token
-			return nil
-		}
-	}
-
-	// new
-	m.Regions = append(m.Regions, Region{
-		m:       m,
-		Name:    name,
-		Cluster: &token,
-	})
-	return nil
-}
-
 func (m *Cluster) appendRegionRegions(name string, subs ...string) {
 	for i := range m.Regions {
 		r := &m.Regions[i]
@@ -153,28 +124,6 @@ func (m *Cluster) appendRegionRegions(name string, subs ...string) {
 	})
 }
 
-// ForEachRegion calls a function on all regions this zone belongs to.
-func (z *Zone) ForEachRegion(fn func(*Region) bool) {
-	if fn == nil {
-		return
-	}
-
-	z.zones.ForEachRegion(func(r *Region) bool {
-		var match bool
-
-		r.ForEachZone(func(z2 *Zone) bool {
-			match = (z == z2)
-			return match
-		})
-
-		if match && fn(r) {
-			return true
-		}
-
-		return false
-	})
-}
-
 func (z *Zone) appendRegions(regions ...string) error {
 	for _, s := range regions {
 		// TODO: validate
@@ -198,7 +147,7 @@ func (m *Cluster) finishRegion(r *Region) {
 	r.m = m
 	sub := []string{}
 	for _, name := range r.Regions {
-		r2, ok := m.getFinishRegion(name)
+		r2, ok := m.getRegion(name)
 		if !ok {
 			m.warn(nil).WithField("region", name).Print("unknown region")
 			continue
@@ -213,19 +162,12 @@ func (m *Cluster) finishRegion(r *Region) {
 func (m *Cluster) getRegion(name string) (*Region, bool) {
 	for i := range m.Regions {
 		r := &m.Regions[i]
+
 		if name == r.Name {
-			return r, true
-		}
-	}
-
-	return nil, false
-}
-
-func (m *Cluster) getFinishRegion(name string) (*Region, bool) {
-	if r, ok := m.getRegion(name); ok {
 			m.finishRegion(r)
 			return r, true
 		}
+	}
 
 	return nil, false
 }
@@ -236,7 +178,11 @@ func (z *Zone) SyncRegions() error {
 	err := z.syncZoneRegions()
 	if err == nil {
 		z.ForEachMachine(func(p *Machine) bool {
-			err = z.syncMachineRegions(p)
+			if p.IsActive() {
+				err = p.RemoveFile("region")
+			} else {
+				err = p.WriteStringFile("none\n", "region")
+			}
 			return err != nil
 		})
 	}
@@ -244,24 +190,8 @@ func (z *Zone) SyncRegions() error {
 	return err
 }
 
-func (*Zone) syncMachineRegions(p *Machine) error {
-	var err error
-
-	if p.IsActive() {
-		err = p.RemoveFile("region")
-	} else {
-		err = p.WriteStringFile("none\n", "region")
-	}
-
-	if err == nil {
-		err = p.RemoveFile(RegionClusterTokenFileName)
-	}
-
-	return err
-}
-
 func (z *Zone) syncZoneRegions() error {
-	name := filepath.Join(z.Name, ZoneRegionsFileName)
+	name := filepath.Join(z.Name, "regions")
 
 	if len(z.Regions) > 0 {
 		var buf bytes.Buffer
@@ -280,25 +210,9 @@ func (z *Zone) syncZoneRegions() error {
 // SyncRegions writes to the file system the regions covered
 // by this meta-region
 func (r *Region) SyncRegions() error {
-	if err := r.syncRegionsFile(); err != nil {
+	name := filepath.Join(r.Name, "regions")
-		return err
-	}
 
-	return r.syncClusterFile()
+	if len(r.Regions) > 0 {
-}
-
-func (r *Region) mkdir() error {
-	return r.m.MkdirAll(r.Name)
-}
-
-func (r *Region) syncRegionsFile() error {
-	var err error
-
-	name := filepath.Join(r.Name, ZoneRegionsFileName)
-
-	if len(r.Regions) == 0 {
-		err = r.m.RemoveFile(name)
-	} else if err = r.mkdir(); err == nil {
 		var buf bytes.Buffer
 
 		for _, s := range r.Regions {
@@ -306,29 +220,12 @@ func (r *Region) syncRegionsFile() error {
 			_, _ = buf.WriteRune('\n')
 		}
 
-		err = r.m.WriteStringFile(buf.String(), name)
+		if err := r.m.MkdirAll(r.Name); err != nil {
-	}
-
 			return err
 		}
 
-func (r *Region) syncClusterFile() error {
+		return r.m.WriteStringFile(buf.String(), name)
-	var err error
-
-	name := filepath.Join(r.Name, RegionClusterTokenFileName)
-
-	if r.Cluster == nil {
-		err = r.m.RemoveFile(name)
-	} else if err = r.mkdir(); err == nil {
-		var buf bytes.Buffer
-
-		_, _ = buf.WriteString(*r.Cluster)
-		if buf.Len() > 0 {
-			_, _ = buf.WriteRune('\n')
 	}
 
-		err = r.m.WriteStringFile(buf.String(), name)
+	return r.m.RemoveFile(name)
-	}
-
-	return err
 }