From bb18ef031f686723d5986f857607ceb4b191bd26 Mon Sep 17 00:00:00 2001
From: Andrew Nester <andrew.nester@databricks.com>
Date: Thu, 26 Mar 2026 13:55:00 +0100
Subject: [PATCH 1/2] acc: Volumes references to catalog are not resolved if
 used var.catalog syntax

---
 .../volumes/catalog-var-ref/databricks.yml    | 27 ++++++++++++
 .../volumes/catalog-var-ref/out.test.toml     |  5 +++
 .../volumes/catalog-var-ref/output.txt        | 43 +++++++++++++++++++
 .../resources/volumes/catalog-var-ref/script  |  1 +
 .../volumes/catalog-var-ref/test.toml         |  8 ++++
 5 files changed, 84 insertions(+)
 create mode 100644 acceptance/bundle/resources/volumes/catalog-var-ref/databricks.yml
 create mode 100644 acceptance/bundle/resources/volumes/catalog-var-ref/out.test.toml
 create mode 100644 acceptance/bundle/resources/volumes/catalog-var-ref/output.txt
 create mode 100644 acceptance/bundle/resources/volumes/catalog-var-ref/script
 create mode 100644 acceptance/bundle/resources/volumes/catalog-var-ref/test.toml

diff --git a/acceptance/bundle/resources/volumes/catalog-var-ref/databricks.yml b/acceptance/bundle/resources/volumes/catalog-var-ref/databricks.yml
new file mode 100644
index 0000000000..39a821dee7
--- /dev/null
+++ b/acceptance/bundle/resources/volumes/catalog-var-ref/databricks.yml
@@ -0,0 +1,27 @@
+bundle:
+  name: catalog-var-ref
+
+variables:
+  catalog:
+    description: Unity Catalog name
+    default: main
+
+resources:
+  catalogs:
+    main_catalog:
+      name: ${var.catalog}
+      comment: "My catalog"
+      storage_root: s3://my-s3-path/dbx/${var.catalog}
+#
+  schemas:
+    raw_schema:
+      name: raw
+      catalog_name: ${var.catalog}
+
+  volumes:
+    metadata:
+      name: metadata
+      catalog_name: ${var.catalog}
+      schema_name: raw
+      volume_type: EXTERNAL
+      storage_location: s3://my-s3-path/${var.catalog}_raw
diff --git a/acceptance/bundle/resources/volumes/catalog-var-ref/out.test.toml b/acceptance/bundle/resources/volumes/catalog-var-ref/out.test.toml
new file mode 100644
index 0000000000..54146af564
--- /dev/null
+++ b/acceptance/bundle/resources/volumes/catalog-var-ref/out.test.toml
@@ -0,0 +1,5 @@
+Local = true
+Cloud = false
+
+[EnvMatrix]
+  DATABRICKS_BUNDLE_ENGINE = ["direct"]
diff --git a/acceptance/bundle/resources/volumes/catalog-var-ref/output.txt b/acceptance/bundle/resources/volumes/catalog-var-ref/output.txt
new file mode 100644
index 0000000000..56e088656d
--- /dev/null
+++ b/acceptance/bundle/resources/volumes/catalog-var-ref/output.txt
@@ -0,0 +1,43 @@
+{
+  "plan_version": 2,
+  "cli_version": "[DEV_VERSION]",
+  "plan": {
+    "resources.catalogs.main_catalog": {
+      "action": "create",
+      "new_state": {
+        "value": {
+          "comment": "My catalog",
+          "name": "main",
+          "storage_root": "s3://my-s3-path/dbx/main"
+        }
+      }
+    },
+    "resources.schemas.raw_schema": {
+      "depends_on": [
+        {
+          "node": "resources.catalogs.main_catalog",
+          "label": "${resources.catalogs.main_catalog.name}"
+        }
+      ],
+      "action": "create",
+      "new_state": {
+        "value": {
+          "catalog_name": "main",
+          "name": "raw"
+        }
+      }
+    },
+    "resources.volumes.metadata": {
+      "action": "create",
+      "new_state": {
+        "value": {
+          "catalog_name": "main",
+          "name": "metadata",
+          "schema_name": "raw",
+          "storage_location": "s3://my-s3-path/main_raw",
+          "volume_type": "EXTERNAL"
+        }
+      }
+    }
+  }
+}
diff --git a/acceptance/bundle/resources/volumes/catalog-var-ref/script b/acceptance/bundle/resources/volumes/catalog-var-ref/script
new file mode 100644
index 0000000000..7f1b619076
--- /dev/null
+++ b/acceptance/bundle/resources/volumes/catalog-var-ref/script
@@ -0,0 +1 @@
+$CLI bundle plan -o json
diff --git a/acceptance/bundle/resources/volumes/catalog-var-ref/test.toml b/acceptance/bundle/resources/volumes/catalog-var-ref/test.toml
new file mode 100644
index 0000000000..63b6228ab7
--- /dev/null
+++ b/acceptance/bundle/resources/volumes/catalog-var-ref/test.toml
@@ -0,0 +1,8 @@
+Badness = "No depends_on for volume resource"
+
+Local = true
+Cloud = false
+RecordRequests = false
+
+[EnvMatrix]
+  DATABRICKS_BUNDLE_ENGINE = ["direct"]

From ed49fa8f18f8105373cec856995eee1d0c28256a Mon Sep 17 00:00:00 2001
From: Andrew Nester <andrew.nester@databricks.com>
Date: Thu, 26 Mar 2026 17:21:19 +0100
Subject: [PATCH 2/2] make fmt

---
 .../bundle/resources/volumes/catalog-var-ref/databricks.yml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/acceptance/bundle/resources/volumes/catalog-var-ref/databricks.yml b/acceptance/bundle/resources/volumes/catalog-var-ref/databricks.yml
index 39a821dee7..fb99b60b52 100644
--- a/acceptance/bundle/resources/volumes/catalog-var-ref/databricks.yml
+++ b/acceptance/bundle/resources/volumes/catalog-var-ref/databricks.yml
@@ -12,7 +12,7 @@ resources:
       name: ${var.catalog}
       comment: "My catalog"
       storage_root: s3://my-s3-path/dbx/${var.catalog}
-#
+      #
   schemas:
     raw_schema:
       name: raw