Add support for clusters in deployment bind/unbind commands

NEXT_CHANGELOG.md

@@ -7,5 +7,6 @@
 ### Bundles
 
 * Processing 'artifacts' section is now done in "bundle validate" (adding defaults, inferring "build", asserting required fields) ([#2526])(https://github.com/databricks/cli/pull/2526))
+* Add support for clusters in deployment bind/unbind commands ([#2536](https://github.com/databricks/cli/pull/2536))
 
 ### API Changes

acceptance/acceptance_test.go

@@ -290,6 +290,10 @@ func getSkipReason(config *internal.TestConfig, configPath string) string {
 			return fmt.Sprintf("Disabled via RequiresUnityCatalog setting in %s (TEST_METASTORE_ID=%s)", configPath, os.Getenv("TEST_METASTORE_ID"))
 		}
 
+		if isTruePtr(config.RequiresCluster) && os.Getenv("TEST_DEFAULT_CLUSTER_ID") == "" {
+			return fmt.Sprintf("Disabled via RequiresCluster setting in %s (TEST_DEFAULT_CLUSTER_ID=%s)", configPath, os.Getenv("TEST_DEFAULT_CLUSTER_ID"))
+		}
+
 	} else {
 		// Local run
 		if !isTruePtr(config.Local) {

acceptance/bundle/deployment/bind/cluster/databricks.yml.tmpl

@@ -0,0 +1,9 @@
+bundle:
+  name: bind-cluster-test-$BUNDLE_NAME_SUFFIX
+
+resources:
+  clusters:
+    cluster1:
+      cluster_name: "DEFAULT Test Cluster"
+      spark_version: '16.2.x-scala2.12'
+

acceptance/bundle/deployment/bind/cluster/output.txt

@@ -0,0 +1,24 @@
+
+>>> cat databricks.yml
+bundle:
+  name: bind-cluster-test-[UUID]
+
+resources:
+  clusters:
+    cluster1:
+      cluster_name: "DEFAULT Test Cluster"
+      spark_version: '16.2.x-scala2.12'
+
+
+>>> [CLI] clusters get [CLUSTER-ID]
+{
+  "cluster_name": "DEFAULT Test Cluster"
+}
+
+>>> [CLI] bundle deployment bind cluster1 [CLUSTER-ID] --auto-approve
+Updating deployment state...
+Successfully bound databricks_cluster with an id '[CLUSTER-ID]'. Run 'bundle deploy' to deploy changes to your workspace
+
+>>> [CLI] bundle deployment unbind cluster1
+Updating deployment state...
+0

acceptance/bundle/deployment/bind/cluster/script

@@ -0,0 +1,17 @@
+BUNDLE_NAME_SUFFIX=$(uuid)
+export BUNDLE_NAME_SUFFIX
+
+CLUSTER_ID="0123-456789-cluster0"
+if [ -n "${TEST_DEFAULT_CLUSTER_ID:-}" ]; then
+    CLUSTER_ID=${TEST_DEFAULT_CLUSTER_ID}
+fi
+export CLUSTER_ID
+envsubst < databricks.yml.tmpl > databricks.yml
+trace cat databricks.yml
+
+trace $CLI clusters get ${CLUSTER_ID} | jq '{cluster_name}'
+
+trace $CLI bundle deployment bind cluster1 "${CLUSTER_ID}" --auto-approve
+
+trace $CLI bundle deployment unbind cluster1
+echo $?

acceptance/bundle/deployment/bind/cluster/test.toml

@@ -0,0 +1,19 @@
+Local = true
+Cloud = true
+RequiresCluster = true
+
+Ignore = [
+    "databricks.yml",
+]
+
+[[Repls]]
+Old = "[0-9]{4}-[0-9]{6}-[0-9a-z]{8}"
+New = "[CLUSTER-ID]"
+
+[[Server]]
+Pattern = "GET /api/2.1/clusters/get"
+Response.Body = '''
+{
+  "cluster_name": "DEFAULT Test Cluster"
+}
+'''

acceptance/internal/config.go

@@ -39,6 +39,9 @@ type TestConfig struct {
 	// If true and Cloud=true, run this test only if unity catalog is available in the cloud environment
 	RequiresUnityCatalog *bool
 
+	// If true and Cloud=true, run this test only if a default test is available in the cloud environment
+	RequiresCluster *bool
+
 	// List of additional replacements to apply on this test.
 	// Old is a regexp, New is a replacement expression.
 	Repls []testdiff.Replacement

bundle/config/resources.go

@@ -124,6 +124,12 @@ func (r *Resources) FindResourceByConfigKey(key string) (ConfigResource, error)
 		}
 	}
 
+	for k := range r.Clusters {
+		if k == key {
+			found = append(found, r.Clusters[k])
+		}
+	}
+
 	if len(found) == 0 {
 		return nil, fmt.Errorf("no such resource: %s", key)
 	}