Merge branch 'main' into fix/addressing-stack-run

Author: yhakbar

config/stack.go

@@ -214,7 +214,7 @@ func StackOutput(ctx context.Context, l log.Logger, opts *options.TerragruntOpti
 		}
 
 		for _, unit := range stackFile.Units {
-			unitDir := filepath.Join(dir, StackDir, unit.Path)
+			unitDir := getUnitDir(dir, unit)
 
 			var output map[string]cty.Value
 
@@ -1027,3 +1027,12 @@ func CleanStacks(_ context.Context, l log.Logger, opts *options.TerragruntOption
 
 	return errs.ErrorOrNil()
 }
+
+// getUnitDir returns the directory path for a unit based on its no_dot_terragrunt_stack setting.
+func getUnitDir(dir string, unit *Unit) string {
+	if unit.NoStack != nil && *unit.NoStack {
+		return filepath.Join(dir, unit.Path)
+	}
+
+	return filepath.Join(dir, StackDir, unit.Path)
+}

docs-starlight/astro.config.mjs

@@ -79,6 +79,10 @@ export default defineConfig({
   }),
   integrations: [starlight({
     title: "Terragrunt",
+    editLink: {
+      // TODO: update this once the docs live in `docs`.
+      baseUrl: "https://github.com/gruntwork-io/terragrunt/edit/main/docs-starlight",
+    },
     customCss: ["./src/styles/global.css"],
     head: [
       {

internal/discovery/discovery.go

@@ -9,6 +9,8 @@ import (
 	"sort"
 	"strings"
 
+	"github.com/gruntwork-io/terragrunt/config/hclparse"
+
 	"github.com/gruntwork-io/terragrunt/internal/experiment"
 	"github.com/gruntwork-io/terragrunt/util"
 
@@ -18,6 +20,7 @@ import (
 	"github.com/gruntwork-io/terragrunt/internal/errors"
 	"github.com/gruntwork-io/terragrunt/options"
 	"github.com/gruntwork-io/terragrunt/pkg/log"
+	"github.com/hashicorp/hcl/v2"
 	"github.com/zclconf/go-cty/cty"
 )
 
@@ -248,6 +251,26 @@ func (c *DiscoveredConfig) Parse(ctx context.Context, l log.Logger, opts *option
 		config.ExcludeBlock,
 	)
 
+	if suppressParseErrors {
+		// If suppressing parse errors, we want to filter diagnostics that contain references to outputs,
+		// while leaving other diagnostics as is.
+		parseOptions := append(parsingCtx.ParserOptions, hclparse.WithDiagnosticsHandler(func(file *hcl.File, hclDiags hcl.Diagnostics) (hcl.Diagnostics, error) {
+			filteredDiags := hcl.Diagnostics{}
+
+			for _, hclDiag := range hclDiags {
+				containsOutputRef := strings.Contains(strings.ToLower(hclDiag.Summary), "output") ||
+					strings.Contains(strings.ToLower(hclDiag.Detail), "output")
+
+				if !containsOutputRef {
+					filteredDiags = append(filteredDiags, hclDiag)
+				}
+			}
+
+			return filteredDiags, nil
+		}))
+		parsingCtx = parsingCtx.WithParseOption(parseOptions)
+	}
+
 	//nolint: contextcheck
 	cfg, err := config.ParseConfigFile(parsingCtx, l, parseOpts.TerragruntConfigPath, nil)
 	if err != nil {

test/fixtures/runner-pool-remote-source/unit-a/terragrunt.hcl

@@ -0,0 +1,3 @@
+terraform {
+    source = "github.com/gruntwork-io/terragrunt.git//test/fixtures/fail-fast/unit-a?ref=v0.84.1"
+}

test/fixtures/runner-pool-remote-source/unit-b/terragrunt.hcl

@@ -0,0 +1,14 @@
+terraform {
+  source = "github.com/gruntwork-io/terragrunt.git//test/fixtures/fail-fast/unit-a?ref=v0.84.1"
+}
+
+dependency "unit-a" {
+  config_path = "../unit-a"
+  mock_outputs = {
+    data = "test-data"
+  }
+}
+
+inputs = {
+  data = dependency.unit-a.outputs.data
+}

test/fixtures/stacks/no-dot-terragrunt-stack-output/live/terragrunt.stack.hcl

@@ -0,0 +1,5 @@
+unit "app1" {
+  source                  = "../units/app1"
+  path                    = "app1"
+  no_dot_terragrunt_stack = true
+}

test/fixtures/stacks/no-dot-terragrunt-stack-output/units/app1/main.tf

@@ -0,0 +1,12 @@
+terraform {
+  required_version = ">= 0.13"
+}
+
+variable "name" {
+  description = "Name of the application"
+  type        = string
+}
+
+output "name" {
+  value = var.name
+}

test/fixtures/stacks/no-dot-terragrunt-stack-output/units/app1/terragrunt.hcl

@@ -0,0 +1,7 @@
+terraform {
+  source = "."
+}
+
+inputs = {
+  name = "app1"
+}

test/integration_runner_pool_test.go

@@ -13,8 +13,9 @@ import (
 )
 
 const (
-	testFixtureMixedConfig = "fixtures/mixed-config"
-	testFixtureFailFast    = "fixtures/fail-fast"
+	testFixtureMixedConfig            = "fixtures/mixed-config"
+	testFixtureFailFast               = "fixtures/fail-fast"
+	testFixtureRunnerPoolRemoteSource = "fixtures/runner-pool-remote-source"
 )
 
 func TestRunnerPoolDiscovery(t *testing.T) {
@@ -119,9 +120,13 @@ func TestRunnerPoolDestroyFailFast(t *testing.T) {
 	tmpEnvPath := helpers.CopyEnvironment(t, testFixtureFailFast)
 	testPath := util.JoinPath(tmpEnvPath, testFixtureFailFast)
 
-	_, _, err := helpers.RunTerragruntCommandWithOutput(t, "terragrunt run --all --non-interactive --experiment runner-pool --fail-fast --working-dir "+testPath+"  -- apply")
+	_, stdout, err := helpers.RunTerragruntCommandWithOutput(t, "terragrunt run --all --non-interactive --experiment runner-pool --fail-fast --working-dir "+testPath+"  -- apply")
 	require.NoError(t, err)
 
+	// Verify that there are no parsing errors in the output
+	require.NotContains(t, stdout, "Error: Unsupported block type")
+	require.NotContains(t, stdout, "This object does not have an attribute named \"outputs\"")
+
 	// create fail.txt in unit-a to trigger a failure
 	helpers.CreateFile(t, testPath, "unit-b", "fail.txt")
 	stdout, stderr, _ := helpers.RunTerragruntCommandWithOutput(t, "terragrunt run --all --non-interactive --experiment runner-pool --fail-fast --working-dir "+testPath+"  -- destroy")
@@ -147,3 +152,16 @@ func TestRunnerPoolDestroyDependencies(t *testing.T) {
 	assert.Contains(t, stdout, "unit-a tf-path="+wrappedBinary()+" msg=Destroy complete! Resources: 1 destroyed.")
 
 }
+
+func TestRunnerPoolRemoteSource(t *testing.T) {
+	t.Parallel()
+
+	helpers.CleanupTerraformFolder(t, testFixtureRunnerPoolRemoteSource)
+	tmpEnvPath := helpers.CopyEnvironment(t, testFixtureRunnerPoolRemoteSource)
+	testPath := util.JoinPath(tmpEnvPath, testFixtureRunnerPoolRemoteSource)
+
+	stdout, _, err := helpers.RunTerragruntCommandWithOutput(t, "terragrunt run --all --non-interactive --log-level debug --experiment runner-pool --working-dir "+testPath+"  -- apply")
+	require.NoError(t, err)
+	// Verify that the output contains value produced from remote unit
+	require.Contains(t, stdout, "data = \"unit-a\"")
+}

test/integration_stacks_test.go

@@ -49,6 +49,7 @@ const (
 	testFixtureStackNoValidation               = "fixtures/stacks/no-validation"
 	testFixtureStackTerragruntDir              = "fixtures/stacks/terragrunt-dir"
 	testFixtureStacksAllNoStackDir             = "fixtures/stacks/all-no-stack-dir"
+	testFixtureStackNoDotTerragruntStackOutput = "fixtures/stacks/no-dot-terragrunt-stack-output"
 )
 
 func TestStacksGenerateBasic(t *testing.T) {
@@ -1333,3 +1334,24 @@ func TestStackRunAllNoStackDir(t *testing.T) {
 	assert.Contains(t, stdout, "Changes to Outputs:")
 	assert.Contains(t, stdout, "+ test = \"value\"")
 }
+
+func TestStackOutputWithNoDotTerragruntStack(t *testing.T) {
+	t.Parallel()
+
+	helpers.CleanupTerraformFolder(t, testFixtureStackNoDotTerragruntStackOutput)
+	tmpEnvPath := helpers.CopyEnvironment(t, testFixtureStackNoDotTerragruntStackOutput)
+	rootPath := util.JoinPath(tmpEnvPath, testFixtureStackNoDotTerragruntStackOutput, "live")
+
+	helpers.RunTerragrunt(t, "terragrunt stack generate --working-dir "+rootPath)
+
+	unitPath := util.JoinPath(rootPath, "app1")
+	helpers.RunTerragrunt(t, "terragrunt apply -auto-approve --non-interactive --working-dir "+unitPath)
+
+	stdout, _, err := helpers.RunTerragruntCommandWithOutput(
+		t,
+		"terragrunt stack output --non-interactive --working-dir "+rootPath,
+	)
+	require.NoError(t, err)
+
+	assert.Contains(t, stdout, "name = \"app1\"")
+}