Skip to content

Commit

Permalink
Issue #112 some final cleanups
Browse files Browse the repository at this point in the history
  • Loading branch information
soxofaan committed Mar 1, 2024
1 parent e2739c9 commit d15bb53
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 11 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ The format is roughly based on [Keep a Changelog](https://keepachangelog.com/en/

- Remove deprecated `AggregatorConfig` fields: `aggregator_backends`, `partitioned_job_tracking`,
`zookeeper_prefix`, `memoizer` ([#112](https://github.com/Open-EO/openeo-aggregator/issues/112))
- Remove `AggregatorConfig` usage (both in `src` and `tests`) ([#112](https://github.com/Open-EO/openeo-aggregator/issues/112))

## [0.26.0]

Expand Down
5 changes: 3 additions & 2 deletions src/openeo_aggregator/backend.py
Original file line number Diff line number Diff line change
Expand Up @@ -1306,7 +1306,6 @@ def __init__(self, backends: MultiBackendConnection):
batch_jobs=batch_jobs,
user_defined_processes=user_defined_processes,
)
# TODO #112 once `AggregatorConfig.configured_oidc_providers` is eliminated, this `_configured_oidc_providers` is not necessary anymore.
self._configured_oidc_providers: List[OidcProvider] = get_backend_config().oidc_providers
self._auth_entitlement_check: Union[bool, dict] = get_backend_config().auth_entitlement_check

Expand All @@ -1319,7 +1318,9 @@ def __init__(self, backends: MultiBackendConnection):
)

def oidc_providers(self) -> List[OidcProvider]:
# TODO #112 once `AggregatorConfig.configured_oidc_providers` is eliminated, this method override is not necessary anymore
# Technically, this implementation is redundant given the parent implementation
# But keeping it allows for some additional tests
# (until https://github.com/Open-EO/openeo-python-driver/issues/265 is resolved)
return self._configured_oidc_providers

def file_formats(self) -> dict:
Expand Down
10 changes: 1 addition & 9 deletions src/openeo_aggregator/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,22 +33,14 @@ class ConfigException(ValueError):


class AggregatorConfig(dict):
"""
Simple dictionary based configuration for aggregator backend
"""

# TODO #112 migrate everything to AggregatorBackendConfig (attrs based instead of dictionary based)

# TODO #112 Remove this empty shell
config_source = dict_item()

# Just a config field for test purposes (while were stripping down this config class)
test_dummy = dict_item(default="alice")



@attrs.frozen(kw_only=True)
class AggregatorBackendConfig(OpenEoBackendConfig):
# TODO #112 migrate everything from AggregatorConfig to this class

capabilities_backend_version: str = openeo_aggregator.about.__version__
capabilities_deploy_metadata: dict = build_backend_deploy_metadata(
Expand Down

0 comments on commit d15bb53

Please sign in to comment.