cluster: add []string writer to Env

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

pkg/cluster/cluster_scan.go

@@ -4,6 +4,7 @@ import (
 	"io/fs"
 	"path"
 	"sort"
+	"strings"
 
 	"darvaza.org/core"
 )
@@ -225,22 +226,26 @@ func (z *Zone) loadRegions() error {
 }
 
 func (z *Zone) loadClusterToken() error {
+	var token string
+
 	filename := path.Join(z.Name, RegionClusterTokenFileName)
 	lines, err := z.zones.ReadLines(filename)
-	if err == nil {
-		var token string
+	if err != nil {
+		return err
+	}
 
-		for _, s := range lines {
-			if s != "" {
-				token = s
-				break
-			}
+	// 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)
-		}
+	err = z.zones.setRegionClusterToken(z.Name, token)
+	if err != nil {
+		err = core.Wrap(err, filename)
 	}
 
 	return err

pkg/cluster/env.go

@@ -85,22 +85,29 @@ func (m *Env) writeEnvZone(w io.Writer, z *Zone) {
 }
 
 func (m *Env) writeEnvVarInts(w io.Writer, value []int, name string, args ...any) {
-	var s string
+	var buf bytes.Buffer
 
-	if n := len(value); n > 0 {
-		var buf bytes.Buffer
-
-		for i, v := range value {
-			if i != 0 {
-				_, _ = fmt.Fprint(&buf, " ")
-			}
-			_, _ = fmt.Fprintf(&buf, "%v", v)
+	for _, v := range value {
+		if buf.Len() > 0 {
+			_, _ = fmt.Fprint(&buf, " ")
 		}
-
-		s = buf.String()
+		_, _ = fmt.Fprintf(&buf, "%v", v)
 	}
 
-	m.writeEnvVar(w, s, name, args...)
+	m.writeEnvVar(w, buf.String(), name, args...)
+}
+
+func (m *Env) writeEnvVarStrings(w io.Writer, value []string, name string, args ...any) {
+	var buf bytes.Buffer
+
+	for _, v := range value {
+		if buf.Len() > 0 {
+			_, _ = fmt.Fprint(&buf, " ")
+		}
+		_, _ = fmt.Fprintf(&buf, "%s", v)
+	}
+
+	m.writeEnvVar(w, buf.String(), name, args...)
 }
 
 func (m *Env) writeEnvVar(w io.Writer, value string, name string, args ...any) {

pkg/cluster/regions.go

@@ -8,8 +8,14 @@ import (
 var (
 	_ MachineIterator = (*Region)(nil)
 	_ ZoneIterator    = (*Region)(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
@@ -204,6 +210,11 @@ func (z *Zone) SyncRegions() error {
 			} else {
 				err = p.WriteStringFile("none\n", "region")
 			}
+
+			if err == nil {
+				err = p.RemoveFile(RegionClusterTokenFileName)
+			}
+
 			return err != nil
 		})
 	}