fix: Fixing TestTerragruntWorksWithNonDefaultConfigNamesAndRunAllCommand

Author: yhakbar

internal/runner/runnerpool/helpers_test.go

@@ -21,7 +21,7 @@ func TestBuildCanonicalConfigPath_DirectoryPath(t *testing.T) {
 	tmpDir := t.TempDir()
 	unit := component.NewUnit(tmpDir)
 
-	canonicalPath, canonicalDir, err := buildCanonicalConfigPath(unit, tmpDir)
+	canonicalPath, canonicalDir, err := buildCanonicalConfigPath(unit, tmpDir, config.DefaultTerragruntConfigPath)
 
 	require.NoError(t, err)
 	assert.Equal(t, filepath.Join(tmpDir, config.DefaultTerragruntConfigPath), canonicalPath)
@@ -36,7 +36,7 @@ func TestBuildCanonicalConfigPath_HCLSuffix(t *testing.T) {
 	configPath := filepath.Join(tmpDir, "terragrunt.hcl")
 	unit := component.NewUnit(configPath)
 
-	canonicalPath, canonicalDir, err := buildCanonicalConfigPath(unit, tmpDir)
+	canonicalPath, canonicalDir, err := buildCanonicalConfigPath(unit, tmpDir, config.DefaultTerragruntConfigPath)
 
 	require.NoError(t, err)
 	assert.Equal(t, configPath, canonicalPath)
@@ -50,7 +50,7 @@ func TestBuildCanonicalConfigPath_JSONSuffix(t *testing.T) {
 	configPath := filepath.Join(tmpDir, "terragrunt.hcl.json")
 	unit := component.NewUnit(configPath)
 
-	canonicalPath, canonicalDir, err := buildCanonicalConfigPath(unit, tmpDir)
+	canonicalPath, canonicalDir, err := buildCanonicalConfigPath(unit, tmpDir, config.DefaultTerragruntConfigPath)
 
 	require.NoError(t, err)
 	assert.Equal(t, configPath, canonicalPath)
@@ -66,7 +66,7 @@ func TestBuildCanonicalConfigPath_RelativePath(t *testing.T) {
 
 	unit := component.NewUnit("subdir")
 
-	canonicalPath, canonicalDir, err := buildCanonicalConfigPath(unit, tmpDir)
+	canonicalPath, canonicalDir, err := buildCanonicalConfigPath(unit, tmpDir, config.DefaultTerragruntConfigPath)
 
 	require.NoError(t, err)
 	assert.Equal(t, filepath.Join(subDir, config.DefaultTerragruntConfigPath), canonicalPath)

internal/runner/runnerpool/runner.go

@@ -40,15 +40,22 @@ type Runner struct {
 }
 
 // buildCanonicalConfigPath computes the canonical config path for a unit.
-// It handles .hcl/.json suffixes, joins DefaultTerragruntConfigPath when needed,
+// It handles .hcl/.json suffixes, joins an appropriate config filename when needed,
 // converts to canonical absolute path, and updates the unit's path.
 // Returns the canonical config path and the canonical unit directory.
-func buildCanonicalConfigPath(unit *component.Unit, basePath string) (canonicalConfigPath string, canonicalDir string, err error) {
-	// Discovery paths are directories (e.g., "./other") not files
-	// We need to append the config filename to get the full config path
+func buildCanonicalConfigPath(
+	unit *component.Unit,
+	basePath string,
+	configFileName string,
+) (canonicalConfigPath string, canonicalDir string, err error) {
 	terragruntConfigPath := unit.Path()
 	if !strings.HasSuffix(terragruntConfigPath, ".hcl") && !strings.HasSuffix(terragruntConfigPath, ".json") {
-		terragruntConfigPath = filepath.Join(unit.Path(), config.DefaultTerragruntConfigPath)
+		fileName := config.DefaultTerragruntConfigPath
+		if configFileName != "" && configFileName != "." {
+			fileName = configFileName
+		}
+
+		terragruntConfigPath = filepath.Join(unit.Path(), fileName)
 	}
 
 	// Convert to canonical absolute path - this is critical for dependency resolution
@@ -152,6 +159,10 @@ func resolveUnitsFromDiscovery(
 	}
 
 	basePath := stack.Path()
+	configFileName := config.DefaultTerragruntConfigPath
+	if stack.Execution != nil && stack.Execution.TerragruntOptions != nil {
+		configFileName = filepath.Base(stack.Execution.TerragruntOptions.TerragruntConfigPath)
+	}
 
 	for _, c := range discovered {
 		unit, ok := c.(*component.Unit)
@@ -160,7 +171,7 @@ func resolveUnitsFromDiscovery(
 		}
 
 		// Build canonical config path and update unit path
-		canonicalConfigPath, canonicalDir, err := buildCanonicalConfigPath(unit, basePath)
+		canonicalConfigPath, canonicalDir, err := buildCanonicalConfigPath(unit, basePath, configFileName)
 		if err != nil {
 			return nil, err
 		}
@@ -861,22 +872,22 @@ func FilterDiscoveredUnits(discovered component.Components, units []*component.U
 
 		// Add any missing allowed dependencies from the resolved unit graph
 		for _, dep := range u.Dependencies() {
-			depUnit, ok := dep.(*component.Unit)
-			if !ok || depUnit == nil {
+			depUnit, okDep := dep.(*component.Unit)
+			if !okDep || depUnit == nil {
 				continue
 			}
 
-			if _, ok := allowed[depUnit.Path()]; !ok {
+			if _, allowedOK := allowed[depUnit.Path()]; !allowedOK {
 				continue
 			}
 
-			if _, ok := existing[depUnit.Path()]; ok {
+			if _, existsOK := existing[depUnit.Path()]; existsOK {
 				continue
 			}
 
 			// Ensure the dependency config exists in the filtered set
-			depCfg, ok := present[depUnit.Path()]
-			if !ok {
+			depCfg, presentOK := present[depUnit.Path()]
+			if !presentOK {
 				depCfg = component.NewUnit(depUnit.Path())
 				filtered = append(filtered, depCfg)
 				present[depUnit.Path()] = depCfg