Address comments

bundle/internal/schema/main.go

@@ -22,14 +22,17 @@ func addInterpolationPatterns(typ reflect.Type, s jsonschema.Schema) jsonschema.
 	}
 
 	// The variables block in a target override allows for directly specifying
-	// the value if it is a primitive type.
+	// the value of the variable.
 	if typ == reflect.TypeOf(variable.TargetVariable{}) {
 		return jsonschema.Schema{
-			AnyOf: []jsonschema.Schema{s,
+			AnyOf: []jsonschema.Schema{
-				{Type: jsonschema.StringType},
+				// We keep the original schema so that autocomplete suggestions
-				{Type: jsonschema.BooleanType},
+				// continue to work.
-				{Type: jsonschema.IntegerType},
+				s,
-				{Type: jsonschema.NumberType},
+				// All values are valid for a variable value, be it primitive types
+				// like string/bool or complex ones like objects/arrays. Thus we override
+				// the schema to allow all valid JSON values.
+				{},
 			},
 		}
 	}

bundle/schema/jsonschema.json

@@ -642,6 +642,29 @@
                   }
                 ]
               },
+              "variable.TargetVariable": {
+                "anyOf": [
+                  {
+                    "type": "object",
+                    "properties": {
+                      "default": {
+                        "$ref": "#/$defs/interface"
+                      },
+                      "description": {
+                        "$ref": "#/$defs/string"
+                      },
+                      "lookup": {
+                        "$ref": "#/$defs/github.com/databricks/cli/bundle/config/variable.Lookup"
+                      },
+                      "type": {
+                        "$ref": "#/$defs/github.com/databricks/cli/bundle/config/variable.VariableType"
+                      }
+                    },
+                    "additionalProperties": false
+                  },
+                  {}
+                ]
+              },
               "variable.Variable": {
                 "type": "object",
                 "properties": {
@@ -995,7 +1018,7 @@
                       "$ref": "#/$defs/github.com/databricks/cli/bundle/config.Sync"
                     },
                     "variables": {
-                      "$ref": "#/$defs/map/github.com/databricks/cli/bundle/config.TargetVariable"
+                      "$ref": "#/$defs/map/github.com/databricks/cli/bundle/config/variable.TargetVariable"
                     },
                     "workspace": {
                       "$ref": "#/$defs/github.com/databricks/cli/bundle/config.Workspace"
@@ -1009,40 +1032,6 @@
                 }
               ]
             },
-            "config.TargetVariable": {
-              "anyOf": [
-                {
-                  "type": "object",
-                  "properties": {
-                    "default": {
-                      "$ref": "#/$defs/interface"
-                    },
-                    "description": {
-                      "$ref": "#/$defs/string"
-                    },
-                    "lookup": {
-                      "$ref": "#/$defs/github.com/databricks/cli/bundle/config/variable.Lookup"
-                    },
-                    "type": {
-                      "$ref": "#/$defs/github.com/databricks/cli/bundle/config/variable.VariableType"
-                    }
-                  },
-                  "additionalProperties": false
-                },
-                {
-                  "type": "string"
-                },
-                {
-                  "type": "boolean"
-                },
-                {
-                  "type": "integer"
-                },
-                {
-                  "type": "number"
-                }
-              ]
-            },
             "config.Workspace": {
               "anyOf": [
                 {
@@ -5027,6 +5016,20 @@
                     }
                   ]
                 },
+                "variable.TargetVariable": {
+                  "anyOf": [
+                    {
+                      "type": "object",
+                      "additionalProperties": {
+                        "$ref": "#/$defs/github.com/databricks/cli/bundle/config/variable.TargetVariable"
+                      }
+                    },
+                    {
+                      "type": "string",
+                      "pattern": "\\$\\{(var(\\.[a-zA-Z]+([-_]?[a-zA-Z0-9]+)*(\\[[0-9]+\\])*)*(\\[[0-9]+\\])*)\\}"
+                    }
+                  ]
+                },
                 "variable.Variable": {
                   "anyOf": [
                     {
@@ -5083,20 +5086,6 @@
                     "pattern": "\\$\\{(var(\\.[a-zA-Z]+([-_]?[a-zA-Z0-9]+)*(\\[[0-9]+\\])*)+)\\}"
                   }
                 ]
-              },
-              "config.TargetVariable": {
-                "anyOf": [
-                  {
-                    "type": "object",
-                    "additionalProperties": {
-                      "$ref": "#/$defs/github.com/databricks/cli/bundle/config.TargetVariable"
-                    }
-                  },
-                  {
-                    "type": "string",
-                    "pattern": "\\$\\{(var(\\.[a-zA-Z]+([-_]?[a-zA-Z0-9]+)*(\\[[0-9]+\\])*)*(\\[[0-9]+\\])*)\\}"
-                  }
-                ]
               }
             }
           }