Switch to folders.FindDirWithLeaf

internal/bundle/helpers.go

@@ -18,8 +18,8 @@ import (
 	"github.com/databricks/cli/libs/env"
 	"github.com/databricks/cli/libs/filer"
 	"github.com/databricks/cli/libs/flags"
+	"github.com/databricks/cli/libs/git"
 	"github.com/databricks/cli/libs/template"
-	"github.com/databricks/cli/libs/vfs"
 	"github.com/databricks/databricks-sdk-go"
 	"github.com/stretchr/testify/require"
 )
@@ -144,15 +144,14 @@ func getBundleRemoteRootPath(w *databricks.WorkspaceClient, t *testing.T, unique
 }
 
 func blackBoxRun(t *testing.T, root string, args ...string) (stdout string, stderr string) {
-	cwd := vfs.MustNew(".")
-	gitRoot, err := vfs.FindLeafInTree(cwd, ".git")
+	gitRoot, err := git.FindLeafInTree(".", ".git")
 	require.NoError(t, err)
 
 	t.Setenv("BUNDLE_ROOT", root)
 
 	// Create the command
 	cmd := exec.Command("go", append([]string{"run", "main.go"}, args...)...)
-	cmd.Dir = gitRoot.Native()
+	cmd.Dir = gitRoot
 
 	// Create buffers to capture output
 	var outBuffer, errBuffer bytes.Buffer

libs/git/info.go

@@ -105,7 +105,7 @@ func ensureWorkspacePrefix(p string) string {
 func fetchRepositoryInfoDotGit(ctx context.Context, path string) (RepositoryInfo, error) {
 	result := RepositoryInfo{}
 
-	rootDir, err := findLeafInTree(path, GitDirectoryName)
+	rootDir, err := FindLeafInTree(path, GitDirectoryName)
 	if rootDir == "" {
 		return result, err
 	}
@@ -135,8 +135,11 @@ func fetchRepositoryInfoDotGit(ctx context.Context, path string) (RepositoryInfo
 	return result, nil
 }
 
-func findLeafInTree(p string, leafName string) (string, error) {
-	var err error
+func FindLeafInTree(p string, leafName string) (string, error) {
+	p, err := filepath.Abs(p)
+	if err != nil {
+		return "", err
+	}
 	for i := 0; i < 10000; i++ {
 		_, err = os.Stat(filepath.Join(p, leafName))
 

libs/vfs/leaf_test.go → libs/git/info_test.go

@@ -1,4 +1,4 @@
-package vfs
+package git
 
 import (
 	"os"
@@ -17,22 +17,22 @@ func TestFindLeafInTree(t *testing.T) {
 
 	// Find from working directory should work.
 	{
-		out, err := FindLeafInTree(MustNew(wd), ".git")
+		out, err := FindLeafInTree(wd, ".git")
 		assert.NoError(t, err)
-		assert.Equal(t, root, out.Native())
+		assert.Equal(t, root, out)
 	}
 
 	// Find from project root itself should work.
 	{
-		out, err := FindLeafInTree(MustNew(root), ".git")
+		out, err := FindLeafInTree(root, ".git")
 		assert.NoError(t, err)
-		assert.Equal(t, root, out.Native())
+		assert.Equal(t, root, out)
 	}
 
 	// Find for something that doesn't exist should work.
 	{
-		out, err := FindLeafInTree(MustNew(root), "this-leaf-doesnt-exist-anywhere")
-		assert.ErrorIs(t, err, os.ErrNotExist)
-		assert.Equal(t, nil, out)
+		out, err := FindLeafInTree(root, "this-leaf-doesnt-exist-anywhere")
+		assert.NoError(t, err)
+		assert.Equal(t, "", out)
 	}
 }