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

feat: Use global FilePath instead of locally overriden paths

This commit is contained in:
Ilya Kuznetsov 2024-11-11 19:36:31 +01:00
parent 086dfbc79d
commit a43f7ddad0
2 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bundle/config/mutator/default_workspace_paths.go
View File

@ -5,6 +5,7 @@ import (
"path" "path"
"github.com/databricks/cli/bundle" "github.com/databricks/cli/bundle"
"github.com/databricks/cli/bundle/config"
"github.com/databricks/cli/libs/diag" "github.com/databricks/cli/libs/diag"
) )
@ -25,6 +26,10 @@ func (m *defineDefaultWorkspacePaths) Apply(ctx context.Context, b *bundle.Bundl
return diag.Errorf("unable to define default workspace paths: workspace root not defined") return diag.Errorf("unable to define default workspace paths: workspace root not defined")
} }
if config.IsExplicitlyEnabled((b.Config.Presets.InPlaceDeployment)) {
b.Config.Workspace.FilePath = b.BundleRootPath
}
if b.Config.Workspace.FilePath == "" { if b.Config.Workspace.FilePath == "" {
b.Config.Workspace.FilePath = path.Join(root, "files") b.Config.Workspace.FilePath = path.Join(root, "files")
} }

23
bundle/config/mutator/translate_paths.go
View File

@ -11,8 +11,6 @@ import (
"strings" "strings"
"github.com/databricks/cli/bundle" "github.com/databricks/cli/bundle"
"github.com/databricks/cli/bundle/config"
"github.com/databricks/cli/bundle/libraries"
"github.com/databricks/cli/libs/diag" "github.com/databricks/cli/libs/diag"
"github.com/databricks/cli/libs/dyn" "github.com/databricks/cli/libs/dyn"
"github.com/databricks/cli/libs/notebook" "github.com/databricks/cli/libs/notebook"
@ -131,9 +129,6 @@ func (t *translateContext) translateNotebookPath(literal, localFullPath, localRe
return "", ErrIsNotNotebook{localFullPath} return "", ErrIsNotNotebook{localFullPath}
} }
if t.shouldTranslateRemotePaths(localFullPath) {
return localFullPath, nil
}
// Upon import, notebooks are stripped of their extension. // Upon import, notebooks are stripped of their extension.
return strings.TrimSuffix(remotePath, filepath.Ext(localFullPath)), nil return strings.TrimSuffix(remotePath, filepath.Ext(localFullPath)), nil
} }
@ -149,9 +144,6 @@ func (t *translateContext) translateFilePath(literal, localFullPath, localRelPat
if nb { if nb {
return "", ErrIsNotebook{localFullPath} return "", ErrIsNotebook{localFullPath}
} }
if t.shouldTranslateRemotePaths(localFullPath) {
return localFullPath, nil
}
return remotePath, nil return remotePath, nil
} }
@ -163,16 +155,10 @@ func (t *translateContext) translateDirectoryPath(literal, localFullPath, localR
if !info.IsDir() { if !info.IsDir() {
return "", fmt.Errorf("%s is not a directory", localFullPath) return "", fmt.Errorf("%s is not a directory", localFullPath)
} }
if t.shouldTranslateRemotePaths(localFullPath) {
return localFullPath, nil
}
return remotePath, nil return remotePath, nil
} }
func (t *translateContext) translateNoOp(literal, localFullPath, localRelPath, remotePath string) (string, error) { func (t *translateContext) translateNoOp(literal, localFullPath, localRelPath, remotePath string) (string, error) {
if t.shouldTranslateRemotePaths(localFullPath) {
return localFullPath, nil
}
return localRelPath, nil return localRelPath, nil
} }
@ -191,10 +177,6 @@ func (t *translateContext) retainLocalAbsoluteFilePath(literal, localFullPath, l
} }
func (t *translateContext) translateNoOpWithPrefix(literal, localFullPath, localRelPath, remotePath string) (string, error) { func (t *translateContext) translateNoOpWithPrefix(literal, localFullPath, localRelPath, remotePath string) (string, error) {
if t.shouldTranslateRemotePaths(localFullPath) {
return localFullPath, nil
}
if !strings.HasPrefix(localRelPath, ".") { if !strings.HasPrefix(localRelPath, ".") {
localRelPath = "." + string(filepath.Separator) + localRelPath localRelPath = "." + string(filepath.Separator) + localRelPath
} }
@ -235,11 +217,6 @@ func (t *translateContext) rewriteRelativeTo(p dyn.Path, v dyn.Value, fn rewrite
return dyn.InvalidValue, err return dyn.InvalidValue, err
} }
func (t *translateContext) shouldTranslateRemotePaths(localFullPath string) bool {
return config.IsExplicitlyEnabled(t.b.Config.Presets.InPlaceDeployment) &&
libraries.IsWorkspacePath(localFullPath)
}
func (m *translatePaths) Apply(_ context.Context, b *bundle.Bundle) diag.Diagnostics { func (m *translatePaths) Apply(_ context.Context, b *bundle.Bundle) diag.Diagnostics {
t := &translateContext{ t := &translateContext{
b: b, b: b,