chore: autoinclude cleanup

Author: denis256

docs/src/data/changelog/v1.1.4/autoinclude-config-path-override.mdx

@@ -3,8 +3,27 @@ version: "v1.1.4"
 category: "bug-fixes"
 ---
 
-#### Autoinclude overrides `config_path` set to a `values.*` attribute
+#### Autoinclude can replace a dependency whose `config_path` uses `values.*`
 
-When a unit source declared `config_path = values.vpc_path` in a `dependency` block and the stack file's `autoinclude` replaced that dependency with a different `config_path`, Terragrunt raised an "Unsupported attribute" error because it tried to evaluate `values.vpc_path` before applying the autoinclude override. The `values` block no longer needed `vpc_path` since the autoinclude provided the path, but the evaluation order meant the error surfaced anyway.
+A unit dependency block that set `config_path = values.vpc_path` no longer fails with "Unsupported attribute" when a sibling autoinclude — including one generated from a stack `autoinclude` block — supplies a different `config_path` and the values file does not define `vpc_path`.
 
-Terragrunt now detects dependency blocks overridden by a sibling autoinclude and bypasses their initial decode error, allowing the autoinclude replacement to resolve dependencies cleanly.
+```hcl
+# unit source: units/tgw/terragrunt.hcl
+dependency "vpc" {
+  config_path = values.vpc_path
+}
+```
+
+```hcl
+# stack: stacks/prod/terragrunt.stack.hcl
+unit "tgw" {
+  source = "../../units/tgw"
+  path   = "tgw"
+  values = { region = "us-east-1" }   # vpc_path intentionally absent
+  autoinclude {
+    dependency "vpc" {
+      config_path = stack.mgmt_infra.path
+    }
+  }
+}
+```

pkg/config/autoinclude_test.go

@@ -1597,3 +1597,42 @@ dependency "other" {
 	_, err := config.ParseConfigFile(ctx, pctx, l, cfgPath, nil)
 	require.Error(t, err, "a non-overridden dep with unresolvable config_path must still fail")
 }
+
+// Without any autoinclude file, a dependency referencing an absent values attribute must still fail with the original error pointing at the values attribute, not a downstream dependency.vpc error.
+func TestFoldSiblingAutoIncludeDeps_MissingValuesPathWithoutAutoIncludeStillErrors(t *testing.T) {
+	t.Parallel()
+
+	tmpDir := t.TempDir()
+	cfgPath := filepath.Join(tmpDir, config.DefaultTerragruntConfigPath)
+
+	// No autoinclude file at all.
+	require.NoError(t, os.WriteFile(cfgPath, []byte(`
+dependency "vpc" {
+  config_path  = values.vpc_path
+  skip_outputs = true
+  mock_outputs = {
+    id = "unit-vpc"
+  }
+  mock_outputs_allowed_terraform_commands = ["init"]
+}
+
+inputs = {
+  vpc_id = dependency.vpc.outputs.id
+}
+`), 0644))
+
+	ctx, pctx := newTestParsingContext(t, venvtest.NewOSWithEmptyEnv(), cfgPath)
+	pctx.Experiments.EnableExperiment(experiment.StackDependencies)
+	pctx.OriginalTerraformCommand = tfInitCommand
+
+	values := cty.ObjectVal(map[string]cty.Value{
+		"region": cty.StringVal("us-east-1"),
+	})
+	pctx.Values = &values
+
+	l := logger.CreateLogger()
+
+	_, err := config.ParseConfigFile(ctx, pctx, l, cfgPath, nil)
+	require.Error(t, err, "without autoinclude the values.vpc_path error must not be swallowed")
+	assert.Contains(t, err.Error(), "values", "error must reference the unresolvable values variable")
+}

pkg/config/config.go

@@ -1837,17 +1837,7 @@ func decodeAsTerragruntConfigFile(
 		l.Debugf("Deferred attribute access error to autoinclude merge: %v", diagErr)
 	}
 
-	dependencies, err := decodeDependencyBlocks(file, evalContext, pctx.Experiments)
-	if err != nil && hasSiblingAutoInclude(pctx) {
-		overrides := siblingAutoIncludeDepNames(pctx)
-		if len(overrides) > 0 {
-			dependencies, err = decodeDependencyBlocks(
-				file, evalContext, pctx.Experiments,
-				hclparse.WithSkipLabelsOnError(overrides),
-			)
-		}
-	}
-
+	dependencies, err := decodeDependencyBlocksWithAutoIncludeRetry(file, evalContext, pctx)
 	if err != nil {
 		return &terragruntConfig, err
 	}

pkg/config/dependency.go

@@ -314,22 +314,9 @@ func decodeAndRetrieveOutputs(
 		return nil, err
 	}
 
