add a valid variable definition file extension to list of exceptions …

…(#1331) * add a valid variable definition file extension to list of exceptions * run go fmt Co-authored-by: Matija Burisa <[email protected]>
lyft · Jan 4, 2021 · 43fce15 · 43fce15
1 parent 2ac77db
commit 43fce15
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/server/events/project_finder.go b/server/events/project_finder.go
@@ -148,7 +148,7 @@ func (p *DefaultProjectFinder) DetermineProjectsViaConfig(log *logging.SimpleLog
 // filterToTerraform filters non-terraform files from files.
 func (p *DefaultProjectFinder) filterToTerraform(files []string) []string {
 	var filtered []string
-	fileNameRe, _ := regexp.Compile(`^.*(\.tf|\.tfvars)$`)
+	fileNameRe, _ := regexp.Compile(`^.*(\.tf|\.tfvars|\.tfvars.json)$`)
 
 	for _, fileName := range files {
 		if !p.shouldIgnore(fileName) && (fileNameRe.MatchString(fileName) || filepath.Base(fileName) == "terragrunt.hcl") {

diff --git a/server/events/project_finder_test.go b/server/events/project_finder_test.go
@@ -93,6 +93,7 @@ func setupTmpRepos(t *testing.T) {
 	// env/
 	//   staging.tfvars
 	//   production.tfvars
+	//   global-env-config.auto.tfvars.json
 	envDir, err = ioutil.TempDir("", "")
 	Ok(t, err)
 	err = os.MkdirAll(filepath.Join(envDir, "env"), 0700)
@@ -245,6 +246,7 @@ func TestDefaultProjectFinder_DetermineProjectsViaConfig(t *testing.T) {
 	// main.tf
 	// project1/
 	//   main.tf
+	//   terraform.tfvars.json
 	// project2/
 	//   main.tf
 	//   terraform.tfvars
@@ -254,7 +256,8 @@ func TestDefaultProjectFinder_DetermineProjectsViaConfig(t *testing.T) {
 	tmpDir, cleanup := DirStructure(t, map[string]interface{}{
 		"main.tf": nil,
 		"project1": map[string]interface{}{
-			"main.tf": nil,
+			"main.tf":               nil,
+			"terraform.tfvars.json": nil,
 		},
 		"project2": map[string]interface{}{
 			"main.tf":          nil,