Skip to content

Fix environment variable parsing #423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Fokko merged 3 commits into from
Feb 14, 2024
Merged

Fix environment variable parsing #423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
350804b
Fix environment variable parsing
Fokko Feb 13, 2024
4b61434
Add second test
Fokko Feb 13, 2024
00d1396
lint
Fokko Feb 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pyiceberg/utils/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,8 @@ def set_property(_config: RecursiveDict, path: List[str], config_value: str) ->
env_var_lower = env_var.lower()
if env_var_lower.startswith(PYICEBERG.lower()):
key = env_var_lower[len(PYICEBERG) :]
parts = key.split("__")
parts_normalized = [part.replace("_", "-") for part in parts]
parts = key.split("__", maxsplit=2)
parts_normalized = [part.replace('__', '.').replace("_", "-") for part in parts]
set_property(config, parts_normalized, config_value)

return config
Expand Down
14 changes: 14 additions & 0 deletions tests/utils/test_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,20 @@ def test_from_environment_variables_uppercase() -> None:
assert Config().get_catalog_config("PRODUCTION") == {"uri": "https://service.io/api"}


@mock.patch.dict(
os.environ,
{
"PYICEBERG_CATALOG__PRODUCTION__S3__REGION": "eu-north-1",
"PYICEBERG_CATALOG__PRODUCTION__S3__ACCESS_KEY_ID": "username",
},
)
def test_fix_nested_objects_from_environment_variables() -> None:
assert Config().get_catalog_config("PRODUCTION") == {
's3.region': 'eu-north-1',
's3.access-key-id': 'username',
}


def test_from_configuration_files(tmp_path_factory: pytest.TempPathFactory) -> None:
config_path = str(tmp_path_factory.mktemp("config"))
with open(f"{config_path}/.pyiceberg.yaml", "w", encoding=UTF8) as file:
Expand Down