Fixed make fmt formatting failure (#847)

Author: nfx

src/databricks/labs/ucx/config.py

@@ -94,8 +94,7 @@ class _Config(Generic[T]):
 
     @classmethod
     @abstractmethod
-    def from_dict(cls, raw: dict[str, Any]) -> T:
-        ...
+    def from_dict(cls, raw: dict[str, Any]) -> T: ...
 
     @classmethod
     def from_bytes(cls, raw_str: str | bytes) -> T:

src/databricks/labs/ucx/workspace_access/groups.py

@@ -285,9 +285,9 @@ def generate_migrated_groups(self):
                     external_id=account_group.external_id,
                     members=json.dumps([gg.as_dict() for gg in ws_group.members]) if ws_group.members else None,
                     roles=json.dumps([gg.as_dict() for gg in ws_group.roles]) if ws_group.roles else None,
-                    entitlements=json.dumps([gg.as_dict() for gg in ws_group.entitlements])
-                    if ws_group.entitlements
-                    else None,
+                    entitlements=(
+                        json.dumps([gg.as_dict() for gg in ws_group.entitlements]) if ws_group.entitlements else None
+                    ),
                 )
             else:
                 logger.info(f"Couldn't find a match for group {ws_group.display_name}")

tests/integration/assessment/test_azure.py

