Should be continue, not return (gruntwork-io#1728)

* Should be continue, not return * Remove plan accidentally checked in files
bradleybmurray · Jun 19, 2021 · 6260fdf · 6260fdf
1 parent a198d0b
commit 6260fdf
Showing 6 changed files with 4 additions and 3 deletions.
diff --git a/config/locals.go b/config/locals.go
@@ -207,7 +207,7 @@ func canEvaluate(
 
 		// If the variable is `include`, then we can evaluate it now
 		if var_.RootName() == "include" {
-			return true
+			continue
 		}
 
 		// We can't evaluate any variable other than `local`

diff --git a/test/fixture-include-expose/child/terragrunt.hcl b/test/fixture-include-expose/child/terragrunt.hcl
@@ -4,7 +4,8 @@ include {
 }
 
 locals {
-  parent_region = include.locals.region
+  environment   = "test"
+  parent_region = "${include.locals.region}-${local.environment}"
 }
 
 inputs = {

diff --git a/test/fixture-stack/disjoint/a/plan.tfplan b/test/fixture-stack/disjoint/a/plan.tfplan
diff --git a/test/fixture-stack/disjoint/b/plan.tfplan b/test/fixture-stack/disjoint/b/plan.tfplan
diff --git a/test/fixture-stack/disjoint/c/plan.tfplan b/test/fixture-stack/disjoint/c/plan.tfplan
diff --git a/test/integration_test.go b/test/integration_test.go
@@ -683,7 +683,7 @@ func TestTerragruntWorksWithIncludeLocals(t *testing.T) {
 
 	outputs := map[string]TerraformOutput{}
 	require.NoError(t, json.Unmarshal([]byte(stdout.String()), &outputs))
-	assert.Equal(t, "us-west-1", outputs["region"].Value.(string))
+	assert.Equal(t, "us-west-1-test", outputs["region"].Value.(string))
 }
 
 func TestTerragruntWorksWithSingleJsonConfig(t *testing.T) {