Merge pull request #518 from gruntwork-io/fix-all-commands

Exclude terragrunt-cache from xxx-all commands

cli/args.go

@@ -45,7 +45,7 @@ func parseTerragruntOptionsFromArgs(args []string, writer, errWriter io.Writer)
 		return nil, err
 	}
 
-	downloadDirRaw, err := parseStringArg(args, OPT_DOWNLOAD_DIR, util.JoinPath(workingDir, ".terragrunt-cache"))
+	downloadDirRaw, err := parseStringArg(args, OPT_DOWNLOAD_DIR, util.JoinPath(workingDir, options.TerragruntCacheDir))
 	if err != nil {
 		return nil, err
 	}

config/config.go

@@ -151,6 +151,10 @@ func FindConfigFilesInPath(rootPath string) ([]string, error) {
 		}
 
 		if info.IsDir() {
+			if strings.HasPrefix(info.Name(), options.TerragruntCacheDir) {
+				return nil
+			}
+
 			configPath := DefaultConfigPath(path)
 			isTerragruntConfig, err := IsTerragruntConfigFile(configPath)
 			if err != nil {

config/config_test.go

@@ -761,6 +761,18 @@ func TestFindConfigFilesInPathMultipleConfigs(t *testing.T) {
 	assert.Equal(t, expected, actual)
 }
 
+func TestFindConfigFilesIgnoresTerragruntCache(t *testing.T) {
+	t.Parallel()
+
+	expected := []string{
+		"../test/fixture-config-files/ignore-cached-config/terraform.tfvars",
+	}
+	actual, err := FindConfigFilesInPath("../test/fixture-config-files/ignore-cached-config")
+
+	assert.Nil(t, err, "Unexpected error: %v", err)
+	assert.Equal(t, expected, actual)
+}
+
 func mockOptionsForTestWithConfigPath(t *testing.T, configPath string) *options.TerragruntOptions {
 	opts, err := options.NewTerragruntOptionsForTest(configPath)
 	if err != nil {

options/options.go

@@ -20,6 +20,8 @@ var TERRAFORM_COMMANDS_WITH_SUBCOMMAND = []string{
 
 const DEFAULT_MAX_FOLDERS_TO_CHECK = 100
 
+const TerragruntCacheDir = ".terragrunt-cache"
+
 // TerragruntOptions represents options that configure the behavior of the Terragrunt program
 type TerragruntOptions struct {
 	// Location of the Terragrunt config file
@@ -89,7 +91,7 @@ func NewTerragruntOptions(terragruntConfigPath string) (*TerragruntOptions, erro
 
 	logger := util.CreateLogger("")
 
-	downloadDir, err := filepath.Abs(filepath.Join(workingDir, ".terragrunt-cache"))
+	downloadDir, err := filepath.Abs(filepath.Join(workingDir, TerragruntCacheDir))
 	if err != nil {
 		return nil, errors.WithStackTrace(err)
 	}

test/fixture-config-files/ignore-cached-config/terraform.tfvars

@@ -0,0 +1,4 @@
+# Intentionally empty
+terragrunt = {
+
+}