From 9783b958b988222f21a83aa024ee00983576fabe Mon Sep 17 00:00:00 2001
From: Andrew Nester <andrew.nester@databricks.com>
Date: Fri, 6 Sep 2024 16:19:04 +0200
Subject: [PATCH] fixes for tags

---
 bundle/config/mutator/apply_presets.go                      | 6 ++++--
 .../bundle/bundles/clusters/template/databricks.yml.tmpl    | 3 ---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/bundle/config/mutator/apply_presets.go b/bundle/config/mutator/apply_presets.go
index 583ba003..2527d6d4 100644
--- a/bundle/config/mutator/apply_presets.go
+++ b/bundle/config/mutator/apply_presets.go
@@ -168,8 +168,10 @@ func (m *applyPresets) Apply(ctx context.Context, b *bundle.Bundle) diag.Diagnos
 			c.CustomTags = make(map[string]string)
 		}
 		for _, tag := range tags {
-			if c.CustomTags[tag.Key] == "" {
-				c.CustomTags[tag.Key] = tag.Value
+			normalisedKey := b.Tagging.NormalizeKey(tag.Key)
+			normalisedValue := b.Tagging.NormalizeValue(tag.Value)
+			if c.CustomTags[normalisedKey] == "" {
+				c.CustomTags[normalisedKey] = normalisedValue
 			}
 		}
 	}
diff --git a/internal/bundle/bundles/clusters/template/databricks.yml.tmpl b/internal/bundle/bundles/clusters/template/databricks.yml.tmpl
index d820d7d2..e0d6320a 100644
--- a/internal/bundle/bundles/clusters/template/databricks.yml.tmpl
+++ b/internal/bundle/bundles/clusters/template/databricks.yml.tmpl
@@ -11,9 +11,6 @@ resources:
       spark_version: "{{.spark_version}}"
       node_type_id: "{{.node_type_id}}"
       num_workers: 2
-      autoscale:
-        min_workers: 2
-        max_workers: 6
       spark_conf:
         "spark.executor.memory": "2g"