From 5ba9f1a899f207f448b166c1003de19c2ee09d2e Mon Sep 17 00:00:00 2001 From: sundarshankar89 Date: Fri, 26 Sep 2025 11:22:00 +0530 Subject: [PATCH 1/3] Fixes the broken test after blueprint bug fixes --- pyproject.toml | 6 +++++- tests/unit/hive_metastore/test_mapping.py | 1 + tests/unit/install/test_install.py | 24 +++++++++++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 5cff256b28..1c32bab70e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -47,11 +47,15 @@ classifiers = [ dependencies = ["databricks-sdk>=0.58.0,<0.59.0", "databricks-labs-lsql>=0.16.0,<0.17.0", - "databricks-labs-blueprint>=0.11.0,<0.12.0", + #"databricks-labs-blueprint>=0.11.0,<0.12.0", + "databricks-labs-blueprint @ git+https://github.com/databrickslabs/blueprint@patch/bool_type", "PyYAML>=6.0.0,<6.1.0", "sqlglot>=26.7.0,<27.1.0", "astroid>=3.3.0,<3.4.0"] +[tool.hatch.metadata] +allow-direct-references = true + [project.optional-dependencies] pylsp = [ "python-lsp-server>=1.13.0,<1.14.0" diff --git a/tests/unit/hive_metastore/test_mapping.py b/tests/unit/hive_metastore/test_mapping.py index 01944256f6..a495a9d093 100644 --- a/tests/unit/hive_metastore/test_mapping.py +++ b/tests/unit/hive_metastore/test_mapping.py @@ -137,6 +137,7 @@ def test_save_mapping(): [ { 'catalog_name': 'foo_bar', + 'compare_rows': False, 'dst_schema': 'foo', 'dst_table': 'bar', 'src_schema': 'foo', diff --git a/tests/unit/install/test_install.py b/tests/unit/install/test_install.py index 9c9c70ee11..4f8497af7d 100644 --- a/tests/unit/install/test_install.py +++ b/tests/unit/install/test_install.py @@ -379,6 +379,12 @@ def test_configure_sets_expected_workspace_configuration_values( 'query_statement_disposition': 'INLINE', "recon_tolerance_percent": 5, "managed_table_external_storage": "CLONE", + "is_terraform_used": False, + "trigger_job": False, + "upload_dependencies": False, + "enable_hms_federation": False, + "use_legacy_permission_migration": False, + "skip_tacl_migration": False } prompts = MockPrompts( { @@ -419,6 +425,12 @@ def test_configure_with_default_owner_group( "num_days_submit_runs_history": 30, "recon_tolerance_percent": 5, "managed_table_external_storage": "CLONE", + "is_terraform_used": False, + "trigger_job": False, + "upload_dependencies": False, + "enable_hms_federation": False, + "use_legacy_permission_migration": False, + "skip_tacl_migration": False } prompts = MockPrompts( { @@ -509,6 +521,12 @@ def test_create_cluster_policy(ws, mock_installation) -> None: 'query_statement_disposition': 'INLINE', 'recon_tolerance_percent': 5, 'managed_table_external_storage': "CLONE", + 'is_terraform_used': False, + 'trigger_job': False, + 'upload_dependencies': False, + 'enable_hms_federation': False, + 'use_legacy_permission_migration': False, + 'skip_tacl_migration': False }, ) @@ -1753,6 +1771,12 @@ def test_save_config_ext_hms(ws, mock_installation) -> None: 'query_statement_disposition': 'INLINE', 'recon_tolerance_percent': 5, 'managed_table_external_storage': "CLONE", + 'is_terraform_used': False, + 'trigger_job': False, + 'upload_dependencies': False, + 'enable_hms_federation': False, + 'use_legacy_permission_migration': False, + 'skip_tacl_migration': False }, ) From 924caebb2b626849890f228fd983c152aa229034 Mon Sep 17 00:00:00 2001 From: sundarshankar89 Date: Fri, 26 Sep 2025 11:27:11 +0530 Subject: [PATCH 2/3] fmt fixes --- tests/unit/install/test_install.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/unit/install/test_install.py b/tests/unit/install/test_install.py index 4f8497af7d..7ef52e1a79 100644 --- a/tests/unit/install/test_install.py +++ b/tests/unit/install/test_install.py @@ -384,7 +384,7 @@ def test_configure_sets_expected_workspace_configuration_values( "upload_dependencies": False, "enable_hms_federation": False, "use_legacy_permission_migration": False, - "skip_tacl_migration": False + "skip_tacl_migration": False, } prompts = MockPrompts( { @@ -430,7 +430,7 @@ def test_configure_with_default_owner_group( "upload_dependencies": False, "enable_hms_federation": False, "use_legacy_permission_migration": False, - "skip_tacl_migration": False + "skip_tacl_migration": False, } prompts = MockPrompts( { @@ -526,7 +526,7 @@ def test_create_cluster_policy(ws, mock_installation) -> None: 'upload_dependencies': False, 'enable_hms_federation': False, 'use_legacy_permission_migration': False, - 'skip_tacl_migration': False + 'skip_tacl_migration': False, }, ) @@ -1776,7 +1776,7 @@ def test_save_config_ext_hms(ws, mock_installation) -> None: 'upload_dependencies': False, 'enable_hms_federation': False, 'use_legacy_permission_migration': False, - 'skip_tacl_migration': False + 'skip_tacl_migration': False, }, ) From bcd6d21f1648d6dd09c050ed23755402cc51117d Mon Sep 17 00:00:00 2001 From: sundarshankar89 Date: Fri, 26 Sep 2025 11:51:46 +0530 Subject: [PATCH 3/3] fmt fixes --- src/databricks/labs/ucx/workspace_access/groups.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/databricks/labs/ucx/workspace_access/groups.py b/src/databricks/labs/ucx/workspace_access/groups.py index b16d3d726f..814043e1c6 100644 --- a/src/databricks/labs/ucx/workspace_access/groups.py +++ b/src/databricks/labs/ucx/workspace_access/groups.py @@ -929,7 +929,7 @@ def pick_owner_group(self, prompt: Prompts) -> str | None: return None if len(groups) == 1: return groups[0].display_name - group_names = [group.display_name for group in groups] + group_names = [group.display_name for group in groups if group.display_name is not None] return prompt.choice("Select the group to be used as the owner group", group_names, max_attempts=3) def user_in_group(self, group_name: str, user: User) -> bool: