m/eu/k8s_token [DO-NOT-MERGE]

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

pkg/cluster/cluster_scan.go

@@ -4,7 +4,6 @@ import (
 	"io/fs"
 	"path"
 	"sort"
-	"strings"
 
 	"darvaza.org/core"
 )
@@ -226,26 +225,22 @@ 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 {
+	if err == nil {
-		return err
+		var token string
-	}
 
-	// first non-empty line
+		for _, s := range lines {
-	for _, s := range lines {
+			if s != "" {
-		s = strings.TrimSpace(s)
+				token = s
-		if s != "" {
+				break
-			token = s
+			}
-			break
 		}
-	}
 
-	err = z.zones.setRegionClusterToken(z.Name, token)
+		err = z.zones.setRegionClusterToken(z.Name, token)
-	if err != nil {
+		if err != nil {
-		err = core.Wrap(err, filename)
+			err = core.Wrap(err, filename)
+		}
 	}
 
 	return err

pkg/cluster/env.go

@@ -85,29 +85,22 @@ func (m *Env) writeEnvZone(w io.Writer, z *Zone) {
 }
 
 func (m *Env) writeEnvVarInts(w io.Writer, value []int, name string, args ...any) {
-	var buf bytes.Buffer
+	var s string
 
-	for _, v := range value {
+	if n := len(value); n > 0 {
-		if buf.Len() > 0 {
+		var buf bytes.Buffer
-			_, _ = fmt.Fprint(&buf, " ")
+
+		for i, v := range value {
+			if i != 0 {
+				_, _ = fmt.Fprint(&buf, " ")
+			}
+			_, _ = fmt.Fprintf(&buf, "%v", v)
 		}
-		_, _ = fmt.Fprintf(&buf, "%v", v)
+
+		s = buf.String()
 	}
 
-	m.writeEnvVar(w, buf.String(), name, args...)
+	m.writeEnvVar(w, s, 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,14 +8,8 @@ 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
@@ -210,11 +204,6 @@ func (z *Zone) SyncRegions() error {
 			} else {
 				err = p.WriteStringFile("none\n", "region")
 			}
-
-			if err == nil {
-				err = p.RemoveFile(RegionClusterTokenFileName)
-			}
-
 			return err != nil
 		})
 	}