From e3e29ea78db728ef6d78246cbeb5d13afbecce76 Mon Sep 17 00:00:00 2001
From: Andrew Nester <andrew.nester@databricks.com>
Date: Tue, 17 Sep 2024 14:56:41 +0200
Subject: [PATCH] Fixed detecting full syntax variable override which includes
 type field

---
 bundle/config/root.go | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/bundle/config/root.go b/bundle/config/root.go
index 46578769c..884c2e1ca 100644
--- a/bundle/config/root.go
+++ b/bundle/config/root.go
@@ -409,18 +409,33 @@ func (r *Root) MergeTargetOverrides(name string) error {
 var variableKeywords = []string{"default", "lookup"}
 
 // isFullVariableOverrideDef checks if the given value is a full syntax varaible override.
-// A full syntax variable override is a map with only one of the following
-// keys: "default", "lookup".
+// A full syntax variable override is a map with either 1 of 2 keys.
+// If it's 2 keys, the keys should be "default" and "type".
+// If it's 1 key, the key should be one of the following keys: "default", "lookup".
 func isFullVariableOverrideDef(v dyn.Value) bool {
 	mv, ok := v.AsMap()
 	if !ok {
 		return false
 	}
 
-	if mv.Len() != 1 {
+	// If the map has more than 2 keys, it is not a full variable override.
+	if mv.Len() > 2 {
 		return false
 	}
 
+	// If the map has 2 keys, one of them should be "default" and the other is "type"
+	if mv.Len() == 2 {
+		if _, ok := mv.GetByString("type"); !ok {
+			return false
+		}
+
+		if _, ok := mv.GetByString("default"); !ok {
+			return false
+		}
+
+		return true
+	}
+
 	for _, keyword := range variableKeywords {
 		if _, ok := mv.GetByString(keyword); ok {
 			return true