fix: fixed parsing of configs

Author: denis256

internal/discovery/helpers.go

@@ -12,6 +12,9 @@ import (
 	intHclparse "github.com/gruntwork-io/terragrunt/internal/hclparse"
 	"github.com/gruntwork-io/terragrunt/internal/util"
 	"github.com/gruntwork-io/terragrunt/pkg/config"
+	"github.com/hashicorp/hcl/v2"
+	"github.com/hashicorp/hcl/v2/hclsyntax"
+	"github.com/zclconf/go-cty/cty"
 )
 
 const (
@@ -221,6 +224,8 @@ func sanitizeReadFiles(files []string) []string {
 }
 
 // extractDependencyPaths extracts all dependency paths from a Terragrunt configuration.
+// It also checks for terragrunt.autoinclude.hcl in the same directory and extracts
+// dependency config_path values from it, so the DAG correctly orders units.
 func extractDependencyPaths(cfg *config.TerragruntConfig, c component.Component) ([]string, error) {
 	if cfg == nil {
 		return nil, nil
@@ -233,6 +238,12 @@ func extractDependencyPaths(cfg *config.TerragruntConfig, c component.Component)
 
 	deduped := make(map[string]struct{}, maxDedupLen)
 
+	// Check for autoinclude file and extract its dependency paths for the DAG.
+	autoIncludeDeps := extractAutoIncludeDependencyPaths(c.Path())
+	for _, dep := range autoIncludeDeps {
+		deduped[dep] = struct{}{}
+	}
+
 	errs := make([]error, 0, maxDedupLen)
 
 	for _, dependency := range cfg.TerragruntDependencies {
@@ -326,3 +337,59 @@ func ExtractUnitPathsFromStackFile(data []byte, stackDir string) []string {
 
 	return paths
 }
+
+// extractAutoIncludeDependencyPaths checks for a terragrunt.autoinclude.hcl file
+// in the given unit directory and extracts dependency config_path values.
+// This ensures the DAG sees dependencies defined in autoinclude files during
+// graph construction, even though they're not in the main terragrunt.hcl.
+func extractAutoIncludeDependencyPaths(unitDir string) []string {
+	autoIncludePath := filepath.Join(unitDir, config.DefaultAutoIncludeFile)
+
+	if !util.FileExists(autoIncludePath) {
+		return nil
+	}
+
+	data, err := os.ReadFile(autoIncludePath)
+	if err != nil {
+		return nil
+	}
+
+	// Minimal HCL parse — just extract dependency blocks and their config_path.
+	file, diags := hclsyntax.ParseConfig(data, autoIncludePath, hcl.Pos{Line: 1, Column: 1})
+	if diags.HasErrors() {
+		return nil
+	}
+
+	body, ok := file.Body.(*hclsyntax.Body)
+	if !ok {
+		return nil
+	}
+
+	var paths []string
+
+	for _, block := range body.Blocks {
+		if block.Type != "dependency" || len(block.Labels) == 0 {
+			continue
+		}
+
+		configPathAttr, exists := block.Body.Attributes["config_path"]
+		if !exists {
+			continue
+		}
+
+		// Evaluate config_path — it's already a resolved string literal in the generated file.
+		val, valDiags := configPathAttr.Expr.Value(nil)
+		if valDiags.HasErrors() || val.Type() != cty.String {
+			continue
+		}
+
+		depPath := val.AsString()
+		if !filepath.IsAbs(depPath) {
+			depPath = filepath.Clean(filepath.Join(unitDir, depPath))
+		}
+
+		paths = append(paths, util.ResolvePath(depPath))
+	}
+
+	return paths
+}

pkg/config/config.go

@@ -1459,7 +1459,18 @@ func mergeAutoIncludeIfPresent(
 
 	l.Debugf("Found %s, auto-merging into unit config", autoIncludePath)
 
-	autoIncludeConfig, err := ParseConfigFile(ctx, pctx, l, autoIncludePath, nil)
+	// Clone the parsing context and reset DecodedDependencies so the
+	// autoinclude file gets its own dependency resolution pass.
+	//
+	// PartialParseDecodeList is intentionally inherited from the parent:
+	// - During DAG construction (partial mode): extracts dependency config_path
+	//   for graph ordering WITHOUT resolving outputs (which aren't available yet)
+	// - During actual unit run (full mode): resolves dependency outputs normally
+	//   because the DAG already ensured dependencies ran first
+	autoIncludePctx := pctx.Clone()
+	autoIncludePctx.DecodedDependencies = nil
+
+	autoIncludeConfig, err := ParseConfigFile(ctx, autoIncludePctx, l, autoIncludePath, nil)
 	if err != nil {
 		return nil, errors.Errorf("failed to parse %s: %w", autoIncludePath, err)
 	}

pkg/config/stack.go

@@ -18,6 +18,7 @@ import (
 
 	"github.com/hashicorp/go-getter/v2"
 
+	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/hclsyntax"
 
 	"github.com/gruntwork-io/terragrunt/internal/util"
@@ -39,9 +40,16 @@ const (
 
 // StackConfigFile represents the structure of terragrunt.stack.hcl stack file.
 type StackConfigFile struct {
-	Locals *terragruntLocal `hcl:"locals,block"`
-	Stacks []*Stack         `hcl:"stack,block"`
-	Units  []*Unit          `hcl:"unit,block"`
+	Locals   *terragruntLocal    `hcl:"locals,block"`
+	Includes []*StackIncludeFile `hcl:"include,block"`
+	Stacks   []*Stack            `hcl:"stack,block"`
+	Units    []*Unit             `hcl:"unit,block"`
+}
+
+// StackIncludeFile represents an include block in a stack file.
+type StackIncludeFile struct {
+	Name string `hcl:",label"`
+	Path string `hcl:"path,attr"`
 }
 
 // StackConfig represents the structure of terragrunt.stack.hcl stack file.
@@ -53,6 +61,7 @@ type StackConfig struct {
 
 // Unit represents unit from a stack file.
 type Unit struct {
+	Remain       hcl.Body   `hcl:",remain"`
 	NoStack      *bool      `hcl:"no_dot_terragrunt_stack,attr"`
 	NoValidation *bool      `hcl:"no_validation,attr"`
 	Values       *cty.Value `hcl:"values,attr"`
@@ -63,6 +72,7 @@ type Unit struct {
 
 // Stack represents the stack block in the configuration.
 type Stack struct {
+	Remain       hcl.Body   `hcl:",remain"`
 	NoStack      *bool      `hcl:"no_dot_terragrunt_stack,attr"`
 	NoValidation *bool      `hcl:"no_validation,attr"`
 	Values       *cty.Value `hcl:"values,attr"`