zones: allow iterators to terminate

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

cmd/jpictl/env.go

@@ -1,27 +0,0 @@
-package main
-
-import (
-	"os"
-
-	"github.com/spf13/cobra"
-
-	"git.jpi.io/amery/jpictl/pkg/zones"
-)
-
-// Command
-var envCmd = &cobra.Command{
-	Use:   "env",
-	Short: "generates environment variables for shell scripts",
-	RunE: func(_ *cobra.Command, _ []string) error {
-		m, err := zones.New(cfg.Base, cfg.Domain)
-		if err != nil {
-			return err
-		}
-
-		return m.WriteEnv(os.Stdout)
-	},
-}
-
-func init() {
-	rootCmd.AddCommand(envCmd)
-}

pkg/zones/env.go

@@ -1,9 +0,0 @@
-// Package zones abstracts the cluster zones
-package zones
-
-import "io"
-
-// WriteEnv generates environment variables for shell scripts
-func (*Zones) WriteEnv(io.Writer) error {
-	return nil
-}

pkg/zones/scan.go

@@ -31,10 +31,9 @@ func (m *Zones) scan() error {
 
 func (m *Zones) scanMachines() error {
 	var err error
-	m.ForEachMachine(func(p *Machine) {
+	m.ForEachMachine(func(p *Machine) bool {
-		if err == nil {
+		err = p.scan()
-			err = p.scan()
+		return err != nil
-		}
 	})
 	return err
 }

pkg/zones/zones.go

@@ -32,18 +32,24 @@ type Zones struct {
 }
 
 // ForEachMachine calls a function for each Machine in the cluster
-func (m *Zones) ForEachMachine(fn func(*Machine)) {
+func (m *Zones) ForEachMachine(fn func(*Machine) bool) {
 	for _, z := range m.Zones {
 		for _, p := range z.Machines {
-			fn(p)
+			if fn(p) {
+				// terminate
+				return
+			}
 		}
 	}
 }
 
 // ForEachZone calls a function for each Zone in the cluster
-func (m *Zones) ForEachZone(fn func(*Zone)) {
+func (m *Zones) ForEachZone(fn func(*Zone) bool) {
 	for _, p := range m.Zones {
-		fn(p)
+		if fn(p) {
+			// terminate
+			return
+		}
 	}
 }