address comments

Author: Jack Ye

pyiceberg/catalog/__init__.py

@@ -233,7 +233,7 @@ def load_catalog(name: Optional[str] = None, **properties: Optional[str]) -> Cat
     conf: RecursiveDict = merge_config(env or {}, cast(RecursiveDict, properties))
 
     if catalog_impl := properties.get(PY_CATALOG_IMPL):
-        if catalog := _import_catalog(catalog_impl, properties):
+        if catalog := _import_catalog(name, catalog_impl, properties):
             logger.info("Loaded Catalog: %s", catalog_impl)
             return catalog
         else:
@@ -292,15 +292,15 @@ def delete_data_files(io: FileIO, manifests_to_delete: List[ManifestFile]) -> No
                 deleted_files[path] = True
 
 
-def _import_catalog(catalog_impl: str, properties: Properties) -> Optional[Catalog]:
+def _import_catalog(name: str, catalog_impl: str, properties: Properties) -> Optional[Catalog]:
     try:
         path_parts = catalog_impl.split(".")
         if len(path_parts) < 2:
             raise ValueError(f"py-catalog-impl should be full path (module.CustomCatalog), got: {catalog_impl}")
         module_name, class_name = ".".join(path_parts[:-1]), path_parts[-1]
         module = importlib.import_module(module_name)
         class_ = getattr(module, class_name)
-        return class_(properties)
+        return class_(name, **properties)
     except ModuleNotFoundError:
         logger.warning("Could not initialize Catalog: %s", catalog_impl)
         return None

tests/catalog/test_glue.py

@@ -22,7 +22,7 @@
 import pytest
 from moto import mock_aws
 
-from pyiceberg.catalog import PY_CATALOG_IMPL, load_catalog
+from pyiceberg.catalog import load_catalog
 from pyiceberg.catalog.glue import GlueCatalog
 from pyiceberg.exceptions import (
     NamespaceAlreadyExistsError,
@@ -53,11 +53,11 @@ def test_load_catalog_from_impl() -> None:
         load_catalog(
             "catalog",
             **{
-                PY_CATALOG_IMPL: "pyiceberg.catalog.glue.GlueCatalog",
-                "region_name": "us-east-1",
-                "aws_access_key_id": "access-key",
-                "aws_secret_access_key": "secret-key",
-                "aws_session_token": "session-token",
+                "py-catalog-impl": "pyiceberg.catalog.glue.GlueCatalog",
+                "glue.region_name": "us-east-1",
+                "glue.aws_access_key_id": "access-key",
+                "glue.aws_secret_access_key": "secret-key",
+                "glue.aws_session_token": "session-token",
             },
         ),
         GlueCatalog,