Skip to content

Commit

Permalink
Issue #139 remove deprecated collection_whitelist config
Browse files Browse the repository at this point in the history
  • Loading branch information
soxofaan committed Apr 3, 2024
1 parent dcbcfed commit 66d1d72
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.

The format is roughly based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## [0.31.0]

- Remove deprecated `collection_whitelist` config ([#139](https://github.com/Open-EO/openeo-aggregator/issues/139))

## [0.30.0]

- Add backend-aware collection allow-list option ([#139](https://github.com/Open-EO/openeo-aggregator/issues/139))
Expand Down
2 changes: 1 addition & 1 deletion src/openeo_aggregator/about.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import sys
from typing import Optional

__version__ = "0.30.0a1"
__version__ = "0.31.0a1"


def log_version_info(logger: Optional[logging.Logger] = None):
Expand Down
3 changes: 1 addition & 2 deletions src/openeo_aggregator/backend.py
Original file line number Diff line number Diff line change
Expand Up @@ -213,8 +213,7 @@ def _get_all_metadata(self) -> Tuple[List[dict], _InternalCollectionMetadata]:
"""
# Group collection metadata by hierarchically: collection id -> backend id -> metadata
grouped = defaultdict(dict)
# TODO: remove deprecated collection_whitelist usage
collection_allow_list = get_backend_config().collection_allow_list or get_backend_config().collection_whitelist
collection_allow_list = get_backend_config().collection_allow_list
if collection_allow_list:
collection_allow_list = CollectionAllowList(collection_allow_list)

Expand Down
4 changes: 0 additions & 4 deletions src/openeo_aggregator/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,6 @@ class AggregatorBackendConfig(OpenEoBackendConfig):
# TTL for connection caching.
connections_cache_ttl: float = 5 * 60.0

# List of collection ids to cover with the aggregator (when None: support union of all upstream collections)
# TODO: remove this deprecated field
collection_whitelist: Optional[List[Union[str, re.Pattern]]] = None

# Allow list for collection ids to cover with the aggregator.
# By default (value `None`): support union of all upstream collections.
# To enable a real allow list, use a list of items as illustrated:
Expand Down

0 comments on commit 66d1d72

Please sign in to comment.