Cleanup

Author: lennartkats-db

acceptance/bundle/templates/dbt-sql/output/my_dbt_sql/README.md

@@ -93,9 +93,6 @@ These profiles define the default warehouse, catalog, schema, and any other
 target-specific settings. Read more about dbt profiles on Databricks at
 https://docs.databricks.com/en/workflows/jobs/how-to/use-dbt-in-workflows.html#advanced-run-dbt-with-a-custom-profile.
 
-To change the warehouse, catalog, or schema used by deployed dbt jobs,
-edit the settings in `dbt_profiles/profiles.yml`.
-
 The target workspaces for staging and prod are defined in `databricks.yml`.
 You can manually deploy based on these configurations (see below).
 Or you can use CI/CD to automate deployment. See

experimental/apps-mcp/lib/middlewares/warehouse.go

@@ -85,6 +85,7 @@ func getDefaultWarehouse(ctx context.Context) (*sql.EndpointInfo, error) {
 		return nil, fmt.Errorf("get databricks client: %w", err)
 	}
 
+	// first resolve DATABRICKS_WAREHOUSE_ID env variable
 	warehouseID := env.Get(ctx, "DATABRICKS_WAREHOUSE_ID")
 	if warehouseID != "" {
 		warehouse, err := w.Warehouses.Get(ctx, sql.GetWarehouseRequest{

libs/databrickscfg/cfgpickers/clusters.go

@@ -194,7 +194,7 @@ func AskForCluster(ctx context.Context, w *databricks.WorkspaceClient, filters .
 		Items: compatible,
 		Searcher: func(input string, idx int) bool {
 			lower := strings.ToLower(compatible[idx].ClusterName)
-			return strings.Contains(lower, input)
+			return strings.Contains(lower, strings.ToLower(input))
 		},
 		StartInSearchMode: true,
 		Templates: &promptui.SelectTemplates{

libs/databrickscfg/cfgpickers/warehouses.go

@@ -17,7 +17,7 @@ import (
 	"github.com/manifoldco/promptui"
 )
 
-var ErrNoCompatibleWarehouses = errors.New("no compatible warehouses. You can explicitly set the warehouse ID using the DATABRICKS_WAREHOUSE_ID environment variable")
+var ErrNoCompatibleWarehouses = errors.New("no compatible warehouses")
 
 type warehouseFilter func(sql.EndpointInfo) bool
 

libs/jsonschema/schema.go

@@ -65,8 +65,7 @@ type Schema struct {
 	// here: https://github.com/google/re2/wiki/Syntax
 	Pattern string `json:"pattern,omitempty"`
 
-	// Format defines a semantic format for string values (e.g., "date-time", "email", "uri").
-	// For templates, custom formats like "warehouse_path" trigger special input handling.
+	// Format specifies custom input handling. Supported: "warehouse_path".
 	Format string `json:"format,omitempty"`
 
 	// Extension embeds our custom JSON schema extensions.

libs/template/config.go

@@ -115,15 +115,14 @@ func (c *config) assignDefaultValues(r *renderer) error {
 			continue
 		}
 
+		// Resolve custom formats (e.g., warehouse_path auto-selects the default warehouse)
 		if property.Format != "" {
 			val, err := c.resolveFormat(property.Format, "")
 			if err != nil {
 				return err
 			}
-			if val != "" {
-				c.values[name] = val
-				continue
-			}
+			c.values[name] = val
+			continue
 		}
 
 		// No default value defined for the property
@@ -200,34 +199,33 @@ func (c *config) skipPrompt(p jsonschema.Property, r *renderer) (bool, error) {
 
 func (c *config) promptOnce(property *jsonschema.Schema, name, defaultVal, description string) error {
 	var userInput string
-	var err error
 
 	if property.Format != "" {
+		var err error
 		userInput, err = c.resolveFormat(property.Format, description)
 		if err != nil {
 			return err
 		}
-	}
-
-	if userInput == "" {
-		if property.Enum != nil {
-			options, err := property.EnumStringSlice()
-			if err != nil {
-				return err
-			}
-			userInput, err = cmdio.AskSelect(c.ctx, description, options)
-			if err != nil {
-				return err
-			}
-		} else {
-			userInput, err = cmdio.Ask(c.ctx, description, defaultVal)
-			if err != nil {
-				return err
-			}
+	} else if property.Enum != nil {
+		// List options for the user to select from
+		options, err := property.EnumStringSlice()
+		if err != nil {
+			return err
+		}
+		userInput, err = cmdio.AskSelect(c.ctx, description, options)
+		if err != nil {
+			return err
+		}
+	} else {
+		var err error
+		userInput, err = cmdio.Ask(c.ctx, description, defaultVal)
+		if err != nil {
+			return err
 		}
 	}
 
 	// Convert user input string back to a Go value
+	var err error
 	c.values[name], err = property.ParseString(userInput)
 	if err != nil {
 		// Show error and retry if validation fails

libs/template/templates/dbt-sql/template/{{.project_name}}/README.md.tmpl

@@ -93,9 +93,6 @@ These profiles define the default warehouse, catalog, schema, and any other
 target-specific settings. Read more about dbt profiles on Databricks at
 https://docs.databricks.com/en/workflows/jobs/how-to/use-dbt-in-workflows.html#advanced-run-dbt-with-a-custom-profile.
 
-To change the warehouse, catalog, or schema used by deployed dbt jobs,
-edit the settings in `dbt_profiles/profiles.yml`.
-
 The target workspaces for staging and prod are defined in `databricks.yml`.
 You can manually deploy based on these configurations (see below).
 Or you can use CI/CD to automate deployment. See