Switch to folders.FindDirWithLeaf

bundle/config/mutator/load_git_details.go

@@ -2,6 +2,8 @@ package mutator
 
 import (
 	"context"
+	"errors"
+	"os"
 	"path/filepath"
 
 	"github.com/databricks/cli/bundle"
@@ -24,7 +26,9 @@ func (m *loadGitDetails) Apply(ctx context.Context, b *bundle.Bundle) diag.Diagn
 	var diags diag.Diagnostics
 	info, err := git.FetchRepositoryInfo(ctx, b.BundleRoot.Native(), b.WorkspaceClient())
 	if err != nil {
- diags = append(diags, diag.WarningFromErr(err)...)
+ if !errors.Is(err, os.ErrNotExist) {
+ diags = append(diags, diag.WarningFromErr(err)...)
+ }
 	}
 
 	if info.WorktreeRoot == "" {

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/folders"
 	"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 := folders.FindDirWithLeaf(".", ".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

internal/git_fetch_test.go

@@ -101,7 +101,7 @@ func TestAccFetchRepositoryInfoAPI_FromNonRepo(t *testing.T) {
  assert.NoError(t, err)
  } else {
  assert.Error(t, err)
- assert.Contains(t, err.Error(), test.msg)
+ assert.ErrorContains(t, err, test.msg)
  }
  assertEmptyGitInfo(t, info)
  })
@@ -151,7 +151,7 @@ func TestAccFetchRepositoryInfoDotGit_FromNonGitRepo(t *testing.T) {
 	for _, input := range tests {
  t.Run(input, func(t *testing.T) {
  info, err := git.FetchRepositoryInfo(ctx, input, wt.W)
- assert.NoError(t, err)
+ assert.ErrorIs(t, err, os.ErrNotExist)
  assertEmptyGitInfo(t, info)
  })
 	}

libs/folders/folders.go

@@ -9,6 +9,10 @@ import (
 // FindDirWithLeaf returns the first directory that holds `leaf`,
 // traversing up to the root of the filesystem, starting at `dir`.
 func FindDirWithLeaf(dir string, leaf string) (string, error) {
+	dir, err := filepath.Abs(dir)
+	if err != nil {
+ return "", err
+	}
 	for {
  _, err := os.Stat(filepath.Join(dir, leaf))
 

libs/git/info.go

@@ -2,15 +2,12 @@ package git
 
 import (
 	"context"
-	"errors"
-	"io/fs"
 	"net/http"
-	"os"
 	"path"
-	"path/filepath"
 	"strings"
 
 	"github.com/databricks/cli/libs/dbr"
+	"github.com/databricks/cli/libs/folders"
 	"github.com/databricks/cli/libs/log"
 	"github.com/databricks/cli/libs/vfs"
 	"github.com/databricks/databricks-sdk-go"
@@ -105,7 +102,7 @@ func ensureWorkspacePrefix(p string) string {
 func fetchRepositoryInfoDotGit(ctx context.Context, path string) (RepositoryInfo, error) {
 	result := RepositoryInfo{}
 
-	rootDir, err := findLeafInTree(path, GitDirectoryName)
+	rootDir, err := folders.FindDirWithLeaf(path, GitDirectoryName)
 	if rootDir == "" {
  return result, err
 	}
@@ -134,28 +131,3 @@ func fetchRepositoryInfoDotGit(ctx context.Context, path string) (RepositoryInfo
 
 	return result, nil
 }
-
-func findLeafInTree(p string, leafName string) (string, error) {
-	var err error
-	for i := 0; i < 10000; i++ {
- _, err = os.Stat(filepath.Join(p, leafName))
-
- if err == nil {
- // Found [leafName] in p
- return p, nil
- }
-
- // ErrNotExist means we continue traversal up the tree.
- if errors.Is(err, fs.ErrNotExist) {
- parent := filepath.Dir(p)
- if parent == p {
- return "", nil
- }
- p = parent
- continue
- }
- break
-	}
-
-	return "", err
-}