Merge branch 'main' into OSS-3409

Author: denis256

.github/pull_request_template.md

@@ -1,4 +1,4 @@
-<!-- Prepend '[WIP]' to the title if this PR is still a work-in-progress. Remove it when it is ready for review! -->
+<!-- Keep this PR in draft while it is still a work-in-progress. Mark it as ready for review once it is ready for review by maintainers. -->
 
 ## Description
 
@@ -14,15 +14,7 @@ Read the [Gruntwork contribution guidelines](https://gruntwork.notion.site/Grunt
 - [ ] I am submitting code based on open source software (e.g. MIT, MPL-2.0, Apache)
 - [ ] I am adding or upgrading a dependency or adapted code and confirm it has a compatible open source license
 - [ ] Update the docs.
+- [ ] Update the changelog in the docs.
 - [ ] Run the relevant tests successfully, including pre-commit checks.
-- [ ] Include release notes. If this PR is backward incompatible, include a migration guide.
-
-## Release Notes (draft)
-
-<!-- One-line description of the PR that can be included in the final release notes. -->
-Added / Removed / Updated [X].
-
-### Migration Guide
-
-<!-- Important: If you made any backward incompatible changes, then you must write a migration guide! -->
-
+- [ ] This change is backwards compatible.
+- [ ] If this change is not forwards compatible (e.g. a new feature), it is gated behind a feature flag.

docs/src/content/docs/01-getting-started/04-terminology.md

@@ -162,7 +162,7 @@ The Run Queue is the queue of all units that Terragrunt will do work on over one
 
 Certain commands like [run --all](/reference/cli/commands/run#all) populate the Run Queue with all units in a stack, while other commands like `plan` or `apply` will only populate the Run Queue with the unit that the command was run in.
 
-Certain flags like [--include-dir](/reference/cli/commands/run#include-dir) can be used to adjust the Run Queue to include additional units. Conversely, there are flags like [--exclude-dir](/reference/cli/commands/run#exclude-dir) that can be used to adjust the Run Queue to exclude units.
+The [`--filter`](/features/filter) flag can be used to adjust the Run Queue, including or excluding units based on filter expressions. For example, `--filter './networking'` includes a specific path, while `--filter '!./legacy'` excludes one.
 
 Terragrunt will always attempt to run until the Run Queue is empty.
 
@@ -213,7 +213,7 @@ By default, Terragrunt will interact with OpenTofu/Terraform in order to retriev
 
 Terragrunt does have the ability to mock outputs, which is useful when dependencies do not yet have outputs to be consumed (e.g. during the run of a unit with a dependency that has not been applied).
 
-Terragrunt also has the ability to fetch outputs without interacting with OpenTofu/Terraform via [--fetch-dependency-output-from-state](/reference/cli/commands/run#fetch-dependency-output-from-state) for dependencies where state is stored in AWS. This is an experimental feature, and more tooling is planned to make this easier to use.
+Terragrunt also has the ability to fetch outputs without interacting with OpenTofu/Terraform via [--dependency-fetch-output-from-state](/reference/cli/commands/run#dependency-fetch-output-from-state) for dependencies where state is stored in AWS. This is an experimental feature, and more tooling is planned to make this easier to use.
 
 ### Feature
 

docs/src/content/docs/02-guides/01-terralith-to-terragrunt/08-step-5-adding-terragrunt.mdx

@@ -39,11 +39,11 @@ Group 1
 ...
 `} />
 
-We can also selectively run the plan for the `dev` environment by changing the working directory to `dev`, or using the [`--queue-include-dir`](https://docs.terragrunt.com/reference/cli-options/#queue-include-dir) flag.
+We can also selectively run the plan for the `dev` environment by changing the working directory to `dev`, or using the [`--filter`](/features/filter) flag.
 
 <Code title="live/dev" lang="bash" frame="terminal" code={`$ terragrunt plan`} />
 
-<Code title="live" lang="bash" frame="terminal" code={`$ terragrunt run --all --queue-include-dir dev plan
+<Code title="live" lang="bash" frame="terminal" code={`$ terragrunt run --all --filter ./dev plan
 15:09:17.090 INFO   The runner at . will be processed in the following order for command plan:
 Group 1
 - Unit ./dev

docs/src/data/changelog/v1.0.4/exclude-include-inheritance.mdx

@@ -0,0 +1,12 @@
+---
+version: "v1.0.4"
+category: "bug-fixes"
+---
+
+#### Fixed `exclude` block being dropped when defined only in an included parent
+
+A unit that pulled in an `exclude` block from an include that did not declare its own `exclude` block saw the include's `exclude` configurations ignored.
+
+Included `exclude` blocks now get properly merged into unit configurations.
+
+Reported in [#5089](https://github.com/gruntwork-io/terragrunt/issues/5089). Thanks to [@HeikoNeblung](https://github.com/HeikoNeblung) for contributing this fix!

internal/cli/commands/catalog/tui/keys.go

@@ -50,7 +50,7 @@ func NewListKeyMap() list.KeyMap {
 			key.WithHelp("esc", "cancel"),
 		),
 		AcceptWhileFiltering: key.NewBinding(
-			key.WithKeys("enter", "tab", "shift+tab", "ctrl+k", "up", "ctrl+j", "down"),
+			key.WithKeys("enter", "tab", "shift+tab", "ctrl+k", "up", "down"),
 			key.WithHelp("enter", "apply filter"),
 		),
 
@@ -102,8 +102,8 @@ func (d DelegateKeyMap) FullHelp() [][]key.Binding {
 func NewDelegateKeyMap() *DelegateKeyMap {
 	return &DelegateKeyMap{
 		Choose: key.NewBinding(
-			key.WithKeys("enter", "ctrl-j"),
-			key.WithHelp("enter/ctrl-j", "choose"),
+			key.WithKeys("enter"),
+			key.WithHelp("enter", "choose"),
 		),
 		Scaffold: key.NewBinding(
 			key.WithKeys("S", "s"),
@@ -205,8 +205,8 @@ func NewPagerKeyMap() PagerKeyMap {
 			key.WithHelp("shift+tab", "navigation"),
 		),
 		Choose: key.NewBinding(
-			key.WithKeys("enter", "ctrl-j"),
-			key.WithHelp("enter/ctrl-j", "choose"),
+			key.WithKeys("enter"),
+			key.WithHelp("enter", "choose"),
 		),
 		Scaffold: key.NewBinding(
 			key.WithKeys("S", "s"),

internal/cli/commands/exec/exec.go

@@ -11,6 +11,7 @@ import (
 	"github.com/gruntwork-io/terragrunt/internal/runner/run"
 	"github.com/gruntwork-io/terragrunt/internal/runner/runcfg"
 	"github.com/gruntwork-io/terragrunt/internal/shell"
+	"github.com/gruntwork-io/terragrunt/internal/vexec"
 	"github.com/gruntwork-io/terragrunt/pkg/log"
 	"github.com/gruntwork-io/terragrunt/pkg/options"
 )
@@ -82,7 +83,7 @@ func runTargetCommand(
 
 	return run.RunActionWithHooks(ctx, l, command, runOpts, cfg, r, func(ctx context.Context) error {
 		_, err := shell.RunCommandWithOutput(
-			ctx, l, configbridge.ShellRunOptsFromOpts(opts), dir, false, false, command, cmdArgs...,
+			ctx, l, vexec.NewOSExec(), configbridge.ShellRunOptsFromOpts(opts), dir, false, false, command, cmdArgs...,
 		)
 		if err != nil {
 			return errors.Errorf("failed to run command in directory %s: %w", dir, err)

internal/cli/commands/run/help.go

@@ -12,6 +12,7 @@ import (
 	"github.com/gruntwork-io/terragrunt/internal/errors"
 	"github.com/gruntwork-io/terragrunt/internal/tf"
 	"github.com/gruntwork-io/terragrunt/internal/util"
+	"github.com/gruntwork-io/terragrunt/internal/vexec"
 	"github.com/gruntwork-io/terragrunt/pkg/log"
 	"github.com/gruntwork-io/terragrunt/pkg/options"
 )
@@ -59,7 +60,7 @@ func runTFHelp(ctx context.Context, cliCtx *clihelper.Context, l log.Logger, opt
 
 	terraformHelpCmd := []string{tf.FlagNameHelpLong, cliCtx.Command.Name}
 
-	out, err := tf.RunCommandWithOutput(ctx, l, configbridge.TFRunOptsFromOpts(opts), terraformHelpCmd...)
+	out, err := tf.RunCommandWithOutput(ctx, l, vexec.NewOSExec(), configbridge.TFRunOptsFromOpts(opts), terraformHelpCmd...)
 	if err != nil {
 		var processError util.ProcessExecutionError
 		if ok := errors.As(err, &processError); ok {

internal/cli/commands/run/run.go

@@ -18,6 +18,7 @@ import (
 	"github.com/gruntwork-io/terragrunt/internal/shell"
 	"github.com/gruntwork-io/terragrunt/internal/tf"
 	"github.com/gruntwork-io/terragrunt/internal/util"
+	"github.com/gruntwork-io/terragrunt/internal/vexec"
 	"github.com/gruntwork-io/terragrunt/pkg/config"
 	"github.com/gruntwork-io/terragrunt/pkg/log"
 	"github.com/gruntwork-io/terragrunt/pkg/options"
@@ -158,7 +159,7 @@ func runVersionCommand(ctx context.Context, l log.Logger, opts *options.Terragru
 		}
 	}
 
-	return tf.RunCommand(ctx, l, configbridge.TFRunOptsFromOpts(opts), opts.TerraformCliArgs.Slice()...)
+	return tf.RunCommand(ctx, l, vexec.NewOSExec(), configbridge.TFRunOptsFromOpts(opts), opts.TerraformCliArgs.Slice()...)
 }
 
 func getTFPathFromConfig(ctx context.Context, l log.Logger, opts *options.TerragruntOptions) (string, error) {

internal/discovery/errors.go

@@ -135,3 +135,22 @@ func NewCoexistenceError(a, b component.Component) error {
 		ConfigFileB:   b.ConfigFile(),
 	})
 }
+
+// StackDependencyExpansionError indicates that a stack dependency path could not be expanded into its constituent unit paths. Wraps the underlying parse error so callers can extract typed details via errors.As.
+type StackDependencyExpansionError struct {
+	Wrapped error
+	DepPath string
+}
+
+func (e StackDependencyExpansionError) Error() string {
+	return fmt.Sprintf("failed to expand stack dependency path %s: %s", e.DepPath, e.Wrapped)
+}
+
+func (e StackDependencyExpansionError) Unwrap() error {
+	return e.Wrapped
+}
+
+// NewStackDependencyExpansionError wraps err with the dependency path that triggered the expansion.
+func NewStackDependencyExpansionError(depPath string, err error) error {
+	return errors.New(StackDependencyExpansionError{DepPath: depPath, Wrapped: err})
+}

internal/discovery/helpers.go

@@ -1,6 +1,7 @@
 package discovery
 
 import (
+	iofs "io/fs"
 	"os"
 	"path/filepath"
 	"slices"
@@ -290,9 +291,21 @@ func stackDependencyPaths(fs vfs.FS, depPaths []string, c component.Component) (
 	expanded := make([]string, 0, len(depPaths))
 
 	for _, depPath := range depPaths {
+		// Stat upfront so a non-directory dep path (e.g. another-name.hcl) is preserved instead of being passed to the parser, which would reject it as ENOTDIR. The duplication of work is intentional.
+		info, statErr := fs.Stat(depPath)
+		// Real I/O errors (permission denied, etc.) must surface so a malformed DAG isn't silently produced; only ENOENT is treated as "keep the raw path".
+		if statErr != nil && !errors.Is(statErr, iofs.ErrNotExist) {
+			return nil, NewStackDependencyExpansionError(depPath, statErr)
+		}
+
+		if statErr != nil || !info.IsDir() {
+			expanded = append(expanded, depPath)
+			continue
+		}
+
 		unitPaths, err := inthclparse.UnitPathsFromStackDir(fs, depPath)
 		if err != nil {
-			return nil, err
+			return nil, NewStackDependencyExpansionError(depPath, err)
 		}
 
 		if len(unitPaths) > 0 {