From 122e6f5a4c0279b03e14b9fd048ad9b8871f9edd Mon Sep 17 00:00:00 2001 From: Denis Bilenko Date: Tue, 10 Dec 2024 14:26:12 +0100 Subject: [PATCH] Add Abs(); clean up --- libs/folders/folders.go | 4 ++++ libs/git/info.go | 32 -------------------------------- 2 files changed, 4 insertions(+), 32 deletions(-) diff --git a/libs/folders/folders.go b/libs/folders/folders.go index c83c711d3..e27e31557 100644 --- a/libs/folders/folders.go +++ b/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) { + p, err := filepath.Abs(p) + if err != nil { + return "", err + } for { _, err := os.Stat(filepath.Join(dir, leaf)) diff --git a/libs/git/info.go b/libs/git/info.go index b95802656..ce9c70a5c 100644 --- a/libs/git/info.go +++ b/libs/git/info.go @@ -2,12 +2,8 @@ package git import ( "context" - "errors" - "io/fs" "net/http" - "os" "path" - "path/filepath" "strings" "github.com/databricks/cli/libs/dbr" @@ -135,31 +131,3 @@ func fetchRepositoryInfoDotGit(ctx context.Context, path string) (RepositoryInfo return result, nil } - -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)) - - 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 -}