@@ -110,9 +110,9 @@ def test_spn_crawler_with_available_secrets(
     _pipeline_conf_with_avlbl_secret["fs.azure.account.oauth2.client.id.SA1.dfs.core.windows.net"] = (
         "{" + (f"{{secrets/{secret_scope}/{secret_key}}}") + "}"
     )
-    _pipeline_conf_with_avlbl_secret[
-        "fs.azure.account.oauth2.client.endpoint.SA1.dfs.core.windows.net"
-    ] = "https://login.microsoftonline.com/dummy_tenant/oauth2/token"
+    _pipeline_conf_with_avlbl_secret["fs.azure.account.oauth2.client.endpoint.SA1.dfs.core.windows.net"] = (
+        "https://login.microsoftonline.com/dummy_tenant/oauth2/token"
+    )
     make_job()
     make_pipeline(configuration=_pipeline_conf_with_avlbl_secret)
     spn_crawler = AzureServicePrincipalCrawler(ws=ws, sbe=sql_backend, schema=inventory_schema)

tests/unit/test_cli.py

@@ -99,8 +99,9 @@ def test_skip_no_ucx(caplog, mocker):
 
 
 def test_sync_workspace_info():
-    with patch("databricks.labs.ucx.account.AccountWorkspaces.sync_workspace_info", return_value=None) as s, patch(
-        "databricks.labs.ucx.account.AccountWorkspaces.__init__", return_value=None
+    with (
+        patch("databricks.labs.ucx.account.AccountWorkspaces.sync_workspace_info", return_value=None) as s,
+        patch("databricks.labs.ucx.account.AccountWorkspaces.__init__", return_value=None),
     ):
         sync_workspace_info(create_autospec(AccountClient))
         s.assert_called_once()
@@ -126,27 +127,38 @@ def test_validate_external_locations(mocker):
     mocker.patch("databricks.labs.ucx.installer.InstallationManager.for_user", return_value=MagicMock())
     # test save_as_terraform_definitions_on_workspace is called
     # also test if the saving tf scripts returns None
-    with patch(
-        "databricks.labs.ucx.hive_metastore.locations.ExternalLocations.save_as_terraform_definitions_on_workspace",
-        return_value=None,
-    ) as s, patch("webbrowser.open") as w:
+    with (
+        patch(
+            "databricks.labs.ucx.hive_metastore.locations.ExternalLocations.save_as_terraform_definitions_on_workspace",
+            return_value=None,
+        ) as s,
+        patch("webbrowser.open") as w,
+    ):
         validate_external_locations(w)
         s.assert_called_once()
         w.assert_not_called()
     # test when tf scripts is written and user confirmed to open it over browser
     path = "dummy/external_locations.tf"
-    with patch(
-        "databricks.labs.ucx.hive_metastore.locations.ExternalLocations.save_as_terraform_definitions_on_workspace",
-        return_value=path,
-    ) as s, patch("webbrowser.open") as w, patch("databricks.labs.blueprint.tui.Prompts.confirm", return_value=True):
+    with (
+        patch(
+            "databricks.labs.ucx.hive_metastore.locations.ExternalLocations.save_as_terraform_definitions_on_workspace",
+            return_value=path,
+        ) as s,
+        patch("webbrowser.open") as w,
+        patch("databricks.labs.blueprint.tui.Prompts.confirm", return_value=True),
+    ):
         validate_external_locations(w)
         s.assert_called_once()
         w.assert_called_with(f"{w.config.host}/#workspace{path}")
     # test when tf scripts is written but user did not confirm to open it over browser
-    with patch(
-        "databricks.labs.ucx.hive_metastore.locations.ExternalLocations.save_as_terraform_definitions_on_workspace",
-        return_value=path,
-    ) as s, patch("webbrowser.open") as w, patch("databricks.labs.blueprint.tui.Prompts.confirm", return_value=False):
+    with (
+        patch(
+            "databricks.labs.ucx.hive_metastore.locations.ExternalLocations.save_as_terraform_definitions_on_workspace",
+            return_value=path,
+        ) as s,
+        patch("webbrowser.open") as w,
+        patch("databricks.labs.blueprint.tui.Prompts.confirm", return_value=False),
+    ):
         validate_external_locations(w)
         s.assert_called_once()
         w.assert_not_called()
@@ -158,9 +170,10 @@ def test_ensure_assessment_run(mocker, caplog):
         assert ensure_assessment_run(w) is None
         assert caplog.messages == [CANT_FIND_UCX_MSG]
 
-    with patch("databricks.labs.ucx.installer.InstallationManager.for_user", return_value=MagicMock()), patch(
-        "databricks.labs.ucx.install.WorkspaceInstaller.validate_and_run", return_value=MagicMock()
-    ) as v:
+    with (
+        patch("databricks.labs.ucx.installer.InstallationManager.for_user", return_value=MagicMock()),
+        patch("databricks.labs.ucx.install.WorkspaceInstaller.validate_and_run", return_value=MagicMock()) as v,
+    ):
         ensure_assessment_run(w)
         v.assert_called_with("assessment")
 
@@ -186,13 +199,15 @@ def test_no_step_in_repair_run(mocker):
 def test_revert_migrated_tables(mocker, caplog):
     w = create_autospec(WorkspaceClient)
     # test with no schema and no table, user confirm to not retry
-    with patch("databricks.labs.ucx.installer.InstallationManager.for_user", return_value=MagicMock()), patch(
-        "databricks.labs.blueprint.tui.Prompts.confirm", return_value=False
+    with (
+        patch("databricks.labs.ucx.installer.InstallationManager.for_user", return_value=MagicMock()),
+        patch("databricks.labs.blueprint.tui.Prompts.confirm", return_value=False),
     ):
         assert revert_migrated_tables(w, schema=None, table=None) is None
     # test with no schema and no table, user confirm to retry, but no ucx installation found
-    with patch("databricks.labs.ucx.installer.InstallationManager.for_user", return_value=None), patch(
-        "databricks.labs.blueprint.tui.Prompts.confirm", return_value=True
+    with (
+        patch("databricks.labs.ucx.installer.InstallationManager.for_user", return_value=None),
+        patch("databricks.labs.blueprint.tui.Prompts.confirm", return_value=True),
     ):
         assert revert_migrated_tables(w, schema=None, table=None) is None
         assert caplog.messages[0] == CANT_FIND_UCX_MSG
@@ -205,27 +220,36 @@ def test_revert_migrated_tables(mocker, caplog):
         assert revert_migrated_tables(w, schema="test", table="test") is None
         assert caplog.messages[3] == CANT_FIND_UCX_MSG
     # test revert_migrated_tables is executed when revert report print successfully and user confirm
-    with patch("databricks.labs.ucx.installer.InstallationManager.for_user", return_value=MagicMock()), patch(
-        "databricks.labs.ucx.hive_metastore.table_migrate.TablesMigrate.print_revert_report", return_value=True
-    ), patch("databricks.labs.blueprint.tui.Prompts.confirm", return_value=True), patch(
-        "databricks.labs.ucx.hive_metastore.table_migrate.TablesMigrate.revert_migrated_tables", return_value=None
-    ) as r:
+    with (
+        patch("databricks.labs.ucx.installer.InstallationManager.for_user", return_value=MagicMock()),
+        patch("databricks.labs.ucx.hive_metastore.table_migrate.TablesMigrate.print_revert_report", return_value=True),
+        patch("databricks.labs.blueprint.tui.Prompts.confirm", return_value=True),
+        patch(
+            "databricks.labs.ucx.hive_metastore.table_migrate.TablesMigrate.revert_migrated_tables", return_value=None
+        ) as r,
+    ):
         revert_migrated_tables(w, schema="test", table="test")
         r.assert_called_once()
     # test revert_migrated_tables is not executed when revert report print failed
-    with patch("databricks.labs.ucx.installer.InstallationManager.for_user", return_value=MagicMock()), patch(
-        "databricks.labs.ucx.hive_metastore.table_migrate.TablesMigrate.print_revert_report", return_value=False
-    ), patch("databricks.labs.blueprint.tui.Prompts.confirm", return_value=True), patch(
-        "databricks.labs.ucx.hive_metastore.table_migrate.TablesMigrate.revert_migrated_tables", return_value=None
-    ) as r:
+    with (
+        patch("databricks.labs.ucx.installer.InstallationManager.for_user", return_value=MagicMock()),
+        patch("databricks.labs.ucx.hive_metastore.table_migrate.TablesMigrate.print_revert_report", return_value=False),
+        patch("databricks.labs.blueprint.tui.Prompts.confirm", return_value=True),
+        patch(
+            "databricks.labs.ucx.hive_metastore.table_migrate.TablesMigrate.revert_migrated_tables", return_value=None
+        ) as r,
+    ):
         revert_migrated_tables(w, schema="test", table="test")
         r.assert_not_called()
     # test revert_migrated_tables is not executed when revert report print successfully but user does not confirm
-    with patch("databricks.labs.ucx.installer.InstallationManager.for_user", return_value=MagicMock()), patch(
-        "databricks.labs.ucx.hive_metastore.table_migrate.TablesMigrate.print_revert_report", return_value=True
-    ), patch("databricks.labs.blueprint.tui.Prompts.confirm", return_value=False), patch(
-        "databricks.labs.ucx.hive_metastore.table_migrate.TablesMigrate.revert_migrated_tables", return_value=None
-    ) as r:
+    with (
+        patch("databricks.labs.ucx.installer.InstallationManager.for_user", return_value=MagicMock()),
+        patch("databricks.labs.ucx.hive_metastore.table_migrate.TablesMigrate.print_revert_report", return_value=True),
+        patch("databricks.labs.blueprint.tui.Prompts.confirm", return_value=False),
+        patch(
+            "databricks.labs.ucx.hive_metastore.table_migrate.TablesMigrate.revert_migrated_tables", return_value=None
+        ) as r,
+    ):
         revert_migrated_tables(w, schema="test", table="test")
         r.assert_not_called()