Skip to content

aitools: Fix default_catalog handling in init-template commands #4312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lennartkats-db merged 7 commits into from
Jan 30, 2026
Merged

aitools: Fix default_catalog handling in init-template commands #4312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6c5b1c8
Fix default_catalog handling in aitools init-template commands
lennartkats-db Jan 17, 2026
841156f
Merge remote-tracking branch 'origin/main' into apps-mcp-fix-default-…
lennartkats-db Jan 18, 2026
24e6663
Merge branch 'main' into apps-mcp-fix-default-catalog
lennartkats-db Jan 20, 2026
aa6f19a
Merge branch 'main' into apps-mcp-fix-default-catalog
lennartkats-db Jan 23, 2026
e4a5a0e
Merge branch 'main' into apps-mcp-fix-default-catalog
lennartkats-db Jan 28, 2026
fa7e038
Merge branch 'main' into apps-mcp-fix-default-catalog
lennartkats-db Jan 29, 2026
7285650
Merge branch 'main' into apps-mcp-fix-default-catalog
lennartkats-db Jan 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions experimental/aitools/cmd/init_template/empty.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"fmt"

"github.com/databricks/cli/cmd/root"
"github.com/databricks/cli/experimental/aitools/lib/middlewares"
"github.com/databricks/cli/libs/template"
"github.com/spf13/cobra"
)
Expand Down Expand Up @@ -62,16 +61,14 @@ After initialization:
return fmt.Errorf("--language must be 'python', 'sql', or 'other', got '%s'", language)
}

// Default to workspace default catalog if not specified
if catalog == "" {
catalog = middlewares.GetDefaultCatalog(ctx)
}

configMap := map[string]any{
"project_name": name,
"personal_schemas": "yes",
"language_choice": language,
"default_catalog": catalog,
}

if catalog != "" {
Copy link
Copy Markdown
Contributor

@keugenek keugenek Jan 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why not the other way around? ie updating default catalog like this does not look quite right, maybe need explicit setting --default-catalogue instead?

Copy link
Copy Markdown
Contributor Author

@lennartkats-db lennartkats-db Jan 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This provides us parity with the standard template. The current version in main sets an empty value as the catalog instead, which causes an immediate error when trying to deploy. There needs to be some value.

configMap["default_catalog"] = catalog
}

return MaterializeTemplate(ctx, TemplateConfig{
Expand Down
10 changes: 3 additions & 7 deletions experimental/aitools/cmd/init_template/job.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"errors"

"github.com/databricks/cli/cmd/root"
"github.com/databricks/cli/experimental/aitools/lib/middlewares"
"github.com/databricks/cli/libs/template"
"github.com/spf13/cobra"
)
Expand Down Expand Up @@ -50,19 +49,16 @@ After initialization:
return errors.New("--name is required. Example: init-template job --name my_job")
}

// Default to workspace default catalog if not specified
if catalog == "" {
catalog = middlewares.GetDefaultCatalog(ctx)
}

configMap := map[string]any{
"project_name": name,
"include_job": "yes",
"include_pipeline": "no",
"include_python": "yes",
"serverless": "yes",
"personal_schemas": "yes",
"default_catalog": catalog,
}
if catalog != "" {
configMap["default_catalog"] = catalog
}

return MaterializeTemplate(ctx, TemplateConfig{
Expand Down
11 changes: 4 additions & 7 deletions experimental/aitools/cmd/init_template/pipeline.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"fmt"

"github.com/databricks/cli/cmd/root"
"github.com/databricks/cli/experimental/aitools/lib/middlewares"
"github.com/databricks/cli/libs/template"
"github.com/spf13/cobra"
)
Expand Down Expand Up @@ -59,16 +58,14 @@ After initialization:
return fmt.Errorf("--language must be 'python' or 'sql', got '%s'", language)
}

// Default to workspace default catalog if not specified
if catalog == "" {
catalog = middlewares.GetDefaultCatalog(ctx)
}

configMap := map[string]any{
"project_name": name,
"personal_schemas": "yes",
"language": language,
"default_catalog": catalog,
}

if catalog != "" {
configMap["default_catalog"] = catalog
}

return MaterializeTemplate(ctx, TemplateConfig{
Expand Down