feat: allow terramate and stack config from multiple files

cmd/terramate/e2etests/stacks_init_test.go

@@ -23,7 +23,6 @@ import (
 	"github.com/madlambda/spells/assert"
 	"github.com/mineiros-io/terramate"
 	"github.com/mineiros-io/terramate/cmd/terramate/cli"
-	"github.com/mineiros-io/terramate/config"
 	"github.com/mineiros-io/terramate/hcl"
 	"github.com/mineiros-io/terramate/test"
 	"github.com/mineiros-io/terramate/test/sandbox"
@@ -217,8 +216,8 @@ func TestStacksInit(t *testing.T) {
 			}
 
 			for _, path := range tc.input {
-				data := test.ReadFile(t, s.RootDir(), filepath.Join(path, config.DefaultFilename))
-				got, err := hcl.Parse("TestInitHCL", data)
+				dir := filepath.Join(s.RootDir(), path)
+				got, err := hcl.ParseDir(dir)
 				assert.NoError(t, err, "parsing terramate file")
 
 				want := hcl.Config{

cmd/terramate/e2etests/stacks_list_test.go

@@ -106,6 +106,16 @@ z/a
 	}
 }
 
+func TestListStackWithDefinitionOnNonDefaultFilename(t *testing.T) {
+	s := sandbox.New(t)
+	s.BuildTree([]string{"d:stack"})
+	stackDir := s.DirEntry("stack")
+	stackDir.CreateFile("stack.tm", "stack {}")
+
+	cli := newCLI(t, s.RootDir())
+	assertRunResult(t, cli.run("stacks", "list"), runExpected{Stdout: "stack\n"})
+}
+
 func TestListStackWithNoTerramateBlock(t *testing.T) {
 	s := sandbox.New(t)
 	s.BuildTree([]string{"s:stack"})

config/config.go

@@ -30,37 +30,6 @@ const (
 	DefaultInitConstraint = "~>"
 )
 
-// Exists tells if path has a terramate config file.
-func Exists(path string) bool {
-	logger := log.With().
-		Str("action", "Exists()").
-		Str("path", path).
-		Logger()
-
-	logger.Trace().
-		Msg("Get path info.")
-	st, err := os.Stat(path)
-	if err != nil {
-		return false
-	}
-
-	logger.Trace().
-		Msg("Check if path is directory.")
-	if !st.IsDir() {
-		return false
-	}
-
-	logger.Trace().
-		Msg("Look for config file within directory.")
-	fname := filepath.Join(path, DefaultFilename)
-	info, err := os.Stat(fname)
-	if err != nil {
-		return false
-	}
-
-	return info.Mode().IsRegular()
-}
-
 func TryLoadRootConfig(dir string) (cfg hcl.Config, found bool, err error) {
 	path := filepath.Join(dir, DefaultFilename)
 	logger := log.With().
@@ -80,9 +49,9 @@ func TryLoadRootConfig(dir string) (cfg hcl.Config, found bool, err error) {
 		return hcl.Config{}, false, err
 	}
 
-	logger.Trace().
-		Msg("Parse file.")
-	cfg, err = hcl.ParseFile(path)
+	logger.Trace().Msg("Parse Terramate config.")
+
+	cfg, err = hcl.ParseDir(dir)
 	if err != nil {
 		return hcl.Config{}, false, err
 	}

generate/generate.go

@@ -26,7 +26,6 @@ import (
 	"github.com/hashicorp/hcl/v2/hclwrite"
 	"github.com/madlambda/spells/errutil"
 	"github.com/mineiros-io/terramate"
-	"github.com/mineiros-io/terramate/config"
 	"github.com/mineiros-io/terramate/generate/genhcl"
 	"github.com/mineiros-io/terramate/hcl"
 	"github.com/mineiros-io/terramate/hcl/eval"
@@ -533,46 +532,22 @@ func generateBackendCfgCode(
 		Str("configDir", configdir).
 		Logger()
 
-	logger.Trace().
-		Msg("Check if config dir outside of root dir.")
+	logger.Trace().Msg("Check if config dir outside of root dir.")
 
 	if !strings.HasPrefix(configdir, root) {
 		// check if we are outside of project's root, time to stop
 		return "", nil
 	}
 
-	logger.Trace().
-		Msg("Get config file path.")
-	configfile := filepath.Join(configdir, config.DefaultFilename)
-
-	logger = logger.With().
-		Str("configFile", configfile).
-		Logger()
+	logger.Trace().Msg("Load stack backend config.")
 
-	logger.Trace().
-		Msg("Load stack backend config.")
-	if _, err := os.Stat(configfile); err != nil {
-		// FIXME(katcipis): use  os.IsNotExist(err) to handle errors properly.
-		// Unknown stat errors will be ignored right now.
-		return generateBackendCfgCode(root, stackpath, stackMetadata, globals, filepath.Dir(configdir))
-	}
-
-	logger.Debug().
-		Msg("Read config file.")
-	config, err := os.ReadFile(configfile)
+	parsedConfig, err := hcl.ParseDir(configdir)
 	if err != nil {
-		return "", fmt.Errorf("reading config: %v", err)
+		return "", fmt.Errorf("loading backend config from %q: %v", configdir, err)
 	}
 
-	logger.Debug().
-		Msg("Parse config file.")
-	parsedConfig, err := hcl.Parse(configfile, config)
-	if err != nil {
-		return "", fmt.Errorf("parsing config: %w", err)
-	}
+	logger.Trace().Msg("Check if we have Terramate block")
 
-	logger.Trace().
-		Msg("Check if parsed is empty.")
 	parsed := parsedConfig.Terramate
 	if parsed == nil || parsed.Backend == nil {
 		return generateBackendCfgCode(root, stackpath, stackMetadata, globals, filepath.Dir(configdir))