fix: Using better designed reset for dependency config path

Author: yhakbar

pkg/config/dependency.go

@@ -307,12 +307,11 @@ func decodeDependencies(ctx context.Context, pctx *ParsingContext, l log.Logger,
 			l.Debugf("Reading Terragrunt config file at %s", util.RelPathForLog(pctx.RootWorkingDir, depPath, pctx.Writers.LogShowAbsPaths))
 		}
 
-		_, depCtx, err := pctx.WithConfigPath(l, depPath)
+		_, depCtx, err := pctx.WithDependencyConfigPath(l, depPath)
 		if err != nil {
 			return nil, err
 		}
 
-		depCtx.OriginalTerragruntConfigPath = depPath
 		depCtx.DownloadDir = filepath.Join(filepath.Dir(depPath), util.TerragruntCacheDir)
 
 		if depCtx.IAMRoleOptions != depCtx.OriginalIAMRoleOptions {
@@ -394,13 +393,11 @@ func checkForDependencyBlockCycles(ctx context.Context, pctx *ParsingContext, l
 
 		dependencyPath := getCleanedTargetConfigPath(dependency.ConfigPath.AsString(), configPath)
 
-		l, dependencyContext, err := pctx.WithConfigPath(l, dependencyPath)
+		l, dependencyContext, err := pctx.WithDependencyConfigPath(l, dependencyPath)
 		if err != nil {
 			return err
 		}
 
-		dependencyContext.OriginalTerragruntConfigPath = dependencyPath
-
 		if err := checkForDependencyBlockCyclesUsingDFS(ctx, dependencyContext, l, dependencyPath, &visitedPaths, &currentTraversalPaths); err != nil {
 			return err
 		}
@@ -439,13 +436,11 @@ func checkForDependencyBlockCyclesUsingDFS(
 	for _, dependency := range dependencyPaths {
 		dependencyPath := getCleanedTargetConfigPath(dependency, dependencyPath)
 
-		l, dependencyContext, err := pctx.WithConfigPath(l, dependencyPath)
+		l, dependencyContext, err := pctx.WithDependencyConfigPath(l, dependencyPath)
 		if err != nil {
 			return err
 		}
 
-		dependencyContext.OriginalTerragruntConfigPath = dependencyPath
-
 		if err := checkForDependencyBlockCyclesUsingDFS(ctx, dependencyContext, l, dependencyPath, visitedPaths, currentTraversalPaths); err != nil {
 			return err
 		}
@@ -765,14 +760,12 @@ func getOutputJSONWithCaching(ctx context.Context, pctx *ParsingContext, l log.L
 // by directly pulling down the state file. Otherwise, terragrunt will fallback to running `terragrunt output` on the
 // target module.
 func getTerragruntOutputJSON(ctx context.Context, pctx *ParsingContext, l log.Logger, targetConfig string) ([]byte, error) {
-	// Create dependency context using WithConfigPath
-	l, pctx, err := pctx.WithConfigPath(l, targetConfig)
+	l, pctx, err := pctx.WithDependencyConfigPath(l, targetConfig)
 	if err != nil {
 		return nil, err
 	}
 
 	// Set dependency-specific fields
-	pctx.OriginalTerragruntConfigPath = targetConfig
 	pctx.ForwardTFStdout = false
 	pctx.CheckDependentUnits = false
 	pctx.TerraformCommand = "output"

pkg/config/parsing_context.go

@@ -227,6 +227,11 @@ func (ctx *ParsingContext) WithIncrementedDepth() (*ParsingContext, error) {
 // WithConfigPath returns a new ParsingContext with the config path updated.
 // It normalizes the path to an absolute path, updates WorkingDir to the directory
 // containing the config, and adjusts the logger's working directory field if it changed.
+//
+// OriginalTerragruntConfigPath is intentionally NOT updated — this is correct
+// when reading a config from another (e.g. read_terragrunt_config), where the
+// "original" caller should be preserved. For parsing a dependency as a standalone
+// unit, use WithDependencyConfigPath instead.
 func (ctx *ParsingContext) WithConfigPath(l log.Logger, configPath string) (log.Logger, *ParsingContext, error) {
 	configPath = filepath.Clean(configPath)
 	if !filepath.IsAbs(configPath) {
@@ -245,3 +250,18 @@ func (ctx *ParsingContext) WithConfigPath(l log.Logger, configPath string) (log.
 
 	return l, c, nil
 }
+
+// WithDependencyConfigPath returns a new ParsingContext for parsing a dependency
+// as a standalone unit. Unlike WithConfigPath, this also resets
+// OriginalTerragruntConfigPath so that get_original_terragrunt_dir() resolves
+// relative to the dependency, not the caller.
+func (ctx *ParsingContext) WithDependencyConfigPath(l log.Logger, configPath string) (log.Logger, *ParsingContext, error) {
+	l, c, err := ctx.WithConfigPath(l, configPath)
+	if err != nil {
+		return l, nil, err
+	}
+
+	c.OriginalTerragruntConfigPath = c.TerragruntConfigPath
+
+	return l, c, nil
+}