Skip to content

Commit bef80bb

Browse files
authored
♻️ Maintenance: Remove director-v0 client from webserver (#4461)
1 parent cf1c90c commit bef80bb

20 files changed

+8
-714
lines changed

.env-wb-db-event-listener

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ WEBSERVER_NOTIFICATIONS=0
1010
# WEBSERVER_DB_LISTENER=1 explicitly enabled in docker-compose
1111
WEBSERVER_DIAGNOSTICS=null
1212
#WEBSERVER_DIRECTOR_V2 from .env
13-
WEBSERVER_DIRECTOR=null
1413
WEBSERVER_EMAIL=null
1514
WEBSERVER_EXPORTER=null
1615
WEBSERVER_FRONTEND=null

.env-wb-garbage-collector

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ WEBSERVER_NOTIFICATIONS=0
1010
WEBSERVER_DB_LISTENER=0
1111
WEBSERVER_DIAGNOSTICS=null
1212
#WEBSERVER_DIRECTOR_V2 from .env
13-
WEBSERVER_DIRECTOR=null
1413
WEBSERVER_EMAIL=null
1514
WEBSERVER_EXPORTER=null
1615
WEBSERVER_FRONTEND=null

services/web/server/src/simcore_service_webserver/application.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
from .db.plugin import setup_db
1717
from .db_listener.plugin import setup_db_listener
1818
from .diagnostics.plugin import setup_diagnostics
19-
from .director.plugin import setup_director
2019
from .director_v2.plugin import setup_director_v2
2120
from .email.plugin import setup_email
2221
from .exporter.plugin import setup_exporter
@@ -91,7 +90,6 @@ def create_application() -> web.Application:
9190
setup_login(app)
9291

9392
# interaction with other backend services
94-
setup_director(app)
9593
setup_director_v2(app)
9694
setup_storage(app)
9795
setup_catalog(app)

services/web/server/src/simcore_service_webserver/application_settings.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
from ._meta import API_VERSION, API_VTAG, APP_NAME
3030
from .catalog.settings import CatalogSettings
3131
from .diagnostics.settings import DiagnosticsSettings
32-
from .director.settings import DirectorSettings
3332
from .director_v2.settings import DirectorV2Settings
3433
from .exporter.settings import ExporterSettings
3534
from .garbage_collector_settings import GarbageCollectorSettings
@@ -144,9 +143,6 @@ class ApplicationSettings(BaseCustomSettings, MixinLoggingSettings):
144143
WEBSERVER_DIRECTOR_V2: DirectorV2Settings | None = Field(
145144
auto_default_from_env=True, description="director-v2 service client's plugin"
146145
)
147-
WEBSERVER_DIRECTOR: DirectorSettings | None = Field(
148-
auto_default_from_env=True, description="director service client's plugin"
149-
)
150146
WEBSERVER_EMAIL: SMTPSettings | None = Field(
151147
auto_default_from_env=True, description="email plugin"
152148
)

services/web/server/src/simcore_service_webserver/application_settings_utils.py

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,6 @@ def convert_to_app_config(app_settings: ApplicationSettings) -> dict[str, Any]:
3636
# "zipkin_endpoint": f"{getattr(app_settings.WEBSERVER_TRACING, 'TRACING_ZIPKIN_ENDPOINT', None)}",
3737
},
3838
"socketio": {"enabled": app_settings.WEBSERVER_SOCKETIO},
39-
"director": {
40-
"enabled": app_settings.WEBSERVER_DIRECTOR is not None,
41-
"host": getattr(app_settings.WEBSERVER_DIRECTOR, "DIRECTOR_HOST", None),
42-
"port": getattr(app_settings.WEBSERVER_DIRECTOR, "DIRECTOR_PORT", None),
43-
"version": getattr(app_settings.WEBSERVER_DIRECTOR, "DIRECTOR_VTAG", None),
44-
},
4539
"db": {
4640
"postgres": {
4741
"database": getattr(app_settings.WEBSERVER_DB, "POSTGRES_DB", None),
@@ -200,12 +194,6 @@ def _set_if_disabled(field_name, section):
200194
_set_if_disabled("WEBSERVER_TRACING", section)
201195
# envs["TRACING_ZIPKIN_ENDPOINT"] = section.get("zipkin_endpoint")
202196

203-
if section := cfg.get("director"):
204-
_set_if_disabled("WEBSERVER_DIRECTOR", section)
205-
envs["DIRECTOR_HOST"] = section.get("host")
206-
envs["DIRECTOR_PORT"] = section.get("port")
207-
envs["DIRECTOR_VTAG"] = section.get("version")
208-
209197
if db := cfg.get("db"):
210198
if section := db.get("postgres"):
211199
envs["POSTGRES_DB"] = section.get("database")

services/web/server/src/simcore_service_webserver/director/__init__.py

Whitespace-only changes.

services/web/server/src/simcore_service_webserver/director/director_api.py

Lines changed: 0 additions & 177 deletions
This file was deleted.

services/web/server/src/simcore_service_webserver/director/director_exceptions.py

Lines changed: 0 additions & 16 deletions
This file was deleted.

services/web/server/src/simcore_service_webserver/director/plugin.py

Lines changed: 0 additions & 29 deletions
This file was deleted.

services/web/server/src/simcore_service_webserver/director/settings.py

Lines changed: 0 additions & 50 deletions
This file was deleted.

0 commit comments

Comments
 (0)