Issue #112 Add AggregatorBackendConfig to conf/aggregator.*.py files

to simplify migration
Open-EO · Feb 27, 2024 · d74fea0 · d74fea0
1 parent aae297d
commit d74fea0
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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.21.0]
+
+- Add `AggregatorBackendConfig` to `conf/aggregator.*.py` files  ([#112](https://github.com/Open-EO/openeo-aggregator/issues/112))
+
 ## [0.20.0]
 
 - move `connections_cache_ttl` config to AggregatorBackendConfig ([#112](https://github.com/Open-EO/openeo-aggregator/issues/112))

diff --git a/conf/aggregator.dev.py b/conf/aggregator.dev.py
@@ -1,6 +1,6 @@
 from openeo_driver.users.oidc import OidcProvider
 
-from openeo_aggregator.config import AggregatorConfig
+from openeo_aggregator.config import AggregatorBackendConfig, AggregatorConfig
 
 _DEFAULT_OIDC_CLIENT_EGI = {
     "id": "openeo-platform-default-client",
@@ -42,7 +42,7 @@
 
 ZK_HOSTS = "epod-master1.vgt.vito.be:2181,epod-master2.vgt.vito.be:2181,epod-master3.vgt.vito.be:2181"
 
-aggregator_config = config = AggregatorConfig(
+aggregator_config = AggregatorConfig(
     config_source=__file__,
     aggregator_backends={
         "vito": "https://openeo-dev.vito.be/openeo/1.1/",
@@ -76,3 +76,10 @@
         }
     },
 )
+
+
+config = AggregatorBackendConfig(
+    id="openeo-platform-aggregator-dev",
+    capabilities_title="openEO Platform (dev)",
+    capabilities_description="openEO Platform, provided through openEO Aggregator Driver (development instance).",
+)
diff --git a/conf/aggregator.dummy.py b/conf/aggregator.dummy.py
@@ -3,9 +3,9 @@
 """
 from openeo_driver.users.oidc import OidcProvider
 
-from openeo_aggregator.config import AggregatorConfig
+from openeo_aggregator.config import AggregatorBackendConfig, AggregatorConfig
 
-aggregator_config = config = AggregatorConfig(
+aggregator_config = AggregatorConfig(
     config_source=__file__,
     aggregator_backends={
         "dummy": "https://openeo.example/openeo/1.1/",
@@ -20,3 +20,10 @@
     ],
     zookeeper_prefix="/openeo/aggregator/dummy/",
 )
+
+
+config = AggregatorBackendConfig(
+    id="aggregator-dummy",
+    capabilities_title="openEO Aggregator Dummy",
+    capabilities_description="openEO Aggregator Dummy instance.",
+)
diff --git a/conf/aggregator.prod.py b/conf/aggregator.prod.py
@@ -1,6 +1,6 @@
 from openeo_driver.users.oidc import OidcProvider
 
-from openeo_aggregator.config import AggregatorConfig
+from openeo_aggregator.config import AggregatorBackendConfig, AggregatorConfig
 
 _DEFAULT_OIDC_CLIENT_EGI = {
     "id": "openeo-platform-default-client",
@@ -35,7 +35,7 @@
 
 ZK_HOSTS = "epod-master1.vgt.vito.be:2181,epod-master2.vgt.vito.be:2181,epod-master3.vgt.vito.be:2181"
 
-aggregator_config = config = AggregatorConfig(
+aggregator_config = AggregatorConfig(
     config_source=__file__,
     aggregator_backends={
         "vito": "https://openeo.vito.be/openeo/1.1/",
@@ -69,3 +69,10 @@
     },
 
 )
+
+
+config = AggregatorBackendConfig(
+    id="openeo-platform-aggregator-prod",
+    capabilities_title="openEO Platform",
+    capabilities_description="openEO Platform, provided through openEO Aggregator Driver.",
+)
diff --git a/conf/backend_config.py b/conf/backend_config.py
@@ -1,5 +1,7 @@
 from openeo_aggregator.config import AggregatorBackendConfig
 
+# TODO #112 #117 this config file is deprecated
+
 config = AggregatorBackendConfig(
     # TODO: eliminate hardcoded openEO Platform references. https://github.com/Open-EO/openeo-aggregator/issues/117
     id="openeo-platform-aggregator",

diff --git a/src/openeo_aggregator/about.py b/src/openeo_aggregator/about.py
@@ -2,7 +2,7 @@
 import sys
 from typing import Optional
 
-__version__ = "0.20.0a1"
+__version__ = "0.21.0a1"
 
 
 def log_version_info(logger: Optional[logging.Logger] = None):