Merge pull request #57 from chaitin/fix(iterator)/reset

fix(iterator): reset
chaitin · Jan 13, 2023 · 611bbf7 · 611bbf7
2 parents e56ed5a + 17d487a
commit 611bbf7
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/go/cmd/iac.go b/go/cmd/iac.go
@@ -31,6 +31,9 @@ func ScanIACs(
 	}
 
 	uniq.Range(func(key, value interface{}) bool {
+		// Reset iterator for next objects
+		defer iter.Reset()
+
 		t := key.(iac.IACType)
 		if paths, ok := value.([]string); ok {
 			if err = plugin.Exec(ctx, iter, paths,

diff --git a/go/cmd/root.go b/go/cmd/root.go
@@ -112,6 +112,9 @@ func Scan(
 	}
 	var err error
 	result.Range(func(_, val interface{}) bool {
+		// Reset iterator for next objects
+		defer iter.Reset()
+
 		p := val.(*partition)
 		if err = plugin.Exec(ctx, iter, p.ids,
 			plugin.WithPrependArgs("--mode", p.root.Mode()),

diff --git a/go/plugin/iterator.go b/go/plugin/iterator.go
@@ -15,6 +15,7 @@ type ExecIterator interface {
 	HasNext() bool
 	Next() (*Plugin, *Command, error)
 	Done()
+	Reset()
 }
 
 type pluginIterator struct {
@@ -43,6 +44,11 @@ func (p *pluginIterator) Next() (*Plugin, *Command, error) {
 	return plug, cmd, nil
 }
 
+func (p *pluginIterator) Reset() {
+	p.i = 0
+	p.j = 0
+}
+
 func (p *pluginIterator) Done() {
 }
 
@@ -66,6 +72,10 @@ func (f *filterIterator) Next() (*Plugin, *Command, error) {
 	return nil, nil, nil
 }
 
+func (f *filterIterator) Reset() {
+	f.iter.Reset()
+}
+
 func (f *filterIterator) Done() {
 	f.iter.Done()
 }