file matchers2

Author: dsa0x

internal/configs/parser_config_dir.go

@@ -92,7 +92,7 @@ func (p *Parser) LoadConfigDir(path string, opts ...Option) (*Module, hcl.Diagno
 // LoadConfigDirWithTests matches LoadConfigDir, but the return Module also
 // contains any relevant .tftest.hcl files.
 func (p *Parser) LoadConfigDirWithTests(path string, testDirectory string) (*Module, hcl.Diagnostics) {
-	return p.LoadConfigDir(path, WithTestFiles(testDirectory))
+	return p.LoadConfigDir(path, MatchTestFiles(testDirectory))
 }
 
 func (p *Parser) LoadMockDataDir(dir string, useForPlanDefault bool, source hcl.Range) (*MockData, hcl.Diagnostics) {

internal/configs/parser_config_dir_test.go

@@ -134,7 +134,7 @@ func TestParserLoadConfigDirWithTests(t *testing.T) {
 			}
 
 			parser := NewParser(nil)
-			mod, diags := parser.LoadConfigDir(directory, WithTestFiles(testDirectory))
+			mod, diags := parser.LoadConfigDir(directory, MatchTestFiles(testDirectory))
 			if len(diags) > 0 { // We don't want any warnings or errors.
 				t.Errorf("unexpected diagnostics")
 				for _, diag := range diags {
@@ -284,7 +284,7 @@ func TestParserLoadConfigDirFailure(t *testing.T) {
 			parser := NewParser(nil)
 			path := filepath.Join("testdata/invalid-modules", name)
 
-			_, diags := parser.LoadConfigDir(path, WithTestFiles("tests"))
+			_, diags := parser.LoadConfigDir(path, MatchTestFiles("tests"))
 			if !diags.HasErrors() {
 				t.Errorf("no errors; want at least one")
 				for _, diag := range diags {

internal/configs/parser_file_processor.go renamed to internal/configs/parser_file_matcher.go

@@ -59,7 +59,7 @@ func (p *Parser) dirFileSet(dir string, opts ...Option) (ConfigFileSet, hcl.Diag
 
 	// Set up options
 	options := &Options{
-		// We always process module and override files
+		// We always match module and override files
 		matchers:      []FileMatcher{&moduleFiles{}},
 		testDirectory: DefaultTestDirectory,
 		fs:            p.fs,
@@ -123,37 +123,31 @@ func (p *Parser) rootFiles(dir string, matchers []FileMatcher, fileSet *ConfigFi
 				case *queryFiles:
 					fileSet.Queries = append(fileSet.Queries, fullPath)
 				}
+				break // Stop checking other matchers once a match is found
 			}
 		}
 	}
 
 	return diags
 }
 
-// WithFileHandler adds a file matcher to the parser
-func WithFileHandler(matcher FileMatcher) Option {
+// MatchTestFiles adds a matcher for Terraform test files (.tftest.hcl and .tftest.json)
+func MatchTestFiles(dir string) Option {
 	return func(o *Options) {
-		o.matchers = append(o.matchers, matcher)
+		o.testDirectory = dir
+		o.matchers = append(o.matchers, &testFiles{})
 	}
 }
 
-// WithTestFiles adds a matcher for Terraform test files (.tftest.hcl and .tftest.json)
-func WithTestFiles(dir string) Option {
+// MatchQueryFiles adds a matcher for Terraform query files (.tfquery.hcl)
+func MatchQueryFiles() Option {
 	return func(o *Options) {
-		o.testDirectory = dir
-		WithFileHandler(&testFiles{})(o)
+		o.matchers = append(o.matchers, &queryFiles{})
 	}
 }
 
-// WithQueryFiles adds a matcher for Terraform query files (.tfquery.hcl)
-func WithQueryFiles() Option {
-	return WithFileHandler(&queryFiles{})
-}
-
-// moduleFiles processes regular Terraform configuration files (.tf and .tf.json)
-type moduleFiles struct {
-	overrideOnly bool
-}
+// moduleFiles matches regular Terraform configuration files (.tf and .tf.json)
+type moduleFiles struct{}
 
 func (m *moduleFiles) Matches(name string) bool {
 	ext := fileExt(name)
@@ -179,7 +173,7 @@ func (m *moduleFiles) DirFiles(dir string, options *Options, fileSet *ConfigFile
 	return nil
 }
 
-// testFiles processes Terraform test files (.tftest.hcl and .tftest.json)
+// testFiles matches Terraform test files (.tftest.hcl and .tftest.json)
 type testFiles struct{}
 
 func (t *testFiles) Matches(name string) bool {
@@ -189,7 +183,6 @@ func (t *testFiles) Matches(name string) bool {
 func (t *testFiles) DirFiles(dir string, opts *Options, fileSet *ConfigFileSet) hcl.Diagnostics {
 	var diags hcl.Diagnostics
 
-	// Process test directory
 	testPath := path.Join(dir, opts.testDirectory)
 	testInfos, err := opts.fs.ReadDir(testPath)
 
@@ -228,14 +221,19 @@ func (t *testFiles) DirFiles(dir string, opts *Options, fileSet *ConfigFileSet)
 
 	// Process test directory files
 	for _, info := range testInfos {
+		if info.IsDir() || IsIgnoredFile(info.Name()) {
+			// We only care about files.
+			continue
+		}
+
 		name := info.Name()
 		fileSet.Tests = append(fileSet.Tests, filepath.Join(testPath, name))
 	}
 
 	return diags
 }
 
-// queryFiles processes Terraform query files (.tfquery.hcl)
+// queryFiles matches Terraform query files (.tfquery.hcl)
 type queryFiles struct{}
 
 func (q *queryFiles) Matches(name string) bool {

internal/configs/parser_test.go

@@ -74,7 +74,7 @@ func testNestedModuleConfigFromDirWithTests(t *testing.T, path string) (*Config,
 	t.Helper()
 
 	parser := NewParser(nil)
-	mod, diags := parser.LoadConfigDir(path, WithTestFiles("tests"))
+	mod, diags := parser.LoadConfigDir(path, MatchTestFiles("tests"))
 	if mod == nil {
 		t.Fatal("got nil root module; want non-nil")
 	}

internal/configs/query_file.go

@@ -1,3 +1,6 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: BUSL-1.1
+
 package configs
 
 import (