Move trampoline code into trampoline package

databricks · Sep 27, 2024 · 18863f9 · 18863f9
1 parent 4e8e027
commit 18863f9
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 15 deletions.
diff --git a/bundle/phases/deploy.go b/bundle/phases/deploy.go
@@ -15,8 +15,8 @@ import (
 	"github.com/databricks/cli/bundle/deploy/terraform"
 	"github.com/databricks/cli/bundle/libraries"
 	"github.com/databricks/cli/bundle/permissions"
-	"github.com/databricks/cli/bundle/python"
 	"github.com/databricks/cli/bundle/scripts"
+	"github.com/databricks/cli/bundle/trampoline"
 	"github.com/databricks/cli/libs/cmdio"
 	"github.com/databricks/cli/libs/sync"
 	terraformlib "github.com/databricks/cli/libs/terraform"
@@ -157,7 +157,7 @@ func Deploy(outputHandler sync.OutputHandler) bundle.Mutator {
 				artifacts.CleanUp(),
 				libraries.ExpandGlobReferences(),
 				libraries.Upload(),
-				python.TransformWheelTask(),
+				trampoline.TransformWheelTask(),
 				files.Upload(outputHandler),
 				deploy.StateUpdate(),
 				deploy.StatePush(),

diff --git a/bundle/phases/initialize.go b/bundle/phases/initialize.go
@@ -9,8 +9,8 @@ import (
 	"github.com/databricks/cli/bundle/deploy/metadata"
 	"github.com/databricks/cli/bundle/deploy/terraform"
 	"github.com/databricks/cli/bundle/permissions"
-	"github.com/databricks/cli/bundle/python"
 	"github.com/databricks/cli/bundle/scripts"
+	"github.com/databricks/cli/bundle/trampoline"
 )
 
 // The initialize phase fills in defaults and connects to the workspace.
@@ -66,7 +66,7 @@ func Initialize() bundle.Mutator {
 			mutator.ConfigureWSFS(),
 
 			mutator.TranslatePaths(),
-			python.WrapperWarning(),
+			trampoline.WrapperWarning(),
 			permissions.ApplyBundlePermissions(),
 			permissions.FilterCurrentUser(),
 			metadata.AnnotateJobs(),

diff --git a/bundle/python/conditional_transform_test.go → .../trampoline/conditional_transform_test.go b/bundle/python/conditional_transform_test.go → .../trampoline/conditional_transform_test.go
@@ -1,4 +1,4 @@
-package python
+package trampoline
 
 import (
 	"context"

diff --git a/bundle/python/warning.go → bundle/trampoline/python_dbr_warning.go b/bundle/python/warning.go → bundle/trampoline/python_dbr_warning.go
@@ -1,4 +1,4 @@
-package python
+package trampoline
 
 import (
 	"context"

diff --git a/bundle/python/warning_test.go → bundle/trampoline/python_dbr_warning_test.go b/bundle/python/warning_test.go → bundle/trampoline/python_dbr_warning_test.go
@@ -1,4 +1,4 @@
-package python
+package trampoline
 
 import (
 	"context"

diff --git a/bundle/python/transform.go → bundle/trampoline/python_wheel.go b/bundle/python/transform.go → bundle/trampoline/python_wheel.go
@@ -1,4 +1,4 @@
-package python
+package trampoline
 
 import (
 	"context"
@@ -69,7 +69,7 @@ func TransformWheelTask() bundle.Mutator {
 			res := b.Config.Experimental != nil && b.Config.Experimental.PythonWheelWrapper
 			return res, nil
 		},
-		mutator.NewTrampoline(
+		NewTrampoline(
 			"python_wheel",
 			&pythonTrampoline{},
 			NOTEBOOK_TEMPLATE,
@@ -94,9 +94,9 @@ func (t *pythonTrampoline) CleanUp(task *jobs.Task) error {
 	return nil
 }
 
-func (t *pythonTrampoline) GetTasks(b *bundle.Bundle) []mutator.TaskWithJobKey {
+func (t *pythonTrampoline) GetTasks(b *bundle.Bundle) []TaskWithJobKey {
 	r := b.Config.Resources
-	result := make([]mutator.TaskWithJobKey, 0)
+	result := make([]TaskWithJobKey, 0)
 	for k := range b.Config.Resources.Jobs {
 		tasks := r.Jobs[k].JobSettings.Tasks
 		for i := range tasks {
@@ -110,7 +110,7 @@ func (t *pythonTrampoline) GetTasks(b *bundle.Bundle) []mutator.TaskWithJobKey {
 				continue
 			}
 
-			result = append(result, mutator.TaskWithJobKey{
+			result = append(result, TaskWithJobKey{
 				JobKey: k,
 				Task:   task,
 			})

diff --git a/bundle/python/transform_test.go → bundle/trampoline/python_wheel_test.go b/bundle/python/transform_test.go → bundle/trampoline/python_wheel_test.go
@@ -1,4 +1,4 @@
-package python
+package trampoline
 
 import (
 	"context"

diff --git a/bundle/config/mutator/trampoline.go → bundle/trampoline/trampoline.go b/bundle/config/mutator/trampoline.go → bundle/trampoline/trampoline.go
@@ -1,4 +1,4 @@
-package mutator
+package trampoline
 
 import (
 	"context"
@@ -23,6 +23,7 @@ type TrampolineFunctions interface {
 	GetTasks(b *bundle.Bundle) []TaskWithJobKey
 	CleanUp(task *jobs.Task) error
 }
+
 type trampoline struct {
 	name      string
 	functions TrampolineFunctions

diff --git a/bundle/config/mutator/trampoline_test.go → bundle/trampoline/trampoline_test.go b/bundle/config/mutator/trampoline_test.go → bundle/trampoline/trampoline_test.go
@@ -1,4 +1,4 @@
-package mutator
+package trampoline
 
 import (
 	"context"