Always enable allow_dynamic_etl_api from synchronous processing (dr…

…op feature flag) ref #531 eu-cdse/openeo-cdse-infra#114
Open-EO · May 3, 2024 · c23e214 · c23e214
1 parent aad4d61
commit c23e214
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,11 @@ without compromising stable operations.
 
 ## Unreleased
 
+## 0.32.0
+
+- Always enable `allow_dynamic_etl_api` from synchronous processing (drop feature flag)
+  ([#531](https://github.com/Open-EO/openeo-geopyspark-driver/issues/531), eu-cdse/openeo-cdse-infra#114)
+
 ## 0.31.1
 
 - Initial support for `job_options` handling in `OpenEoBackendImplementation.request_costs()`

diff --git a/openeogeotrellis/_version.py b/openeogeotrellis/_version.py
@@ -1 +1 @@
-__version__ = "0.31.1a1"
+__version__ = "0.32.0a1"
diff --git a/openeogeotrellis/backend.py b/openeogeotrellis/backend.py
@@ -1166,11 +1166,7 @@ def request_costs(
             etl_api = get_etl_api(
                 user=user,
                 job_options=job_options,
-                allow_dynamic_etl_api=bool(
-                    # TODO #531 this is temporary feature flag, to removed when done
-                    backend_config.etl_dynamic_api_flag
-                    and flask.request.args.get(backend_config.etl_dynamic_api_flag)
-                ),
+                allow_dynamic_etl_api=True,
                 requests_session=requests_session,
                 # TODO #531 provide a TtlCache here
                 etl_api_cache=None,

diff --git a/openeogeotrellis/config/config.py b/openeogeotrellis/config/config.py
@@ -116,7 +116,7 @@ class GpsBackendConfig(OpenEoBackendConfig):
     etl_api: Optional[str] = os.environ.get("OPENEO_ETL_API", "https://etl.terrascope.be")
     etl_source_id: str = "TerraScope/MEP"
     use_etl_api_on_sync_processing: bool = False
-    etl_dynamic_api_flag: Optional[str] = None  # TODO #531 eliminate this temporary feature flag?
+    etl_dynamic_api_flag: Optional[str] = None  # TODO #531 eliminate this temporary feature flag? Unused now
 
     # TODO #531 this config is meant to replace `etl_api` from above
     etl_api_config: Optional[EtlApiConfig] = None

diff --git a/openeogeotrellis/integrations/etl_api.py b/openeogeotrellis/integrations/etl_api.py
@@ -335,7 +335,7 @@ def get_etl_api(
     user: Optional[User] = None,
     job_options: Optional[dict] = None,
     requests_session: Optional[requests.Session] = None,
-    # TODO #531 remove this temporary feature flag/toggle for dynamic ETL selection.
+    # TODO #531 remove this temporary feature flag/toggle for dynamic ETL selection. (True from all call locations now)
     allow_dynamic_etl_api: bool = False,
     etl_api_cache: Optional[TtlCache] = None,
 ) -> EtlApi: