fix: avoid ignoring hidden tfvars files

hashicorp · Jun 24, 2022 · 06c7604 · 06c7604
1 parent b53bd69
commit 06c7604
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 19 deletions.
diff --git a/internal/terraform/ast/ast.go b/internal/terraform/ast/ast.go
diff --git a/internal/terraform/ast/module.go b/internal/terraform/ast/module.go
@@ -17,9 +17,21 @@ func (mf ModFilename) IsJSON() bool {
 }
 
 func IsModuleFilename(name string) bool {
-	return (strings.HasSuffix(name, ".tf") ||
-		strings.HasSuffix(name, ".tf.json")) &&
-		!isIgnoredFile(name)
+	if isIgnoredFile(name) {
+		// See https://github.com/hashicorp/terraform/blob/d35bc05/internal/configs/parser_config_dir.go#L107
+		return false
+	}
+
+	return strings.HasSuffix(name, ".tf") ||
+		strings.HasSuffix(name, ".tf.json")
+}
+
+// isIgnoredFile returns true if the given filename (which must not have a
+// directory path ahead of it) should be ignored as e.g. an editor swap file.
+func isIgnoredFile(name string) bool {
+	return strings.HasPrefix(name, ".") || // Unix-like hidden files
+		strings.HasSuffix(name, "~") || // vim
+		strings.HasPrefix(name, "#") && strings.HasSuffix(name, "#") // emacs
 }
 
 type ModFiles map[ModFilename]*hcl.File

diff --git a/internal/terraform/ast/variables.go b/internal/terraform/ast/variables.go
@@ -16,9 +16,11 @@ func NewVarsFilename(name string) (VarsFilename, bool) {
 }
 
 func IsVarsFilename(name string) bool {
-	return (strings.HasSuffix(name, ".tfvars") ||
-		strings.HasSuffix(name, ".tfvars.json")) &&
-		!isIgnoredFile(name)
+	// even files which are normally ignored/hidden,
+	// such as .foo.tfvars (with leading .) are accepted here
+	// see https://github.com/hashicorp/terraform/blob/77e6b62/internal/command/meta.go#L734-L738
+	return strings.HasSuffix(name, ".tfvars") ||
+		strings.HasSuffix(name, ".tfvars.json")
 }
 
 func (vf VarsFilename) String() string {