Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions NEXT_CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

### Bundles

* Standardize `personal_schemas` enum across bundle templates ([#4401](https://github.com/databricks/cli/pull/4401))
* Add missing values to SchemaGrantPrivilege enum ([#4380](https://github.com/databricks/cli/pull/4380))

### Dependency updates
Expand Down
2 changes: 1 addition & 1 deletion acceptance/bundle/templates/dbt-sql/input.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"project_name": "my_dbt_sql",
"http_path": "/sql/2.0/warehouses/f00dcafe",
"default_catalog": "main",
"personal_schemas": "yes, use a schema based on the current user name during development"
"personal_schemas": "yes"
}
2 changes: 1 addition & 1 deletion acceptance/bundle/templates/default-scala/input.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
"compute_type": "serverless",
"artifacts_dest_path": "/Volumes/test-folder",
"default_catalog": "main",
"personal_schemas": "yes, use a schema based on the current user name during development"
"personal_schemas": "yes"
}
2 changes: 1 addition & 1 deletion acceptance/bundle/templates/default-sql/input.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"project_name": "my_default_sql",
"http_path": "/sql/2.0/warehouses/f00dcafe",
"default_catalog": "main",
"personal_schemas": "yes, automatically use a schema based on the current user name during development"
"personal_schemas": "yes"
}
2 changes: 1 addition & 1 deletion acceptance/bundle/templates/telemetry/dbt-sql/input.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"project_name": "my_dbt_sql",
"http_path": "/sql/2.0/warehouses/f00dcafe",
"default_catalog": "main",
"personal_schemas": "yes, use a schema based on the current user name during development"
"personal_schemas": "yes"
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"uploadTime": [UNIX_TIME_MILLIS],
"items": [],
"protoLogs": [
"{\"frontend_log_event_id\":\"[UUID]\",\"entry\":{\"databricks_cli_log\":{\"execution_context\":{\"cmd_exec_id\":\"[CMD-EXEC-ID]\",\"version\":\"[DEV_VERSION]\",\"command\":\"bundle_init\",\"operating_system\":\"[OS]\",\"execution_time_ms\":\"SMALL_INT\",\"exit_code\":0},\"bundle_init_event\":{\"bundle_uuid\":\"[BUNDLE-UUID]\",\"template_name\":\"dbt-sql\",\"template_enum_args\":[{\"key\":\"personal_schemas\",\"value\":\"yes, use a schema based on the current user name during development\"},{\"key\":\"serverless\",\"value\":\"yes\"}]}}}}"
"{\"frontend_log_event_id\":\"[UUID]\",\"entry\":{\"databricks_cli_log\":{\"execution_context\":{\"cmd_exec_id\":\"[CMD-EXEC-ID]\",\"version\":\"[DEV_VERSION]\",\"command\":\"bundle_init\",\"operating_system\":\"[OS]\",\"execution_time_ms\":\"SMALL_INT\",\"exit_code\":0},\"bundle_init_event\":{\"bundle_uuid\":\"[BUNDLE-UUID]\",\"template_name\":\"dbt-sql\",\"template_enum_args\":[{\"key\":\"personal_schemas\",\"value\":\"yes\"},{\"key\":\"serverless\",\"value\":\"yes\"}]}}}}"
]
}
}
2 changes: 1 addition & 1 deletion acceptance/bundle/templates/telemetry/dbt-sql/output.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Refer to the README.md file for full "getting started" guide and production setu
"template_enum_args": [
{
"key": "personal_schemas",
"value": "yes, use a schema based on the current user name during development"
"value": "yes"
},
{
"key": "serverless",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"project_name": "my_default_sql",
"http_path": "/sql/2.0/warehouses/f00dcafe",
"default_catalog": "main",
"personal_schemas": "yes, automatically use a schema based on the current user name during development"
"personal_schemas": "yes"
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"uploadTime": [UNIX_TIME_MILLIS],
"items": [],
"protoLogs": [
"{\"frontend_log_event_id\":\"[UUID]\",\"entry\":{\"databricks_cli_log\":{\"execution_context\":{\"cmd_exec_id\":\"[CMD-EXEC-ID]\",\"version\":\"[DEV_VERSION]\",\"command\":\"bundle_init\",\"operating_system\":\"[OS]\",\"execution_time_ms\":\"SMALL_INT\",\"exit_code\":0},\"bundle_init_event\":{\"bundle_uuid\":\"[BUNDLE-UUID]\",\"template_name\":\"default-sql\",\"template_enum_args\":[{\"key\":\"personal_schemas\",\"value\":\"yes, automatically use a schema based on the current user name during development\"}]}}}}"
"{\"frontend_log_event_id\":\"[UUID]\",\"entry\":{\"databricks_cli_log\":{\"execution_context\":{\"cmd_exec_id\":\"[CMD-EXEC-ID]\",\"version\":\"[DEV_VERSION]\",\"command\":\"bundle_init\",\"operating_system\":\"[OS]\",\"execution_time_ms\":\"SMALL_INT\",\"exit_code\":0},\"bundle_init_event\":{\"bundle_uuid\":\"[BUNDLE-UUID]\",\"template_name\":\"default-sql\",\"template_enum_args\":[{\"key\":\"personal_schemas\",\"value\":\"yes\"}]}}}}"
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ See also the documentation at https://docs.databricks.com/dev-tools/bundles/inde
"template_enum_args": [
{
"key": "personal_schemas",
"value": "yes, automatically use a schema based on the current user name during development"
"value": "yes"
}
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,19 @@
},
"personal_schemas": {
"type": "string",
"description": "\nWould you like to use a personal schema for each user working on this project? (e.g., 'catalog.{{short_name}}')\npersonal_schemas",
"description": "Use a personal schema for each user working on this project\n(this is recommended, your personal schema will be '{{.default_catalog}}.{{short_name}}')",
"default": "yes",
"enum": [
"yes, use a schema based on the current user name during development",
"no, use a shared schema during development"
"yes",
"no, I will customize the schema configuration later in databricks.yml"
],
"order": 4
},
"shared_schema": {
"skip_prompt_if": {
"properties": {
"personal_schemas": {
"const": "yes, use a schema based on the current user name during development"
"const": "yes"
}
}
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
},
"personal_schemas": {
"type": "string",
"description": "Use a personal schema for each user working on this project.\n(This is recommended. Your personal schema will be '{{.default_catalog}}.{{short_name}}'.)",
"description": "Use a personal schema for each user working on this project\n(this is recommended, your personal schema will be '{{.default_catalog}}.{{short_name}}')",
"default": "yes",
"enum": [
"yes",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
},
"personal_schemas": {
"type": "string",
"description": "Use a personal schema for each user working on this project.\n(This is recommended. Your personal schema will be '{{.default_catalog}}.{{short_name}}'.)",
"description": "Use a personal schema for each user working on this project\n(this is recommended, your personal schema will be '{{.default_catalog}}.{{short_name}}')",
"default": "yes",
"enum": [
"yes",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,19 @@
},
"personal_schemas": {
"type": "string",
"description": "\nWould you like to use a personal schema for each user working on this project? (e.g., 'catalog.{{short_name}}')\npersonal_schemas",
"description": "Use a personal schema for each user working on this project\n(this is recommended, your personal schema will be '{{.default_catalog}}.{{short_name}}')",
"default": "yes",
"enum": [
"yes, use a schema based on the current user name during development",
"no, use a shared schema during development"
"yes",
"no, I will customize the schema configuration later in databricks.yml"
],
"order": 5
},
"shared_schema": {
"skip_prompt_if": {
"properties": {
"personal_schemas": {
"const": "yes, use a schema based on the current user name during development"
"const": "yes"
}
}
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,19 @@
},
"personal_schemas": {
"type": "string",
"description": "\nWould you like to use a personal schema for each user working on this project? (e.g., 'catalog.{{short_name}}')\npersonal_schemas",
"description": "Use a personal schema for each user working on this project\n(this is recommended, your personal schema will be '{{.default_catalog}}.{{short_name}}')",
"default": "yes",
"enum": [
"yes, automatically use a schema based on the current user name during development",
"no, use a single schema for all users during development"
"yes",
"no, I will customize the schema configuration later in databricks.yml"
],
"order": 4
},
"shared_schema": {
"skip_prompt_if": {
"properties": {
"personal_schemas": {
"const": "yes, automatically use a schema based on the current user name during development"
"const": "yes"
}
}
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
"default": "yes",
"enum": [
"yes",
"no (advanced: I will customize the schema configuration later in databricks.yml)"
"no, I will customize the schema configuration later in databricks.yml"
],
"order": 8
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
},
"personal_schemas": {
"type": "string",
"description": "Use a personal schema for each user working on this project.\n(This is recommended. Your personal schema will be '{{.default_catalog}}.{{short_name}}'.)",
"description": "Use a personal schema for each user working on this project\n(this is recommended, your personal schema will be '{{.default_catalog}}.{{short_name}}')",
"default": "yes",
"enum": [
"yes",
Expand Down