chore: parse improvements

Author: denis256

internal/hclparse/fuzz_test.go

@@ -7,7 +7,6 @@ import (
 	"github.com/gruntwork-io/terragrunt/internal/vfs"
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/hclsyntax"
-	"github.com/stretchr/testify/require"
 	"github.com/zclconf/go-cty/cty"
 )
 
@@ -182,8 +181,8 @@ dependency "b" { config_path = "../b" }`,
 		fs := vfs.NewMemMapFS()
 
 		dir := "/fuzz/unit"
-		require.NoError(t, fs.MkdirAll(dir, 0755))
-		require.NoError(t, vfs.WriteFile(fs, dir+"/terragrunt.autoinclude.hcl", []byte(input), 0644))
+		_ = fs.MkdirAll(dir, 0755)
+		_ = vfs.WriteFile(fs, dir+"/terragrunt.autoinclude.hcl", []byte(input), 0644)
 
 		_, _ = hclparse.AutoIncludeDependencyPaths(fs, dir)
 	})
@@ -229,7 +228,6 @@ func FuzzNestedStackPath(f *testing.F) {
 	f.Add("infra", "deep", "vpc", "db")
 	f.Add("network", "storage", "subnet", "bucket")
 	f.Add("a", "b", "c", "d")
-	f.Add("", "", "", "")
 	f.Add("path", "name", "source", "autoinclude")
 
 	f.Fuzz(func(t *testing.T, stackName, nestedStackName, unitName, nestedUnitName string) {

internal/hclparse/panic_test.go

@@ -1,6 +1,7 @@
 package hclparse_test
 
 import (
+	"fmt"
 	"testing"
 
 	"github.com/gruntwork-io/terragrunt/internal/hclparse"
@@ -11,17 +12,15 @@ import (
 
 // assertPanicsContaining asserts the given call panics with a message
 // containing the expected substring. Uses Contains so the descriptive
-// panic texts remain flexible to small wording edits.
+// panic texts remain flexible to small wording edits. fmt.Sprint handles
+// string, error, fmt.Stringer, and arbitrary panic values uniformly.
 func assertPanicsContaining(t *testing.T, want string, fn func()) {
 	t.Helper()
 
 	defer func() {
 		r := recover()
 		require.NotNil(t, r, "expected panic containing %q, got no panic", want)
-
-		msg, ok := r.(string)
-		require.True(t, ok, "panic value is not a string: %v", r)
-		assert.Contains(t, msg, want)
+		assert.Contains(t, fmt.Sprint(r), want)
 	}()
 
 	fn()

internal/hclparse/parse.go

@@ -416,6 +416,10 @@ func buildStackRefsWithAbsPath(fs vfs.FS, stackDir string, stackTargetDir string
 	for _, s := range stacks {
 		stackGenPath := filepath.Join(stackTargetDir, s.Path)
 
+		if s.NoStack != nil && *s.NoStack {
+			stackGenPath = filepath.Join(filepath.Dir(stackTargetDir), s.Path)
+		}
+
 		ref := ComponentRef{
 			Name: s.Name,
 			Path: stackGenPath,

internal/hclparse/parse_test.go

@@ -585,6 +585,64 @@ unit "app" {
 	assert.Equal(t, expectedPath, resolved.Dependencies[0].ConfigPath)
 }
 
+// TestParseStackFile_TopLevelStackNoDotTerragruntStack verifies that a top-level
+// stack block with no_dot_terragrunt_stack = true resolves stack.<name>.path to
+// <stackDir>/<s.Path> (not <stackDir>/.terragrunt-stack/<s.Path>), matching the
+// behavior of resolveDestPath in pkg/config/stack.go.
+func TestParseStackFile_TopLevelStackNoDotTerragruntStack(t *testing.T) {
+	t.Parallel()
+
+	fs := vfs.NewMemMapFS()
+
+	require.NoError(t, fs.MkdirAll("/project/catalog/stacks/networking", 0755))
+	require.NoError(t, vfs.WriteFile(fs, "/project/catalog/stacks/networking/terragrunt.stack.hcl", []byte(`
+unit "vpc" {
+  source = "../../units/vpc"
+  path   = "vpc"
+}
+`), 0644))
+
+	parentStackDir := "/project/live"
+
+	require.NoError(t, fs.MkdirAll(parentStackDir, 0755))
+
+	parentSrc := `
+stack "networking" {
+  source                  = "../catalog/stacks/networking"
+  path                    = "networking"
+  no_dot_terragrunt_stack = true
+}
+
+unit "app" {
+  source = "../catalog/units/app"
+  path   = "app"
+
+  autoinclude {
+    dependency "net" {
+      config_path = stack.networking.path
+    }
+  }
+}
+`
+	parentStackFile := filepath.Join(parentStackDir, "terragrunt.stack.hcl")
+	require.NoError(t, vfs.WriteFile(fs, parentStackFile, []byte(parentSrc), 0644))
+
+	result, err := hclparse.ParseStackFile(fs, &hclparse.ParseStackFileInput{
+		Src:      []byte(parentSrc),
+		Filename: parentStackFile,
+		StackDir: parentStackDir,
+	})
+	require.NoError(t, err)
+
+	resolved, ok := result.AutoIncludes[hclparse.AutoIncludeKey("unit", "app")]
+	require.True(t, ok)
+	require.Len(t, resolved.Dependencies, 1)
+
+	// Must resolve directly under parentStackDir, bypassing .terragrunt-stack/.
+	expectedPath := filepath.Join(parentStackDir, "networking")
+	assert.Equal(t, expectedPath, resolved.Dependencies[0].ConfigPath)
+}
+
 func TestParseStackFile_LocalsCycle(t *testing.T) {
 	t.Parallel()
 

test/integration_stack_dependencies_test.go

@@ -38,7 +38,8 @@ func TestStackDepsAutoIncludeGenerationAndDAG(t *testing.T) {
 	helpers.CleanupTerraformFolder(t, testFixtureStackDepsAutoInclude)
 	tmpEnvPath := helpers.CopyEnvironment(t, testFixtureStackDepsAutoInclude)
 	liveDir := filepath.Join(tmpEnvPath, testFixtureStackDepsAutoInclude, "live")
-	liveDir, _ = filepath.EvalSymlinks(liveDir)
+	liveDir, err := filepath.EvalSymlinks(liveDir)
+	require.NoError(t, err)
 
 	stackFile := filepath.Join(liveDir, "terragrunt.stack.hcl")
 
@@ -154,7 +155,8 @@ func TestStackDepsDAGExpandsStackToUnits(t *testing.T) {
 	helpers.CleanupTerraformFolder(t, testFixtureStackDepsStackRef)
 	tmpEnvPath := helpers.CopyEnvironment(t, testFixtureStackDepsStackRef)
 	liveDir := filepath.Join(tmpEnvPath, testFixtureStackDepsStackRef, "live")
-	liveDir, _ = filepath.EvalSymlinks(liveDir)
+	liveDir, err := filepath.EvalSymlinks(liveDir)
+	require.NoError(t, err)
 
 	stackFile := filepath.Join(liveDir, "terragrunt.stack.hcl")
 
@@ -274,6 +276,10 @@ func TestStackDepsE2EChain(t *testing.T) {
 	assert.Equal(t, "unit-b received: from-c", string(contentB))
 
 	helpers.RunTerragrunt(t, "terragrunt run --all --non-interactive --experiment stack-dependencies --working-dir "+rootPath+" -- destroy -auto-approve")
+
+	// Destroy must remove the marker files produced by apply.
+	assert.NoFileExists(t, markerA[0])
+	assert.NoFileExists(t, markerB[0])
 }
 
 // TestStackDepsE2ECrossStack tests stack generation with cross-stack dependencies:
@@ -327,7 +333,8 @@ func TestStackDepsDocExample_UnitInStack(t *testing.T) {
 	helpers.CleanupTerraformFolder(t, testFixtureStackDepsUnitInStack)
 	tmpEnvPath := helpers.CopyEnvironment(t, testFixtureStackDepsUnitInStack)
 	liveDir := filepath.Join(tmpEnvPath, testFixtureStackDepsUnitInStack, "live")
-	liveDir, _ = filepath.EvalSymlinks(liveDir)
+	liveDir, err := filepath.EvalSymlinks(liveDir)
+	require.NoError(t, err)
 
 	stackFile := filepath.Join(liveDir, "terragrunt.stack.hcl")
 
@@ -373,7 +380,8 @@ func TestStackDepsDocExample_EntireStack(t *testing.T) {
 	helpers.CleanupTerraformFolder(t, testFixtureStackDepsEntireStack)
 	tmpEnvPath := helpers.CopyEnvironment(t, testFixtureStackDepsEntireStack)
 	liveDir := filepath.Join(tmpEnvPath, testFixtureStackDepsEntireStack, "live")
-	liveDir, _ = filepath.EvalSymlinks(liveDir)
+	liveDir, err := filepath.EvalSymlinks(liveDir)
+	require.NoError(t, err)
 
 	stackFile := filepath.Join(liveDir, "terragrunt.stack.hcl")
 
@@ -428,7 +436,8 @@ func TestStackDepsDocExample_NestedStackPath(t *testing.T) {
 	helpers.CleanupTerraformFolder(t, testFixtureStackDepsNestedStack)
 	tmpEnvPath := helpers.CopyEnvironment(t, testFixtureStackDepsNestedStack)
 	liveDir := filepath.Join(tmpEnvPath, testFixtureStackDepsNestedStack, "live")
-	liveDir, _ = filepath.EvalSymlinks(liveDir)
+	liveDir, err := filepath.EvalSymlinks(liveDir)
+	require.NoError(t, err)
 
 	stackFile := filepath.Join(liveDir, "terragrunt.stack.hcl")
 
@@ -507,6 +516,7 @@ func TestStackDepsFindJSON(t *testing.T) {
 
 	// Find the unit-w-inputs component and verify its dependency
 	foundInputs := false
+	foundOutputs := false
 
 	for _, c := range components {
 		if c.Type != "unit" {
@@ -521,11 +531,14 @@ func TestStackDepsFindJSON(t *testing.T) {
 		}
 
 		if strings.HasSuffix(c.Path, "unit-w-outputs") {
+			foundOutputs = true
+
 			assert.Empty(t, c.Dependencies)
 		}
 	}
 
 	require.True(t, foundInputs, "unit-w-inputs should be in find output")
+	require.True(t, foundOutputs, "unit-w-outputs should be in find output")
 }
 
 // TestStackDepsFindDAG verifies that terragrunt find --dag lists units in
@@ -807,4 +820,8 @@ func TestStackDepsE2ETree(t *testing.T) {
 	assert.Equal(t, "unit-a(from-b(from-d,from-e),from-c)", string(contentA))
 
 	helpers.RunTerragrunt(t, "terragrunt run --all --non-interactive --experiment stack-dependencies --working-dir "+rootPath+" -- destroy -auto-approve")
+
+	// Destroy must remove the marker files produced by apply.
+	assert.NoFileExists(t, markerA[0])
+	assert.NoFileExists(t, markerB[0])
 }