chore: Fixing TestDiscoveryIncludeExcludeFilters

Author: yhakbar

internal/discovery/constructor.go

@@ -4,7 +4,6 @@ import (
 	"path/filepath"
 	"runtime"
 
-	"github.com/gruntwork-io/terragrunt/config"
 	"github.com/gruntwork-io/terragrunt/internal/component"
 	"github.com/gruntwork-io/terragrunt/internal/experiment"
 	"github.com/gruntwork-io/terragrunt/internal/filter"
@@ -138,10 +137,6 @@ func NewDiscovery(dir string, opts ...DiscoveryOption) *Discovery {
 	numWorkers := max(min(runtime.NumCPU(), maxDiscoveryWorkers), defaultDiscoveryWorkers)
 
 	discovery := &Discovery{
-		includeDirs: []string{
-			config.StackDir,
-			filepath.Join(config.StackDir, "**"),
-		},
 		numWorkers:         numWorkers,
 		maxDependencyDepth: defaultMaxDependencyDepth,
 		discoveryContext: &component.DiscoveryContext{

internal/discovery/discovery.go

@@ -28,7 +28,6 @@ import (
 	"github.com/gruntwork-io/terragrunt/options"
 	"github.com/gruntwork-io/terragrunt/pkg/log"
 	"github.com/hashicorp/hcl/v2"
-	"github.com/mattn/go-zglob"
 	"github.com/zclconf/go-cty/cty"
 	"golang.org/x/sync/errgroup"
 )
@@ -77,9 +76,6 @@ type Discovery struct {
 
 	graphTarget string
 
-	// includeDirs is a list of directory patterns to include in discovery (for strict include mode).
-	includeDirs []string
-
 	// configFilenames is the list of config filenames to discover. If nil, defaults are used.
 	configFilenames []string
 
@@ -236,12 +232,6 @@ func (d *Discovery) WithConfigFilenames(filenames []string) *Discovery {
 	return d
 }
 
-// WithIncludeDirs sets include directory glob patterns used for filtering during discovery.
-func (d *Discovery) WithIncludeDirs(dirs []string) *Discovery {
-	d.includeDirs = dirs
-	return d
-}
-
 // WithParserOptions sets custom HCL parser options to use when parsing during discovery.
 func (d *Discovery) WithParserOptions(options []hclparse.Option) *Discovery {
 	d.parserOptions = options
@@ -333,32 +323,6 @@ func (d *Discovery) withExcludeByDefault() *Discovery {
 	return d
 }
 
-// compileIncludePatterns compiles the include directory patterns for faster matching.
-func (d *Discovery) compileIncludePatterns(l log.Logger) {
-	d.compiledIncludePatterns = make([]CompiledPattern, 0, len(d.includeDirs))
-	for _, pattern := range d.includeDirs {
-		if compiled, err := zglob.New(pattern); err == nil {
-			d.compiledIncludePatterns = append(d.compiledIncludePatterns, CompiledPattern{
-				Original: pattern,
-				Compiled: compiled,
-			})
-		} else {
-			l.Warnf("Failed to compile include pattern '%s': %v. Pattern will be ignored.", pattern, err)
-		}
-	}
-}
-
-// matchesIncludePath reports whether the provided directory matches any compiled include pattern.
-func (d *Discovery) matchesIncludePath(dir string) bool {
-	for _, pattern := range d.compiledIncludePatterns {
-		if pattern.Compiled.Match(dir) {
-			return true
-		}
-	}
-
-	return false
-}
-
 // String returns a string representation of a Component.
 // String returns the path of the Component.
 func String(c component.Component) string {
@@ -731,11 +695,6 @@ func (d *Discovery) processFile(
 			// Always allow .terragrunt-stack contents
 			cleanDir := util.CleanPath(canonicalDir)
 			allowHidden = isInStackDirectory(cleanDir)
-
-			if !allowHidden {
-				// Use a common helper for include matching
-				allowHidden = d.matchesIncludePath(canonicalDir)
-			}
 		}
 
 		if !allowHidden {
@@ -896,25 +855,6 @@ func (d *Discovery) Discover(
 		filenames = DefaultConfigFilenames
 	}
 
-	// Prepare include/exclude glob patterns (canonicalized) for matching
-	var includePatterns []string
-
-	if len(d.includeDirs) > 0 {
-		for _, p := range d.includeDirs {
-			if !filepath.IsAbs(p) {
-				p = filepath.Join(d.discoveryContext.WorkingDir, p)
-			}
-
-			includePatterns = append(includePatterns, util.CleanPath(p))
-		}
-	}
-
-	// Compile patterns if not already compiled
-	if len(d.compiledIncludePatterns) == 0 && len(includePatterns) > 0 {
-		d.includeDirs = includePatterns
-		d.compileIncludePatterns(l)
-	}
-
 	// Use concurrent discovery for better performance
 	components, err := d.discoverConcurrently(ctx, l, opts, &hiddenDirMemo{}, filenames)
 	if err != nil {

internal/discovery/discovery_test.go

@@ -483,14 +483,20 @@ func TestDiscoveryIncludeExcludeFilters(t *testing.T) {
 	require.NoError(t, err)
 	assert.ElementsMatch(t, []string{unit1Dir, unit3Dir}, cfgs.Filter(component.UnitKind).Paths())
 
+	filters, err = filter.ParseFilterQueries([]string{"./unit1"})
+	require.NoError(t, err)
+
 	// Exclude-by-default and include only unit1
-	d = discovery.NewDiscovery(tmpDir).WithIncludeDirs([]string{unit1Dir})
+	d = discovery.NewDiscovery(tmpDir).WithFilters(filters)
 	cfgs, err = d.Discover(t.Context(), l, opts)
 	require.NoError(t, err)
 	assert.ElementsMatch(t, []string{unit1Dir}, cfgs.Filter(component.UnitKind).Paths())
 
+	filters, err = filter.ParseFilterQueries([]string{"./unit3"})
+	require.NoError(t, err)
+
 	// Strict include behaves the same
-	d = discovery.NewDiscovery(tmpDir).WithIncludeDirs([]string{unit3Dir})
+	d = discovery.NewDiscovery(tmpDir).WithFilters(filters)
 	cfgs, err = d.Discover(t.Context(), l, opts)
 	require.NoError(t, err)
 	assert.ElementsMatch(t, []string{unit3Dir}, cfgs.Filter(component.UnitKind).Paths())
@@ -508,7 +514,10 @@ func TestDiscoveryHiddenIncludedByIncludeDirs(t *testing.T) {
 	opts, err := options.NewTerragruntOptionsForTest(tmpDir)
 	require.NoError(t, err)
 
-	d := discovery.NewDiscovery(tmpDir).WithIncludeDirs([]string{filepath.Join(tmpDir, ".hidden", "**")})
+	filters, err := filter.ParseFilterQueries([]string{"./.hidden/**"})
+	require.NoError(t, err)
+
+	d := discovery.NewDiscovery(tmpDir).WithFilters(filters)
 	cfgs, err := d.Discover(t.Context(), l, opts)
 	require.NoError(t, err)
 	assert.ElementsMatch(t, []string{hiddenUnitDir}, cfgs.Filter(component.UnitKind).Paths())