Skip to content

Commit

Permalink
removed clusters endpoint from webserver
Browse files Browse the repository at this point in the history
  • Loading branch information
sanderegg committed Dec 2, 2024
1 parent 2c4fca0 commit 56a9501
Show file tree
Hide file tree
Showing 14 changed files with 3 additions and 1,161 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
""" Main application
"""

import logging
from pprint import pformat
from typing import Any
Expand All @@ -14,7 +15,6 @@
from .api_keys.plugin import setup_api_keys
from .application_settings import get_application_settings, setup_settings
from .catalog.plugin import setup_catalog
from .clusters.plugin import setup_clusters
from .db.plugin import setup_db
from .db_listener.plugin import setup_db_listener
from .diagnostics.plugin import setup_diagnostics, setup_profiling_middleware
Expand Down Expand Up @@ -147,7 +147,6 @@ def create_application() -> web.Application:
setup_publications(app)
setup_studies_dispatcher(app)
setup_exporter(app)
setup_clusters(app)

# NOTE: *last* events
app.on_startup.append(_welcome_banner)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,6 @@ class ApplicationSettings(BaseCustomSettings, MixinLoggingSettings):
# These plugins only require (for the moment) an entry to toggle between enabled/disabled
WEBSERVER_ANNOUNCEMENTS: bool = False
WEBSERVER_API_KEYS: bool = True
WEBSERVER_CLUSTERS: bool = False
WEBSERVER_DB_LISTENER: bool = True
WEBSERVER_FOLDERS: bool = True
WEBSERVER_GROUPS: bool = True
Expand Down Expand Up @@ -370,7 +369,6 @@ def _get_disabled_public_plugins(self) -> list[str]:
# TODO: more reliable definition of a "plugin" and whether it can be advertised or not
# (extra var? e.g. Field( ... , x_advertise_plugin=True))
public_plugin_candidates: Final = {
"WEBSERVER_CLUSTERS",
"WEBSERVER_EXPORTER",
"WEBSERVER_FOLDERS",
"WEBSERVER_META_MODELING",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,6 @@ def convert_to_app_config(app_settings: ApplicationSettings) -> dict[str, Any]:
app_settings.WEBSERVER_ACTIVITY, "PROMETHEUS_VTAG", None
),
},
"clusters": {"enabled": app_settings.WEBSERVER_CLUSTERS},
"computation": {"enabled": app_settings.is_enabled("WEBSERVER_NOTIFICATIONS")},
"diagnostics": {"enabled": app_settings.is_enabled("WEBSERVER_DIAGNOSTICS")},
"director-v2": {"enabled": app_settings.is_enabled("WEBSERVER_DIRECTOR_V2")},
Expand Down Expand Up @@ -310,7 +309,6 @@ def _set_if_disabled(field_name, section):
_set_if_disabled("WEBSERVER_STATICWEB", section)

for settings_name in (
"WEBSERVER_CLUSTERS",
"WEBSERVER_GARBAGE_COLLECTOR",
"WEBSERVER_GROUPS",
"WEBSERVER_META_MODELING",
Expand Down
Empty file.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 56a9501

Please sign in to comment.