From d17a71b95e425e4a6c51981c8004bb24849d719f Mon Sep 17 00:00:00 2001
From: Denis Bilenko <denis.bilenko@databricks.com>
Date: Wed, 15 Jan 2025 12:35:18 +0100
Subject: [PATCH] Migrate TestResolveComplexVariable to acceptance test

---
 .../variables/complex-simple/databricks.yml   | 28 +++++++++
 .../variables/complex-simple/output.txt       | 14 +++++
 .../bundle/variables/complex-simple/script    |  1 +
 .../resolve_variable_references_test.go       | 58 -------------------
 4 files changed, 43 insertions(+), 58 deletions(-)
 create mode 100644 acceptance/bundle/variables/complex-simple/databricks.yml
 create mode 100644 acceptance/bundle/variables/complex-simple/output.txt
 create mode 100644 acceptance/bundle/variables/complex-simple/script

diff --git a/acceptance/bundle/variables/complex-simple/databricks.yml b/acceptance/bundle/variables/complex-simple/databricks.yml
new file mode 100644
index 0000000000..65e32e2983
--- /dev/null
+++ b/acceptance/bundle/variables/complex-simple/databricks.yml
@@ -0,0 +1,28 @@
+# This example works and properly merges resources.jobs.job1.job_clusters.new_cluster and ${var.cluster}.
+# retaining num_workers, spark_version and overriding node_type_id.
+# However, it prints a warning "expected map, found string" which is unnecessary.
+bundle:
+  name: TestResolveComplexVariable
+
+variables:
+  type: "complex"
+  cluster:
+    value:
+      node_type_id: "Standard_DS3_v2"
+      num_workers: 2
+
+resources:
+  jobs:
+    job1:
+      job_clusters:
+        - new_cluster:
+            node_type_id: "random"
+            spark_version: 13.3.x-scala2.12
+
+targets:
+  dev:
+    resources:
+      jobs:
+        job1:
+          job_clusters:
+            - new_cluster: ${var.cluster}
diff --git a/acceptance/bundle/variables/complex-simple/output.txt b/acceptance/bundle/variables/complex-simple/output.txt
new file mode 100644
index 0000000000..a69df50b9d
--- /dev/null
+++ b/acceptance/bundle/variables/complex-simple/output.txt
@@ -0,0 +1,14 @@
+Warning: expected map, found string
+  at variables.type
+  in databricks.yml:5:9
+
+[
+  {
+    "job_cluster_key": "",
+    "new_cluster": {
+      "node_type_id": "Standard_DS3_v2",
+      "num_workers": 2,
+      "spark_version": "13.3.x-scala2.12"
+    }
+  }
+]
diff --git a/acceptance/bundle/variables/complex-simple/script b/acceptance/bundle/variables/complex-simple/script
new file mode 100644
index 0000000000..1c31d0b406
--- /dev/null
+++ b/acceptance/bundle/variables/complex-simple/script
@@ -0,0 +1 @@
+$CLI bundle validate -o json | jq .resources.jobs.job1.job_clusters
diff --git a/bundle/config/mutator/resolve_variable_references_test.go b/bundle/config/mutator/resolve_variable_references_test.go
index 6bf84ae6da..2ef2738498 100644
--- a/bundle/config/mutator/resolve_variable_references_test.go
+++ b/bundle/config/mutator/resolve_variable_references_test.go
@@ -16,64 +16,6 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestResolveComplexVariable(t *testing.T) {
-	b := &bundle.Bundle{
-		Config: config.Root{
-			Bundle: config.Bundle{
-				Name: "example",
-			},
-			Variables: map[string]*variable.Variable{
-				"cluster": {
-					Value: map[string]any{
-						"node_type_id": "Standard_DS3_v2",
-						"num_workers":  2,
-					},
-					Type: variable.VariableTypeComplex,
-				},
-			},
-
-			Resources: config.Resources{
-				Jobs: map[string]*resources.Job{
-					"job1": {
-						JobSettings: &jobs.JobSettings{
-							JobClusters: []jobs.JobCluster{
-								{
-									NewCluster: compute.ClusterSpec{
-										NodeTypeId: "random",
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-		},
-	}
-
-	ctx := context.Background()
-
-	// Assign the variables to the dynamic configuration.
-	diags := bundle.ApplyFunc(ctx, b, func(ctx context.Context, b *bundle.Bundle) diag.Diagnostics {
-		err := b.Config.Mutate(func(v dyn.Value) (dyn.Value, error) {
-			var p dyn.Path
-			var err error
-
-			p = dyn.MustPathFromString("resources.jobs.job1.job_clusters[0]")
-			v, err = dyn.SetByPath(v, p.Append(dyn.Key("new_cluster")), dyn.V("${var.cluster}"))
-			require.NoError(t, err)
-
-			return v, nil
-		})
-		return diag.FromErr(err)
-	})
-	require.NoError(t, diags.Error())
-
-	diags = bundle.Apply(ctx, b, ResolveVariableReferences("bundle", "workspace", "variables"))
-	require.NoError(t, diags.Error())
-	require.Equal(t, "Standard_DS3_v2", b.Config.Resources.Jobs["job1"].JobSettings.JobClusters[0].NewCluster.NodeTypeId)
-	require.Equal(t, 2, b.Config.Resources.Jobs["job1"].JobSettings.JobClusters[0].NewCluster.NumWorkers)
-}
-
 func TestResolveComplexVariableReferencesWithComplexVariablesError(t *testing.T) {
 	b := &bundle.Bundle{
 		Config: config.Root{