fix: don't attempt to create ftl-project.toml in fs root (#1771)

Fixes #1770

buildengine/watch_test.go

@@ -32,7 +32,9 @@ func TestWatch(t *testing.T) {
 	waitForEvents(t, events, []WatchEvent{})
 
 	// Initiate two modules
-	err := ftl("init", "go", dir, "one")
+	err := gitInit(dir)
+	assert.NoError(t, err)
+	err = ftl("init", "go", dir, "one")
 	assert.NoError(t, err)
 	err = ftl("init", "go", dir, "two")
 	assert.NoError(t, err)
@@ -70,7 +72,9 @@ func TestWatchWithBuildModifyingFiles(t *testing.T) {
 	w := NewWatcher()
 
 	// Initiate a module
-	err := ftl("init", "go", dir, "one")
+	err := gitInit(dir)
+	assert.NoError(t, err)
+	err = ftl("init", "go", dir, "one")
 	assert.NoError(t, err)
 
 	events, topic := startWatching(ctx, t, w, dir)
@@ -103,7 +107,9 @@ func TestWatchWithBuildAndUserModifyingFiles(t *testing.T) {
 	dir := t.TempDir()
 
 	// Initiate a module
-	err := ftl("init", "go", dir, "one")
+	err := gitInit(dir)
+	assert.NoError(t, err)
+	err = ftl("init", "go", dir, "one")
 	assert.NoError(t, err)
 
 	one := loadModule(t, dir, "one")
@@ -204,6 +210,13 @@ func keyForEvent(event WatchEvent) string {
 	}
 }
 
+func gitInit(dir string) error {
+	cmd := exec.Command("git", "init", dir)
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	return cmd.Run()
+}
+
 func ftl(args ...string) error {
 	cmd := exec.Command("ftl", args...)
 	cmd.Stdout = os.Stdout

cmd/ftl/cmd_init.go

@@ -63,6 +63,10 @@ func (i initGoCmd) Run(ctx context.Context, parent *initCmd) error {
 		return fmt.Errorf("module name %q is invalid", i.Name)
 	}
 
+	if _, ok := internal.GitRoot(i.Dir).Get(); !ok {
+		return fmt.Errorf("directory %s is not in a git repository, run 'git init' at the root of your project", i.Dir)
+	}
+
 	logger := log.FromContext(ctx)
 	logger.Debugf("Initializing FTL Go module %s in %s", i.Name, i.Dir)
 	if err := scaffold(parent.Hermit, goruntime.Files(), i.Dir, i, scaffolder.Exclude("^go.mod$")); err != nil {

common/projectconfig/projectconfig.go

@@ -12,6 +12,7 @@ import (
 	"github.com/alecthomas/types/optional"
 
 	"github.com/TBD54566975/ftl"
+	"github.com/TBD54566975/ftl/internal"
 	"github.com/TBD54566975/ftl/internal/log"
 )
 
@@ -79,8 +80,12 @@ func DefaultConfigPath() optional.Option[string] {
 	if err != nil {
 		return optional.None[string]()
 	}
-	// Find the first ftl-project.toml file in the parent directories.
-	for {
+	// Find the first ftl-project.toml file in the parent directories, up until the gitroot.
+	root, ok := internal.GitRoot(dir).Get()
+	if !ok {
+		root = "/"
+	}
+	for dir != root && dir != "." {
 		path := filepath.Join(dir, "ftl-project.toml")
 		_, err := os.Stat(path)
 		if err == nil {
@@ -90,9 +95,6 @@ func DefaultConfigPath() optional.Option[string] {
 			return optional.None[string]()
 		}
 		dir = filepath.Dir(dir)
-		if dir == "/" || dir == "." {
-			break
-		}
 	}
 	return optional.Some(filepath.Join(dir, "ftl-project.toml"))
 }

go-runtime/ftl/ftl_integration_test.go

@@ -14,6 +14,7 @@ import (
 
 func TestLifecycle(t *testing.T) {
 	in.Run(t, "",
+		in.GitInit(),
 		in.Exec("ftl", "init", "go", ".", "echo"),
 		in.Deploy("echo"),
 		in.Call("echo", "echo", in.Obj{"name": "Bob"}, func(t testing.TB, response in.Obj) {