remove _ENV_CONFIG in catalog

Author: jx2lee

pyiceberg/catalog/__init__.py

@@ -66,7 +66,7 @@
     RecursiveDict,
     TableVersion,
 )
-from pyiceberg.utils.config import Config, merge_config
+from pyiceberg.utils.config import Config, get_env_config, merge_config
 from pyiceberg.utils.properties import property_as_bool
 from pyiceberg.view import View
 from pyiceberg.view.metadata import ViewVersion
@@ -76,8 +76,6 @@
 
 logger = logging.getLogger(__name__)
 
-_ENV_CONFIG = Config()
-
 TOKEN = "token"
 TYPE = "type"
 PY_CATALOG_IMPL = "py-catalog-impl"
@@ -228,7 +226,7 @@ def _check_required_catalog_properties(name: str, catalog_type: CatalogType, con
         )
 
 
-def load_catalog(name: str | None = None, **properties: str | None) -> Catalog:
+def load_catalog(name: str | None = None, config: Config | None = None, **properties: str | None) -> Catalog:
     """Load the catalog based on the properties.
 
     Will look up the properties from the config, based on the name.
@@ -244,10 +242,11 @@ def load_catalog(name: str | None = None, **properties: str | None) -> Catalog:
         ValueError: Raises a ValueError in case properties are missing or malformed,
             or if it could not determine the catalog based on the properties.
     """
+    config = config or get_env_config()
     if name is None:
-        name = _ENV_CONFIG.get_default_catalog_name()
+        name = config.get_default_catalog_name()
 
-    env = _ENV_CONFIG.get_catalog_config(name)
+    env = config.get_catalog_config(name)
     conf: RecursiveDict = merge_config(env or {}, cast(RecursiveDict, properties))
 
     catalog_type: CatalogType | None
@@ -279,8 +278,8 @@ def load_catalog(name: str | None = None, **properties: str | None) -> Catalog:
     raise ValueError(f"Could not initialize catalog with the following properties: {properties}")
 
 
-def list_catalogs() -> list[str]:
-    return _ENV_CONFIG.get_known_catalogs()
+def list_catalogs(config: Config) -> list[str]:
+    return config.get_known_catalogs()
 
 
 def delete_files(io: FileIO, files_to_delete: set[str], file_type: str) -> None: