fix: don't skip modules with multiple tf files

leg100 · Aug 18, 2024 · 2208eff · 2208eff
1 parent fc8572e
commit 2208eff
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 3 deletions.
diff --git a/internal/module/module.go b/internal/module/module.go
@@ -125,8 +125,6 @@ func find(ctx context.Context, workdir internal.Workdir) (<-chan Options, <-chan
 						Backend: backend,
 					}
 				}()
-				// Skip walking remainder of parent directory
-				return fs.SkipDir
 			}
 			// Abort walk if context canceled
 			select {

diff --git a/internal/module/module_test.go b/internal/module/module_test.go
@@ -27,12 +27,13 @@ func TestFindModules(t *testing.T) {
 		got = append(got, opts)
 	}
 
-	assert.Equal(t, 5, len(got), got)
+	assert.Equal(t, 6, len(got), got)
 	assert.Contains(t, got, Options{Path: "with_local_backend", Backend: "local"})
 	assert.Contains(t, got, Options{Path: "with_s3_backend", Backend: "s3"})
 	assert.Contains(t, got, Options{Path: "with_cloud_backend", Backend: "cloud"})
 	assert.Contains(t, got, Options{Path: "terragrunt_with_local", Backend: "local"})
 	assert.Contains(t, got, Options{Path: "terragrunt_without_backend", Backend: ""})
+	assert.Contains(t, got, Options{Path: "multiple_tf_files", Backend: "local"})
 	assert.NotContains(t, got, "broken")
 
 	// Expect one error from broken module then error channel should close

diff --git a/internal/module/testdata/modules/multiple_tf_files/bar.tf b/internal/module/testdata/modules/multiple_tf_files/bar.tf
diff --git a/internal/module/testdata/modules/multiple_tf_files/foo.tf b/internal/module/testdata/modules/multiple_tf_files/foo.tf
diff --git a/internal/module/testdata/modules/multiple_tf_files/main.tf b/internal/module/testdata/modules/multiple_tf_files/main.tf
@@ -0,0 +1,3 @@
+terraform {
+  backend "local" {}
+}
diff --git a/internal/module/testdata/modules/multiple_tf_files/zoo.tf b/internal/module/testdata/modules/multiple_tf_files/zoo.tf