From 6463a43aa1d858dcffdba37d570e05768fab3883 Mon Sep 17 00:00:00 2001
From: Michal Szafranski <michal@databricks.com>
Date: Tue, 7 Nov 2023 17:00:58 +0100
Subject: [PATCH 1/2] initial

---
 bundle/config/mutator/translate_paths.go      | 11 +++++++
 bundle/config/mutator/translate_paths_jobs.go | 30 +++++++++++++++++++
 bundle/config/mutator/translate_paths_test.go | 24 +++++++++++++++
 3 files changed, 65 insertions(+)

diff --git a/bundle/config/mutator/translate_paths.go b/bundle/config/mutator/translate_paths.go
index acfd55258b..8d3c8ce328 100644
--- a/bundle/config/mutator/translate_paths.go
+++ b/bundle/config/mutator/translate_paths.go
@@ -135,6 +135,17 @@ func translateFilePath(literal, localFullPath, localRelPath, remotePath string)
 	return remotePath, nil
 }
 
+func translateDirectoryPath(literal, localFullPath, localRelPath, remotePath string) (string, error) {
+	info, err := os.Stat(localFullPath)
+	if err != nil {
+		return "", err
+	}
+	if !info.IsDir() {
+		return "", fmt.Errorf("%s is not a directory", localFullPath)
+	}
+	return remotePath, nil
+}
+
 func translateNoOp(literal, localFullPath, localRelPath, remotePath string) (string, error) {
 	return localRelPath, nil
 }
diff --git a/bundle/config/mutator/translate_paths_jobs.go b/bundle/config/mutator/translate_paths_jobs.go
index b94df5e2e6..9374d6ed40 100644
--- a/bundle/config/mutator/translate_paths_jobs.go
+++ b/bundle/config/mutator/translate_paths_jobs.go
@@ -50,6 +50,34 @@ func transformWhlLibrary(resource any, dir string) *transformer {
 	}
 }
 
+func transformDbtTask(resource any, dir string) *transformer {
+	task, ok := resource.(*jobs.Task)
+	if !ok || task.DbtTask == nil {
+		return nil
+	}
+
+	return &transformer{
+		dir,
+		&task.DbtTask.ProjectDirectory,
+		"tasks.dbt_task.project_directory",
+		translateDirectoryPath,
+	}
+}
+
+func transformSqlFileTask(resource any, dir string) *transformer {
+	task, ok := resource.(*jobs.Task)
+	if !ok || task.SqlTask == nil || task == nil || task.SqlTask.File == nil {
+		return nil
+	}
+
+	return &transformer{
+		dir,
+		&task.SqlTask.File.Path,
+		"tasks.sql_task.file.path",
+		translateFilePath,
+	}
+}
+
 func transformJarLibrary(resource any, dir string) *transformer {
 	library, ok := resource.(*compute.Library)
 	if !ok || library.Jar == "" {
@@ -70,6 +98,8 @@ func applyJobTransformers(m *translatePaths, b *bundle.Bundle) error {
 		transformSparkTask,
 		transformWhlLibrary,
 		transformJarLibrary,
+		transformDbtTask,
+		transformSqlFileTask,
 	}
 
 	for key, job := range b.Config.Resources.Jobs {
diff --git a/bundle/config/mutator/translate_paths_test.go b/bundle/config/mutator/translate_paths_test.go
index f7edee30aa..c24fd2e713 100644
--- a/bundle/config/mutator/translate_paths_test.go
+++ b/bundle/config/mutator/translate_paths_test.go
@@ -275,6 +275,8 @@ func TestTranslatePathsInSubdirectories(t *testing.T) {
 	touchEmptyFile(t, filepath.Join(dir, "job", "my_python_file.py"))
 	touchEmptyFile(t, filepath.Join(dir, "job", "dist", "task.jar"))
 	touchEmptyFile(t, filepath.Join(dir, "pipeline", "my_python_file.py"))
+	touchEmptyFile(t, filepath.Join(dir, "job", "my_sql_file.sql"))
+	touchEmptyFile(t, filepath.Join(dir, "job", "my_dbt_project", "dbt_project.yml"))
 
 	bundle := &bundle.Bundle{
 		Config: config.Root{
@@ -303,6 +305,18 @@ func TestTranslatePathsInSubdirectories(t *testing.T) {
 										{Jar: "./dist/task.jar"},
 									},
 								},
+								{
+									SqlTask: &jobs.SqlTask{
+										File: &jobs.SqlTaskFile{
+											Path: "./my_sql_file.sql",
+										},
+									},
+								},
+								{
+									DbtTask: &jobs.DbtTask{
+										ProjectDirectory: "./my_dbt_project",
+									},
+								},
 							},
 						},
 					},
@@ -341,6 +355,16 @@ func TestTranslatePathsInSubdirectories(t *testing.T) {
 		"/bundle/job/dist/task.jar",
 		bundle.Config.Resources.Jobs["job"].Tasks[1].Libraries[0].Jar,
 	)
+	assert.Equal(
+		t,
+		"/bundle/job/my_sql_file.sql",
+		bundle.Config.Resources.Jobs["job"].Tasks[2].SqlTask.File.Path,
+	)
+	assert.Equal(
+		t,
+		"/bundle/job/my_dbt_project",
+		bundle.Config.Resources.Jobs["job"].Tasks[3].DbtTask.ProjectDirectory,
+	)
 
 	assert.Equal(
 		t,

From c11c79ddf77964a7b98f0e48898bd6c58ce4e594 Mon Sep 17 00:00:00 2001
From: Michal Szafranski <michal@databricks.com>
Date: Tue, 7 Nov 2023 17:12:59 +0100
Subject: [PATCH 2/2] remove redundant check

---
 bundle/config/mutator/translate_paths_jobs.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundle/config/mutator/translate_paths_jobs.go b/bundle/config/mutator/translate_paths_jobs.go
index 9374d6ed40..564b8e021a 100644
--- a/bundle/config/mutator/translate_paths_jobs.go
+++ b/bundle/config/mutator/translate_paths_jobs.go
@@ -66,7 +66,7 @@ func transformDbtTask(resource any, dir string) *transformer {
 
 func transformSqlFileTask(resource any, dir string) *transformer {
 	task, ok := resource.(*jobs.Task)
-	if !ok || task.SqlTask == nil || task == nil || task.SqlTask.File == nil {
+	if !ok || task.SqlTask == nil || task.SqlTask.File == nil {
 		return nil
 	}