steve/databricks-cli
steve
/
databricks-cli
mirror of https://github.com/databricks/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix API response path

This commit is contained in:
Denis Bilenko 2024-11-28 16:54:04 +01:00
parent 0905d36e9d
commit 0c00ddef72
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libs/git/info.go
View File

@ -69,11 +69,12 @@ func FetchRepositoryInfoAPI(ctx context.Context, path vfs.Path, w *databricks.Wo
gi := response.GitInfo gi := response.GitInfo
// XXX log warning if missing // XXX log warning if missing
if gi != nil { if gi != nil {
fixedPath := fixResponsePath(gi.Path)
return GitRepositoryInfo{ return GitRepositoryInfo{
OriginURL: gi.URL, OriginURL: gi.URL,
LatestCommit: gi.HeadCommitID, LatestCommit: gi.HeadCommitID,
CurrentBranch: gi.Branch, CurrentBranch: gi.Branch,
WorktreeRoot: vfs.MustNew(gi.Path), WorktreeRoot: vfs.MustNew(fixedPath),
}, nil }, nil
} }
@ -82,6 +83,13 @@ func FetchRepositoryInfoAPI(ctx context.Context, path vfs.Path, w *databricks.Wo
}, nil }, nil
} }
func fixResponsePath(path string) string {
if strings.HasPrefix(path, "/Users/") {
return "/Workspace/" + path
}
return path
}
func FetchRepositoryInfoDotGit(ctx context.Context, path vfs.Path) (GitRepositoryInfo, error) { func FetchRepositoryInfoDotGit(ctx context.Context, path vfs.Path) (GitRepositoryInfo, error) {
rootDir, err := vfs.FindLeafInTree(path, GitDirectoryName) rootDir, err := vfs.FindLeafInTree(path, GitDirectoryName)
if err != nil { if err != nil {