-	dependencies, err := decodeDependencyBlocks(file, evalParsingContext, pctx.Experiments)
-	if err != nil && hasSiblingAutoInclude(pctx) {
-		// When a sibling autoinclude overrides dependency blocks, the unit source may
-		// reference values.* attributes the override makes unnecessary. Skip overridden
-		// blocks on retry; foldSiblingAutoIncludeDeps fills them in below.
-		overrides := siblingAutoIncludeDepNames(pctx)
-		if len(overrides) > 0 {
-			dependencies, err = decodeDependencyBlocks(
-				file, evalParsingContext, pctx.Experiments,
-				hclparse.WithSkipLabelsOnError(overrides),
-			)
-		}
-
-		if err != nil {
-			return nil, err
-		}
+	dependencies, err := decodeDependencyBlocksWithAutoIncludeRetry(file, evalParsingContext, pctx)
+	if err != nil {
+		return nil, err
 	}
 
 	decodedDependency := TerragruntDependency{Dependencies: dependencies}
@@ -2220,6 +2207,26 @@ func parseAutoIncludeFileCached(
 	return file, nil
 }
 
+// decodeDependencyBlocksWithAutoIncludeRetry decodes dependency blocks, retrying with label-skip when a sibling autoinclude overrides some of them and the first decode fails on unresolvable attributes. Used by both decodeAndRetrieveOutputs and decodeAsTerragruntConfigFile.
+func decodeDependencyBlocksWithAutoIncludeRetry(
+	file *hclparse.File,
+	evalContext *hcl.EvalContext,
+	pctx *ParsingContext,
+) (Dependencies, error) {
+	deps, err := decodeDependencyBlocks(file, evalContext, pctx.Experiments)
+	if err != nil && hasSiblingAutoInclude(pctx) {
+		overrides := siblingAutoIncludeDepNames(pctx)
+		if len(overrides) > 0 {
+			deps, err = decodeDependencyBlocks(
+				file, evalContext, pctx.Experiments,
+				hclparse.WithSkipLabelsOnError(overrides),
+			)
+		}
+	}
+
+	return deps, err
+}
+
 // siblingAutoIncludeDepNames extracts dependency block labels from the sibling autoinclude file via a lightweight HCL parse. Returns nil when no autoinclude is registered, the file is absent, or it cannot be parsed.
 func siblingAutoIncludeDepNames(pctx *ParsingContext) map[string]bool {
 	if !hasSiblingAutoInclude(pctx) {

test/fixtures/stacks/stack-deps-autoinclude-config-path-values/catalog/app/main.tf

@@ -0,0 +1,7 @@
+variable "vpc_id" {
+  type = string
+}
+
+output "app_vpc" {
+  value = var.vpc_id
+}

test/fixtures/stacks/stack-deps-autoinclude-config-path-values/catalog/app/terragrunt.hcl

@@ -0,0 +1,30 @@
+terraform {
+  source = "."
+}
+
+# The config_path references values.vpc_path, which the stack autoinclude will override.
+# Without the fix, this fails with "Unsupported attribute" because values.vpc_path is evaluated
+# before the autoinclude replacement is applied (issue 6692).
+dependency "vpc" {
+  config_path = values.vpc_path
+
+  mock_outputs_allowed_terraform_commands = ["init", "plan", "validate"]
+  mock_outputs = {
+    vpc_id = "from-unit-mock"
+  }
+}
+
+remote_state {
+  backend = "local"
+  generate = {
+    path      = "backend.tf"
+    if_exists = "overwrite_terragrunt"
+  }
+  config = {
+    path = "${dependency.vpc.outputs.vpc_id}.tfstate"
+  }
+}
+
+inputs = {
+  vpc_id = dependency.vpc.outputs.vpc_id
+}

test/fixtures/stacks/stack-deps-autoinclude-config-path-values/catalog/vpc/main.tf

@@ -0,0 +1,3 @@
+output "vpc_id" {
+  value = "vpc-12345"
+}

test/fixtures/stacks/stack-deps-autoinclude-config-path-values/catalog/vpc/terragrunt.hcl

@@ -0,0 +1,14 @@
+terraform {
+  source = "."
+}
+
+remote_state {
+  backend = "local"
+  generate = {
+    path      = "backend.tf"
+    if_exists = "overwrite_terragrunt"
+  }
+  config = {
+    path = "vpc.tfstate"
+  }
+}

test/fixtures/stacks/stack-deps-autoinclude-config-path-values/live/terragrunt.stack.hcl

@@ -0,0 +1,25 @@
+unit "vpc" {
+  source = "../catalog/vpc"
+  path   = "vpc"
+}
+
+unit "app" {
+  source = "../catalog/app"
+  path   = "app"
+
+  # values intentionally omits vpc_path — the autoinclude provides the dependency override.
+  values = {
+    region = "us-east-1"
+  }
+
+  autoinclude {
+    dependency "vpc" {
+      config_path = unit.vpc.path
+
+      mock_outputs_allowed_terraform_commands = ["init", "plan", "validate"]
+      mock_outputs = {
+        vpc_id = "from-autoinclude"
+      }
+    }
+  }
+}

test/integration_stack_dependencies_test.go

@@ -72,6 +72,7 @@ const (
 	testFixtureStackDepsHCLValidateAutoInc       = "fixtures/stacks/stack-deps-hclvalidate-autoinclude"
 	testFixtureStackDepsAutoIncTemplateLiteral   = "fixtures/stacks/stack-deps-autoinclude-template-literal"
 	testFixtureStackDepsAutoIncObjectKey         = "fixtures/stacks/stack-deps-autoinclude-object-key"
+	testFixtureStackDepsAutoIncConfigPathValues  = "fixtures/stacks/stack-deps-autoinclude-config-path-values"
 )
 
 // TestStackDepsAutoIncludeGenerationAndDAG tests parsing, autoinclude generation,