diff --git a/NEXT_CHANGELOG.md b/NEXT_CHANGELOG.md index de1cf6c995b..2e6e24c05cc 100644 --- a/NEXT_CHANGELOG.md +++ b/NEXT_CHANGELOG.md @@ -9,6 +9,7 @@ ### CLI ### Bundles +* Standardize `personal_schemas` enum across bundle templates ([#4401](https://github.com/databricks/cli/pull/4401)) * engine/direct: Fix permanent drift on experiment name field ([#4627](https://github.com/databricks/cli/pull/4627)) * engine/direct: Fix permissions state path to match input config schema ([#4703](https://github.com/databricks/cli/pull/4703)) diff --git a/acceptance/bundle/templates/dbt-sql/input.json b/acceptance/bundle/templates/dbt-sql/input.json index 201ac9667e3..ca84320e6d7 100644 --- a/acceptance/bundle/templates/dbt-sql/input.json +++ b/acceptance/bundle/templates/dbt-sql/input.json @@ -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" } diff --git a/acceptance/bundle/templates/default-scala/input.json b/acceptance/bundle/templates/default-scala/input.json index eebf9a5c8a2..f2c27809bb7 100644 --- a/acceptance/bundle/templates/default-scala/input.json +++ b/acceptance/bundle/templates/default-scala/input.json @@ -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" } diff --git a/acceptance/bundle/templates/default-sql/input.json b/acceptance/bundle/templates/default-sql/input.json index c728d25de14..84cc8563164 100644 --- a/acceptance/bundle/templates/default-sql/input.json +++ b/acceptance/bundle/templates/default-sql/input.json @@ -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" } diff --git a/acceptance/bundle/templates/telemetry/dbt-sql/input.json b/acceptance/bundle/templates/telemetry/dbt-sql/input.json index 201ac9667e3..ca84320e6d7 100644 --- a/acceptance/bundle/templates/telemetry/dbt-sql/input.json +++ b/acceptance/bundle/templates/telemetry/dbt-sql/input.json @@ -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" } diff --git a/acceptance/bundle/templates/telemetry/dbt-sql/out.requests.txt b/acceptance/bundle/templates/telemetry/dbt-sql/out.requests.txt index 8b60d181a5e..69dd23fe054 100644 --- a/acceptance/bundle/templates/telemetry/dbt-sql/out.requests.txt +++ b/acceptance/bundle/templates/telemetry/dbt-sql/out.requests.txt @@ -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\"}]}}}}" ] } } diff --git a/acceptance/bundle/templates/telemetry/dbt-sql/output.txt b/acceptance/bundle/templates/telemetry/dbt-sql/output.txt index 2455fe4442d..92ae6504ab4 100644 --- a/acceptance/bundle/templates/telemetry/dbt-sql/output.txt +++ b/acceptance/bundle/templates/telemetry/dbt-sql/output.txt @@ -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", diff --git a/acceptance/bundle/templates/telemetry/default-sql/input.json b/acceptance/bundle/templates/telemetry/default-sql/input.json index c728d25de14..84cc8563164 100644 --- a/acceptance/bundle/templates/telemetry/default-sql/input.json +++ b/acceptance/bundle/templates/telemetry/default-sql/input.json @@ -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" } diff --git a/acceptance/bundle/templates/telemetry/default-sql/out.requests.txt b/acceptance/bundle/templates/telemetry/default-sql/out.requests.txt index 6d59ceee381..4c107532dbe 100644 --- a/acceptance/bundle/templates/telemetry/default-sql/out.requests.txt +++ b/acceptance/bundle/templates/telemetry/default-sql/out.requests.txt @@ -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\"}]}}}}" ] } } diff --git a/acceptance/bundle/templates/telemetry/default-sql/output.txt b/acceptance/bundle/templates/telemetry/default-sql/output.txt index f01f3517015..ba77a00690f 100644 --- a/acceptance/bundle/templates/telemetry/default-sql/output.txt +++ b/acceptance/bundle/templates/telemetry/default-sql/output.txt @@ -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" } ] } diff --git a/libs/template/templates/dbt-sql/databricks_template_schema.json b/libs/template/templates/dbt-sql/databricks_template_schema.json index 34d2874f869..a4b2cd879ea 100644 --- a/libs/template/templates/dbt-sql/databricks_template_schema.json +++ b/libs/template/templates/dbt-sql/databricks_template_schema.json @@ -25,10 +25,11 @@ }, "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 }, @@ -36,7 +37,7 @@ "skip_prompt_if": { "properties": { "personal_schemas": { - "const": "yes, use a schema based on the current user name during development" + "const": "yes" } } }, diff --git a/libs/template/templates/default-minimal/databricks_template_schema.json b/libs/template/templates/default-minimal/databricks_template_schema.json index 180eaa74df2..c6f5badc23a 100644 --- a/libs/template/templates/default-minimal/databricks_template_schema.json +++ b/libs/template/templates/default-minimal/databricks_template_schema.json @@ -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", diff --git a/libs/template/templates/default-python/databricks_template_schema.json b/libs/template/templates/default-python/databricks_template_schema.json index 98769e297aa..d1c716ea24a 100644 --- a/libs/template/templates/default-python/databricks_template_schema.json +++ b/libs/template/templates/default-python/databricks_template_schema.json @@ -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", diff --git a/libs/template/templates/default-scala/databricks_template_schema.json b/libs/template/templates/default-scala/databricks_template_schema.json index 9d239768218..b3817f3a731 100644 --- a/libs/template/templates/default-scala/databricks_template_schema.json +++ b/libs/template/templates/default-scala/databricks_template_schema.json @@ -32,10 +32,11 @@ }, "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 }, @@ -43,7 +44,7 @@ "skip_prompt_if": { "properties": { "personal_schemas": { - "const": "yes, use a schema based on the current user name during development" + "const": "yes" } } }, diff --git a/libs/template/templates/default-sql/databricks_template_schema.json b/libs/template/templates/default-sql/databricks_template_schema.json index cb730060017..b1a797b6c61 100644 --- a/libs/template/templates/default-sql/databricks_template_schema.json +++ b/libs/template/templates/default-sql/databricks_template_schema.json @@ -25,10 +25,11 @@ }, "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 }, @@ -36,7 +37,7 @@ "skip_prompt_if": { "properties": { "personal_schemas": { - "const": "yes, automatically use a schema based on the current user name during development" + "const": "yes" } } }, diff --git a/libs/template/templates/lakeflow-pipelines/databricks_template_schema.json b/libs/template/templates/lakeflow-pipelines/databricks_template_schema.json index 6d910e388ff..9ec27cd16d7 100644 --- a/libs/template/templates/lakeflow-pipelines/databricks_template_schema.json +++ b/libs/template/templates/lakeflow-pipelines/databricks_template_schema.json @@ -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 }, diff --git a/libs/template/templates/pydabs/databricks_template_schema.json b/libs/template/templates/pydabs/databricks_template_schema.json index 1541e9358a5..21260ef958e 100644 --- a/libs/template/templates/pydabs/databricks_template_schema.json +++ b/libs/template/templates/pydabs/databricks_template_schema.json @@ -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",