Use CatalogType instead of SecurableTyoe

SecurableType is removed databricks/databricks-sdk-py#880 and CatalogType allows us to skip system catalogs too

Author: JCZuurmond

src/databricks/labs/ucx/hive_metastore/table_migration_status.py

@@ -7,7 +7,7 @@
 from databricks.labs.lsql.backends import SqlBackend
 from databricks.sdk import WorkspaceClient
 from databricks.sdk.errors import DatabricksError, NotFound
-from databricks.sdk.service.catalog import CatalogInfo, CatalogInfoSecurableKind, SchemaInfo
+from databricks.sdk.service.catalog import CatalogInfo, CatalogType, SchemaInfo
 
 from databricks.labs.ucx.framework.crawlers import CrawlerBase
 from databricks.labs.ucx.framework.utils import escape_sql_identifier
@@ -79,10 +79,9 @@ class TableMigrationStatusRefresher(CrawlerBase[TableMigrationStatus]):
     properties for the presence of the marker.
     """
 
-    _skip_catalog_securable_kinds = [
-        CatalogInfoSecurableKind.CATALOG_INTERNAL,
-        CatalogInfoSecurableKind.CATALOG_SYSTEM,
-    ]
+    _skip_catalog_types = {
+        CatalogType.SYSTEM_CATALOG,
+    }
 
     def __init__(self, ws: WorkspaceClient, sql_backend: SqlBackend, schema, tables_crawler: TablesCrawler):
         super().__init__(sql_backend, "hive_metastore", schema, "migration_status", TableMigrationStatus)
@@ -163,7 +162,7 @@ def _try_fetch(self) -> Iterable[TableMigrationStatus]:
     def _iter_catalogs(self) -> Iterable[CatalogInfo]:
         try:
             for catalog in self._ws.catalogs.list():
-                if catalog.securable_kind in self._skip_catalog_securable_kinds:
+                if catalog.catalog_type in self._skip_catalog_types:
                     continue
                 yield catalog
         except DatabricksError as e:

tests/unit/hive_metastore/test_table_migration_status.py

@@ -4,7 +4,7 @@
 import pytest
 from databricks.sdk import WorkspaceClient
 from databricks.sdk.errors import BadRequest, DatabricksError, NotFound
-from databricks.sdk.service.catalog import CatalogInfoSecurableKind, CatalogInfo, SchemaInfo, TableInfo
+from databricks.sdk.service.catalog import CatalogInfo, CatalogType, SchemaInfo, TableInfo
 
 from databricks.labs.ucx.hive_metastore.tables import TablesCrawler
 from databricks.labs.ucx.hive_metastore.table_migration_status import TableMigrationStatusRefresher
@@ -67,20 +67,12 @@ def test_table_migration_status_refresher_get_seen_tables_handles_errors_on_tabl
     tables_crawler.snapshot.assert_not_called()
 
 
-@pytest.mark.parametrize(
-    "securable_kind",
-    [
-        CatalogInfoSecurableKind.CATALOG_INTERNAL,
-        CatalogInfoSecurableKind.CATALOG_SYSTEM,
-    ],
-)
-def test_table_migration_status_refresher_get_seen_tables_skips_builtin_catalog(
-    mock_backend, securable_kind: CatalogInfoSecurableKind
-) -> None:
+def test_table_migration_status_refresher_get_seen_tables_skips_system_catalog(mock_backend) -> None:
+    """We can skip the system catalog when refreshing the table migration status."""
     ws = create_autospec(WorkspaceClient)
     ws.catalogs.list.return_value = [
         CatalogInfo(name="test"),
-        CatalogInfo(name="system", securable_kind=securable_kind),
+        CatalogInfo(name="system", catalog_type=CatalogType.SYSTEM_CATALOG),
     ]
 
     def schemas_list(catalog_name: str) -> Iterable[SchemaInfo]: