cluster: load regions when scanning a directory

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

cmd/jpictl/dns.go

@@ -52,7 +52,7 @@ func populateDNSManager(mgr *dns.Manager, m *cluster.Cluster) error {
 
 	m.ForEachZone(func(z *cluster.Zone) bool {
 		z.ForEachMachine(func(p *cluster.Machine) bool {
-			err = mgr.AddHost(ctx, z.Name, p.ID, p.IsActive(), p.PublicAddresses...)
+			err = mgr.AddHost(ctx, z.Name, p.ID, p.Active(), p.PublicAddresses...)
 			return err != nil
 		})
 

pkg/cluster/machine.go

@@ -44,8 +44,8 @@ func (m *Machine) FullName() string {
 	return strings.Join(name, ".")
 }
 
-// IsActive indicates the machine is to be included in regions' DNS entries
-func (m *Machine) IsActive() bool {
+// Active indicates the machine is to be included in regions' DNS entries
+func (m *Machine) Active() bool {
 	return !m.Inactive
 }
 

pkg/cluster/regions.go

@@ -37,7 +37,7 @@ func (r *Region) ForEachMachine(fn func(*Machine) bool) {
 		var term bool
 
 		z.ForEachMachine(func(p *Machine) bool {
-			if p.IsActive() {
+			if p.Active() {
 				term = fn(p)
 			}
 			return term
@@ -178,7 +178,7 @@ func (z *Zone) SyncRegions() error {
 	err := z.syncZoneRegions()
 	if err == nil {
 		z.ForEachMachine(func(p *Machine) bool {
-			if p.IsActive() {
+			if p.Active() {
 				err = p.RemoveFile("region")
 			} else {
 				err = p.WriteStringFile("none\n", "region")

pkg/wireguard/keys.go

@@ -54,23 +54,25 @@ func (pub PublicKey) String() string {
 // UnmarshalText loads the value from base64
 func (key *PrivateKey) UnmarshalText(b []byte) error {
 	v, err := PrivateKeyFromBase64(string(b))
-	if err != nil {
+	switch {
+	case err != nil:
 		return err
+	default:
+		*key = v
+		return nil
 	}
-
-	*key = v
-	return nil
 }
 
 // UnmarshalText loads the value from base64
 func (pub *PublicKey) UnmarshalText(b []byte) error {
 	v, err := PublicKeyFromBase64(string(b))
-	if err != nil {
+	switch {
+	case err != nil:
 		return err
+	default:
+		*pub = v
+		return nil
 	}
-
-	*pub = v
-	return nil
 }
 
 // MarshalJSON encodes the key for JSON, omitting empty.