bundle/bundle_read_only.go

@@ -32,6 +32,10 @@ func (r ReadOnlyBundle) SyncRoot() vfs.Path {
 	return r.b.SyncRoot
 }
 
+func (r ReadOnlyBundle) SyncRootPath() string {
+	return r.b.SyncRootPath
+}
+
 func (r ReadOnlyBundle) WorkspaceClient() *databricks.WorkspaceClient {
 	return r.b.WorkspaceClient()
 }

bundle/config/mutator/apply_presets.go

@@ -223,8 +223,11 @@ func (m *applyPresets) Apply(ctx context.Context, b *bundle.Bundle) diag.Diagnos
 	}
 
 	if config.IsExplicitlyEnabled((b.Config.Presets.SourceLinkedDeployment)) {
-		isDatabricksWorkspace := dbr.RunsOnRuntime(ctx) && strings.HasPrefix(b.SyncRootPath, "/Workspace/")
-		if !isDatabricksWorkspace {
+		root := b.SyncRootPath
+		isInWorkspace := strings.HasPrefix(root, "/Workspace/")
+		if isInWorkspace && dbr.RunsOnRuntime(ctx) {
+			b.Config.Workspace.FilePath = root
+		} else {
 			disabled := false
 			b.Config.Presets.SourceLinkedDeployment = &disabled
 			diags = diags.Extend(diag.Warningf("source-linked deployment is available only in the Databricks Workspace"))

bundle/config/mutator/apply_presets_test.go

@@ -10,6 +10,7 @@ import (
 	"github.com/databricks/cli/bundle/config/mutator"
 	"github.com/databricks/cli/bundle/config/resources"
 	"github.com/databricks/cli/libs/dbr"
+	"github.com/databricks/cli/libs/vfs"
 	"github.com/databricks/databricks-sdk-go/service/catalog"
 	"github.com/databricks/databricks-sdk-go/service/jobs"
 	"github.com/stretchr/testify/require"
@@ -47,6 +48,7 @@ func TestApplyPresetsPrefix(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			b := &bundle.Bundle{
+				SyncRoot: vfs.MustNew(t.TempDir()),
 				Config: config.Root{
 					Resources: config.Resources{
 						Jobs: map[string]*resources.Job{
@@ -375,63 +377,75 @@ func TestApplyPresetsSourceLinkedDeployment(t *testing.T) {
 	testContext := context.Background()
 	enabled := true
 	disabled := false
+	remotePath := "/Users/files"
 	workspacePath := "/Workspace/user.name@company.com"
 
 	tests := []struct {
-		bundlePath      string
-		ctx             context.Context
-		name            string
-		initialValue    *bool
-		expectedValue   *bool
-		expectedWarning string
+		bundlePath       string
+		ctx              context.Context
+		name             string
+		initialValue     *bool
+		expectedValue    *bool
+		expectedFilePath string
+		expectedWarning  string
 	}{
 		{
-			name:          "preset enabled, bundle in Workspace, databricks runtime",
-			bundlePath:    workspacePath,
-			ctx:           dbr.MockRuntime(testContext, true),
-			initialValue:  &enabled,
-			expectedValue: &enabled,
+			name:             "preset enabled, bundle in Workspace, databricks runtime",
+			bundlePath:       workspacePath,
+			ctx:              dbr.MockRuntime(testContext, true),
+			initialValue:     &enabled,
+			expectedValue:    &enabled,
+			expectedFilePath: workspacePath,
+			expectedWarning:  "",
 		},
 		{
-			name:            "preset enabled, bundle not in Workspace, databricks runtime",
-			bundlePath:      "/Users/user.name@company.com",
-			ctx:             dbr.MockRuntime(testContext, true),
-			initialValue:    &enabled,
-			expectedValue:   &disabled,
-			expectedWarning: "source-linked deployment is available only in the Databricks Workspace",
+			name:             "preset enabled, bundle not in Workspace, databricks runtime",
+			bundlePath:       "/Users/user.name@company.com",
+			ctx:              dbr.MockRuntime(testContext, true),
+			initialValue:     &enabled,
+			expectedValue:    &disabled,
+			expectedFilePath: remotePath,
+			expectedWarning:  "source-linked deployment is available only in the Databricks Workspace",
 		},
 		{
-			name:            "preset enabled, bundle in Workspace, not databricks runtime",
-			bundlePath:      workspacePath,
-			ctx:             dbr.MockRuntime(testContext, false),
-			initialValue:    &enabled,
-			expectedValue:   &disabled,
-			expectedWarning: "source-linked deployment is available only in the Databricks Workspace",
+			name:             "preset enabled, bundle in Workspace, not databricks runtime",
+			bundlePath:       workspacePath,
+			ctx:              dbr.MockRuntime(testContext, false),
+			initialValue:     &enabled,
+			expectedValue:    &disabled,
+			expectedFilePath: remotePath,
+			expectedWarning:  "source-linked deployment is available only in the Databricks Workspace",
 		},
 		{
-			name:          "preset disabled, bundle in Workspace, databricks runtime",
-			bundlePath:    workspacePath,
-			ctx:           dbr.MockRuntime(testContext, true),
-			initialValue:  &disabled,
-			expectedValue: &disabled,
+			name:             "preset disabled, bundle in Workspace, databricks runtime",
+			bundlePath:       workspacePath,
+			ctx:              dbr.MockRuntime(testContext, true),
+			initialValue:     &disabled,
+			expectedValue:    &disabled,
+			expectedFilePath: remotePath,
 		},
 		{
-			name:          "preset nil, bundle in Workspace, databricks runtime",
-			bundlePath:    workspacePath,
-			ctx:           dbr.MockRuntime(testContext, true),
-			initialValue:  nil,
-			expectedValue: nil,
+			name:             "preset nil, bundle in Workspace, databricks runtime",
+			bundlePath:       workspacePath,
+			ctx:              dbr.MockRuntime(testContext, true),
+			initialValue:     nil,
+			expectedValue:    nil,
+			expectedFilePath: remotePath,
 		},
 	}
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			b := &bundle.Bundle{
+				SyncRoot:     vfs.MustNew(tt.bundlePath),
 				SyncRootPath: tt.bundlePath,
 				Config: config.Root{
 					Presets: config.Presets{
 						SourceLinkedDeployment: tt.initialValue,
 					},
+					Workspace: config.Workspace{
+						FilePath: remotePath,
+					},
 				},
 			}
 
@@ -444,6 +458,7 @@ func TestApplyPresetsSourceLinkedDeployment(t *testing.T) {
 				require.Equal(t, tt.expectedWarning, diags[0].Summary)
 			}
 
+			require.Equal(t, tt.expectedFilePath, b.Config.Workspace.FilePath)
 			require.Equal(t, tt.expectedValue, b.Config.Presets.SourceLinkedDeployment)
 		})
 	}

bundle/config/mutator/process_target_mode.go

@@ -59,7 +59,8 @@ func transformDevelopmentMode(ctx context.Context, b *bundle.Bundle) {
 	}
 
 	if !config.IsExplicitlyDisabled(t.SourceLinkedDeployment) {
-		isInWorkspace := strings.HasPrefix(b.SyncRootPath, "/Workspace/")
+		root := b.SyncRootPath
+		isInWorkspace := strings.HasPrefix(root, "/Workspace/")
 		if isInWorkspace && dbr.RunsOnRuntime(ctx) {
 			enabled := true
 			t.SourceLinkedDeployment = &enabled

bundle/config/mutator/process_target_mode_test.go

@@ -524,12 +524,14 @@ func TestSourceLinkedDeploymentEnabled(t *testing.T) {
 	b, diags := processSourceLinkedBundle(t, true)
 	require.NoError(t, diags.Error())
 	assert.True(t, *b.Config.Presets.SourceLinkedDeployment)
+	assert.Equal(t, b.Config.Workspace.FilePath, b.SyncRootPath)
 }
 
 func TestSourceLinkedDeploymentDisabled(t *testing.T) {
 	b, diags := processSourceLinkedBundle(t, false)
 	require.NoError(t, diags.Error())
 	assert.False(t, *b.Config.Presets.SourceLinkedDeployment)
+	assert.NotEqual(t, b.Config.Workspace.FilePath, b.SyncRootPath)
 }
 
 func processSourceLinkedBundle(t *testing.T, presetEnabled bool) (*bundle.Bundle, diag.Diagnostics) {
@@ -540,6 +542,7 @@ func processSourceLinkedBundle(t *testing.T, presetEnabled bool) (*bundle.Bundle
 	b := mockBundle(config.Development)
 
 	workspacePath := "/Workspace/lennart@company.com/"
+	b.SyncRoot = vfs.MustNew(workspacePath)
 	b.SyncRootPath = workspacePath
 	b.Config.Presets.SourceLinkedDeployment = &presetEnabled
 

bundle/config/mutator/translate_paths.go

@@ -11,7 +11,6 @@ import (
 	"strings"
 
 	"github.com/databricks/cli/bundle"
-	"github.com/databricks/cli/bundle/config"
 	"github.com/databricks/cli/libs/diag"
 	"github.com/databricks/cli/libs/dyn"
 	"github.com/databricks/cli/libs/notebook"
@@ -104,13 +103,8 @@ func (t *translateContext) rewritePath(
 		return fmt.Errorf("path %s is not contained in sync root path", localPath)
 	}
 
-	var workspacePath string
-	if config.IsExplicitlyEnabled(t.b.Config.Presets.SourceLinkedDeployment) {
-		workspacePath = t.b.SyncRootPath
-	} else {
-		workspacePath = t.b.Config.Workspace.FilePath
-	}
-	remotePath := path.Join(workspacePath, filepath.ToSlash(localRelPath))
+	// Prefix remote path with its remote root path.
+	remotePath := path.Join(t.b.Config.Workspace.FilePath, filepath.ToSlash(localRelPath))
 
 	// Convert local path into workspace path via specified function.
 	interp, err := fn(*p, localPath, localRelPath, remotePath)

bundle/config/mutator/translate_paths_test.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"os"
 	"path/filepath"
-	"runtime"
 	"strings"
 	"testing"
 
@@ -788,163 +787,3 @@ func TestTranslatePathWithComplexVariables(t *testing.T) {
 		b.Config.Resources.Jobs["job"].Tasks[0].Libraries[0].Whl,
 	)
 }
-
-func TestTranslatePathsWithSourceLinkedDeployment(t *testing.T) {
-	if runtime.GOOS == "windows" {
-		t.Skip("this test is not applicable on Windows because source-linked mode works only in the Databricks Workspace")
-	}
-
-	dir := t.TempDir()
-	touchNotebookFile(t, filepath.Join(dir, "my_job_notebook.py"))
-	touchNotebookFile(t, filepath.Join(dir, "my_pipeline_notebook.py"))
-	touchEmptyFile(t, filepath.Join(dir, "my_python_file.py"))
-	touchEmptyFile(t, filepath.Join(dir, "dist", "task.jar"))
-	touchEmptyFile(t, filepath.Join(dir, "requirements.txt"))
-
-	enabled := true
-	b := &bundle.Bundle{
-		SyncRootPath: dir,
-		SyncRoot:     vfs.MustNew(dir),
-		Config: config.Root{
-			Workspace: config.Workspace{
-				FilePath: "/bundle",
-			},
-			Resources: config.Resources{
-				Jobs: map[string]*resources.Job{
-					"job": {
-						JobSettings: &jobs.JobSettings{
-							Tasks: []jobs.Task{
-								{
-									NotebookTask: &jobs.NotebookTask{
-										NotebookPath: "my_job_notebook.py",
-									},
-									Libraries: []compute.Library{
-										{Whl: "./dist/task.whl"},
-									},
-								},
-								{
-									NotebookTask: &jobs.NotebookTask{
-										NotebookPath: "/Users/jane.doe@databricks.com/absolute_remote.py",
-									},
-								},
-								{
-									NotebookTask: &jobs.NotebookTask{
-										NotebookPath: "my_job_notebook.py",
-									},
-									Libraries: []compute.Library{
-										{Requirements: "requirements.txt"},
-									},
-								},
-								{
-									SparkPythonTask: &jobs.SparkPythonTask{
-										PythonFile: "my_python_file.py",
-									},
-								},
-								{
-									SparkJarTask: &jobs.SparkJarTask{
-										MainClassName: "HelloWorld",
-									},
-									Libraries: []compute.Library{
-										{Jar: "./dist/task.jar"},
-									},
-								},
-								{
-									SparkJarTask: &jobs.SparkJarTask{
-										MainClassName: "HelloWorldRemote",
-									},
-									Libraries: []compute.Library{
-										{Jar: "dbfs:/bundle/dist/task_remote.jar"},
-									},
-								},
-							},
-						},
-					},
-				},
-				Pipelines: map[string]*resources.Pipeline{
-					"pipeline": {
-						PipelineSpec: &pipelines.PipelineSpec{
-							Libraries: []pipelines.PipelineLibrary{
-								{
-									Notebook: &pipelines.NotebookLibrary{
-										Path: "my_pipeline_notebook.py",
-									},
-								},
-								{
-									Notebook: &pipelines.NotebookLibrary{
-										Path: "/Users/jane.doe@databricks.com/absolute_remote.py",
-									},
-								},
-								{
-									File: &pipelines.FileLibrary{
-										Path: "my_python_file.py",
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			Presets: config.Presets{
-				SourceLinkedDeployment: &enabled,
-			},
-		},
-	}
-
-	bundletest.SetLocation(b, ".", []dyn.Location{{File: filepath.Join(dir, "resource.yml")}})
-	diags := bundle.Apply(context.Background(), b, mutator.TranslatePaths())
-	require.NoError(t, diags.Error())
-
-	// updated to source path
-	assert.Equal(
-		t,
-		filepath.Join(dir, "my_job_notebook"),
-		b.Config.Resources.Jobs["job"].Tasks[0].NotebookTask.NotebookPath,
-	)
-	assert.Equal(
-		t,
-		filepath.Join(dir, "requirements.txt"),
-		b.Config.Resources.Jobs["job"].Tasks[2].Libraries[0].Requirements,
-	)
-	assert.Equal(
-		t,
-		filepath.Join(dir, "my_python_file.py"),
-		b.Config.Resources.Jobs["job"].Tasks[3].SparkPythonTask.PythonFile,
-	)
-	assert.Equal(
-		t,
-		filepath.Join(dir, "my_pipeline_notebook"),
-		b.Config.Resources.Pipelines["pipeline"].Libraries[0].Notebook.Path,
-	)
-	assert.Equal(
-		t,
-		filepath.Join(dir, "my_python_file.py"),
-		b.Config.Resources.Pipelines["pipeline"].Libraries[2].File.Path,
-	)
-
-	// left as is
-	assert.Equal(
-		t,
-		filepath.Join("dist", "task.whl"),
-		b.Config.Resources.Jobs["job"].Tasks[0].Libraries[0].Whl,
-	)
-	assert.Equal(
-		t,
-		"/Users/jane.doe@databricks.com/absolute_remote.py",
-		b.Config.Resources.Jobs["job"].Tasks[1].NotebookTask.NotebookPath,
-	)
-	assert.Equal(
-		t,
-		filepath.Join("dist", "task.jar"),
-		b.Config.Resources.Jobs["job"].Tasks[4].Libraries[0].Jar,
-	)
-	assert.Equal(
-		t,
-		"dbfs:/bundle/dist/task_remote.jar",
-		b.Config.Resources.Jobs["job"].Tasks[5].Libraries[0].Jar,
-	)
-	assert.Equal(
-		t,
-		"/Users/jane.doe@databricks.com/absolute_remote.py",
-		b.Config.Resources.Pipelines["pipeline"].Libraries[1].Notebook.Path,
-	)
-}

bundle/config/validate/folder_permissions.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"path"
+	"strings"
 
 	"github.com/databricks/cli/bundle"
 	"github.com/databricks/cli/bundle/libraries"
@@ -30,6 +31,9 @@ func (f *folderPermissions) Apply(ctx context.Context, b bundle.ReadOnlyBundle)
 	g, ctx := errgroup.WithContext(ctx)
 	results := make([]diag.Diagnostics, len(bundlePaths))
 	for i, p := range bundlePaths {
+		if strings.HasPrefix(p, b.SyncRootPath()) {
+			continue
+		}
 		g.Go(func() error {
 			results[i] = checkFolderPermission(ctx, b, p)
 			return nil

bundle/config/validate/folder_permissions_test.go

@@ -18,6 +18,7 @@ import (
 
 func TestFolderPermissionsInheritedWhenRootPathDoesNotExist(t *testing.T) {
 	b := &bundle.Bundle{
+		SyncRootPath: t.TempDir(),
 		Config: config.Root{
 			Workspace: config.Workspace{
 				RootPath:     "/Workspace/Users/foo@bar.com",
@@ -77,6 +78,7 @@ func TestFolderPermissionsInheritedWhenRootPathDoesNotExist(t *testing.T) {
 
 func TestValidateFolderPermissionsFailsOnMissingBundlePermission(t *testing.T) {
 	b := &bundle.Bundle{
+		SyncRootPath: t.TempDir(),
 		Config: config.Root{
 			Workspace: config.Workspace{
 				RootPath:     "/Workspace/Users/foo@bar.com",
@@ -129,6 +131,7 @@ func TestValidateFolderPermissionsFailsOnMissingBundlePermission(t *testing.T) {
 
 func TestValidateFolderPermissionsFailsOnPermissionMismatch(t *testing.T) {
 	b := &bundle.Bundle{
+		SyncRootPath: t.TempDir(),
 		Config: config.Root{
 			Workspace: config.Workspace{
 				RootPath:     "/Workspace/Users/foo@bar.com",
@@ -174,6 +177,7 @@ func TestValidateFolderPermissionsFailsOnPermissionMismatch(t *testing.T) {
 
 func TestValidateFolderPermissionsFailsOnNoRootFolder(t *testing.T) {
 	b := &bundle.Bundle{
+		SyncRootPath: t.TempDir(),
 		Config: config.Root{
 			Workspace: config.Workspace{
 				RootPath:     "/NotExisting",

bundle/permissions/workspace_root.go

@@ -3,6 +3,7 @@ package permissions
 import (
 	"context"
 	"fmt"
+	"strings"
 
 	"github.com/databricks/cli/bundle"
 	"github.com/databricks/cli/bundle/libraries"
@@ -59,6 +60,9 @@ func giveAccessForWorkspaceRoot(ctx context.Context, b *bundle.Bundle) error {
 
 	g, ctx := errgroup.WithContext(ctx)
 	for _, p := range bundlePaths {
+		if strings.HasPrefix(p, b.SyncRootPath) {
+			continue
+		}
 		g.Go(func() error {
 			return setPermissions(ctx, w, p, permissions)
 		})

bundle/permissions/workspace_root_test.go

@@ -19,6 +19,7 @@ import (
 
 func TestApplyWorkspaceRootPermissions(t *testing.T) {
 	b := &bundle.Bundle{
+		SyncRootPath: t.TempDir(),
 		Config: config.Root{
 			Workspace: config.Workspace{
 				RootPath:     "/Users/foo@bar.com",
@@ -79,6 +80,7 @@ func TestApplyWorkspaceRootPermissions(t *testing.T) {
 
 func TestApplyWorkspaceRootPermissionsForAllPaths(t *testing.T) {
 	b := &bundle.Bundle{
+		SyncRootPath: t.TempDir(),
 		Config: config.Root{
 			Workspace: config.Workspace{
 				RootPath:     "/Some/Root/Path",

bundle/trampoline/python_dbr_warning.go

@@ -6,7 +6,6 @@ import (
 	"strings"
 
 	"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/log"
@@ -23,9 +22,6 @@ func WrapperWarning() bundle.Mutator {
 
 func (m *wrapperWarning) Apply(ctx context.Context, b *bundle.Bundle) diag.Diagnostics {
 	if isPythonWheelWrapperOn(b) {
-		if config.IsExplicitlyEnabled(b.Config.Presets.SourceLinkedDeployment) {
-			return diag.Warningf("Python wheel notebook wrapper is not available when using source-linked deployment mode. You can disable this mode by setting 'presets.source_linked_deployment: false'")
-		}
 		return nil
 	}
 

bundle/trampoline/python_dbr_warning_test.go

@@ -335,24 +335,6 @@ func TestNoWarningWhenPythonWheelWrapperIsOn(t *testing.T) {
 	require.NoError(t, diags.Error())
 }
 
-func TestPythonWheelWithSourceLinkedDeployment(t *testing.T) {
-	enabled := true
-	b := &bundle.Bundle{
-		Config: config.Root{
-			Experimental: &config.Experimental{
-				PythonWheelWrapper: true,
-			},
-			Presets: config.Presets{
-				SourceLinkedDeployment: &enabled,
-			},
-		},
-	}
-
-	diags := bundle.Apply(context.Background(), b, WrapperWarning())
-	require.NoError(t, diags.Error())
-	require.Contains(t, diags[0].Summary, "Python wheel notebook wrapper is not available when using source-linked deployment mode")
-}
-
 func TestSparkVersionLowerThanExpected(t *testing.T) {
 	testCases := map[string]bool{
 		"13.1.x-scala2.12":                false,