diff --git a/conf/backend_config.py b/conf/backend_config.py deleted file mode 100644 index d37ba4e..0000000 --- a/conf/backend_config.py +++ /dev/null @@ -1,12 +0,0 @@ -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", - capabilities_title="openEO Platform", - capabilities_description="openEO Platform, provided through openEO Aggregator Driver", - enable_basic_auth=False, - aggregator_backends={}, -) diff --git a/src/openeo_aggregator/app.py b/src/openeo_aggregator/app.py index 9e05885..1e3aa9d 100644 --- a/src/openeo_aggregator/app.py +++ b/src/openeo_aggregator/app.py @@ -39,9 +39,6 @@ def create_app(config: Any = None, auto_logging_setup: bool = True, flask_error_ log_version_info(logger=_log) - # TODO #112 move this default to the AggregatorBackendConfig getter (get_backend_config) - os.environ.setdefault(ConfigGetter.OPENEO_BACKEND_CONFIG, str(get_config_dir() / "backend_config.py")) - config: AggregatorConfig = get_config(config) _log.info(f"Using config: {config.config_source=!r}") diff --git a/tests/test_views.py b/tests/test_views.py index 2b7aa18..b622d89 100644 --- a/tests/test_views.py +++ b/tests/test_views.py @@ -135,30 +135,6 @@ def test_health_check_invalid_backend(self, api100, requests_mock, backend1, bac } -class TestGeneralRealConfig: - """Some temporary test against real config (that is going to be moved out of this repo at some point)""" - - @pytest.fixture(autouse=True) - def real_config(self, monkeypatch): - openeo_driver.config.load._backend_config_getter.flush() - monkeypatch.setenv( - openeo_driver.config.load.ConfigGetter.OPENEO_BACKEND_CONFIG, - str(get_config_dir() / "backend_config.py"), - ) - yield - openeo_driver.config.load._backend_config_getter.flush() - - def test_title_and_description(self, api100): - res = api100.get("/").assert_status_code(200) - capabilities = res.json - assert capabilities["title"] == "openEO Platform" - assert capabilities["description"] == "openEO Platform, provided through openEO Aggregator Driver" - - def test_only_oidc_auth(self, api100): - res = api100.get("/").assert_status_code(200) - capabilities = res.json - endpoints = {e["path"] for e in capabilities["endpoints"]} - assert {e for e in endpoints if e.startswith("/credentials")} == {"/credentials/oidc"} class TestCatalog: