From 5ec784bcaea4a17ecfd1a9acc98232cf0a7c1244 Mon Sep 17 00:00:00 2001
From: Shreyas Goenka <shreyas.goenka@databricks.com>
Date: Fri, 29 Nov 2024 02:20:41 +0100
Subject: [PATCH] merge

---
 bundle/config/mutator/apply_presets_test.go        | 2 +-
 bundle/config/resources/volume.go                  | 4 ++++
 bundle/config/validate/single_node_cluster_test.go | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/bundle/config/mutator/apply_presets_test.go b/bundle/config/mutator/apply_presets_test.go
index dfbcf02d5..b4b1840be 100644
--- a/bundle/config/mutator/apply_presets_test.go
+++ b/bundle/config/mutator/apply_presets_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/databricks/cli/bundle/config"
 	"github.com/databricks/cli/bundle/config/mutator"
 	"github.com/databricks/cli/bundle/config/resources"
-	"github.com/databricks/cli/bundle/internal/bundletest"
+	"github.com/databricks/cli/bundle/bundletest"
 	"github.com/databricks/cli/libs/dbr"
 	"github.com/databricks/cli/libs/dyn"
 	"github.com/databricks/databricks-sdk-go/service/catalog"
diff --git a/bundle/config/resources/volume.go b/bundle/config/resources/volume.go
index 4d0429495..cae2a3463 100644
--- a/bundle/config/resources/volume.go
+++ b/bundle/config/resources/volume.go
@@ -56,3 +56,7 @@ func (v *Volume) GetURL() string {
 func (v *Volume) GetName() string {
 	return v.Name
 }
+
+func (v *Volume) IsNil() bool {
+	return v.CreateVolumeRequestContent == nil
+}
diff --git a/bundle/config/validate/single_node_cluster_test.go b/bundle/config/validate/single_node_cluster_test.go
index 18771cc00..6c650f6e9 100644
--- a/bundle/config/validate/single_node_cluster_test.go
+++ b/bundle/config/validate/single_node_cluster_test.go
@@ -5,9 +5,9 @@ import (
 	"testing"
 
 	"github.com/databricks/cli/bundle"
+	"github.com/databricks/cli/bundle/bundletest"
 	"github.com/databricks/cli/bundle/config"
 	"github.com/databricks/cli/bundle/config/resources"
-	"github.com/databricks/cli/bundle/internal/bundletest"
 	"github.com/databricks/cli/libs/diag"
 	"github.com/databricks/cli/libs/dyn"
 	"github.com/databricks/databricks-sdk-go/service/compute"