unify naming

Author: Andrei Neagu

packages/settings-library/src/settings_library/director_v0.py

@@ -6,11 +6,11 @@
 
 
 class DirectorV0Settings(BaseCustomSettings):
-    DIRECTOR_V0_ENABLED: bool = True
+    DIRECTOR_ENABLED: bool = True
 
     DIRECTOR_HOST: str = "director"
     DIRECTOR_PORT: PortInt = TypeAdapter(PortInt).validate_python(8000)
-    DIRECTOR_V0_VTAG: VersionTag = Field(
+    DIRECTOR_VTAG: VersionTag = Field(
         default="v0", description="Director-v0 service API's version tag"
     )
 
@@ -20,6 +20,6 @@ def endpoint(self) -> str:
             scheme="http",
             host=self.DIRECTOR_HOST,
             port=self.DIRECTOR_PORT,
-            path=f"{self.DIRECTOR_V0_VTAG}",
+            path=f"{self.DIRECTOR_VTAG}",
         )
         return f"{url}"

services/director-v2/src/simcore_service_director_v2/core/application.py

@@ -147,7 +147,7 @@ def init_app(settings: AppSettings | None = None) -> FastAPI:
     if settings.DIRECTOR_V2_TRACING:
         setup_tracing(app, settings.DIRECTOR_V2_TRACING, APP_NAME)
 
-    if settings.DIRECTOR_V0.DIRECTOR_V0_ENABLED:
+    if settings.DIRECTOR_V0.DIRECTOR_ENABLED:
         director_v0.setup(
             app,
             director_v0_settings=settings.DIRECTOR_V0,

services/director-v2/tests/unit/test_modules_catalog.py

@@ -23,7 +23,7 @@ def minimal_catalog_config(
     """set a minimal configuration for testing the director connection only"""
     monkeypatch.setenv("DIRECTOR_ENABLED", "0")
     monkeypatch.setenv("DIRECTOR_V2_DYNAMIC_SCHEDULER_ENABLED", "false")
-    monkeypatch.setenv("DIRECTOR_V0_ENABLED", "0")
+    monkeypatch.setenv("DIRECTOR_ENABLED", "0")
     monkeypatch.setenv("COMPUTATIONAL_BACKEND_DASK_CLIENT_ENABLED", "0")
     monkeypatch.setenv("COMPUTATIONAL_BACKEND_ENABLED", "0")
 

services/director-v2/tests/unit/test_modules_dask_client.py

@@ -131,7 +131,7 @@ def _minimal_dask_config(
     """set a minimal configuration for testing the dask connection only"""
     monkeypatch.setenv("DIRECTOR_ENABLED", "0")
     monkeypatch.setenv("DIRECTOR_V2_DYNAMIC_SIDECAR_ENABLED", "false")
-    monkeypatch.setenv("DIRECTOR_V0_ENABLED", "0")
+    monkeypatch.setenv("DIRECTOR_ENABLED", "0")
     monkeypatch.setenv("DIRECTOR_V2_CATALOG", "null")
     monkeypatch.setenv("COMPUTATIONAL_BACKEND_DASK_CLIENT_ENABLED", "1")
     monkeypatch.setenv("COMPUTATIONAL_BACKEND_ENABLED", "0")

services/director-v2/tests/unit/test_modules_dask_clients_pool.py

@@ -43,7 +43,7 @@ def minimal_dask_config(
     """set a minimal configuration for testing the dask connection only"""
     monkeypatch.setenv("DIRECTOR_ENABLED", "0")
     monkeypatch.setenv("DIRECTOR_V2_DYNAMIC_SIDECAR_ENABLED", "false")
-    monkeypatch.setenv("DIRECTOR_V0_ENABLED", "0")
+    monkeypatch.setenv("DIRECTOR_ENABLED", "0")
     monkeypatch.setenv("DIRECTOR_V2_CATALOG", "null")
     monkeypatch.setenv("COMPUTATIONAL_BACKEND_DASK_CLIENT_ENABLED", "1")
     monkeypatch.setenv("COMPUTATIONAL_BACKEND_ENABLED", "0")

services/director-v2/tests/unit/test_modules_notifier.py

@@ -65,7 +65,7 @@ def mock_env(
             "S3_SECRET_KEY": faker.pystr(),
             "S3_BUCKET_NAME": faker.pystr(),
             "DIRECTOR_ENABLED": "0",
-            "DIRECTOR_V0_ENABLED": "0",
+            "DIRECTOR_ENABLED": "0",
             "DIRECTOR_V2_CATALOG": "null",
             "COMPUTATIONAL_BACKEND_DASK_CLIENT_ENABLED": "0",
             "COMPUTATIONAL_BACKEND_ENABLED": "0",

services/director-v2/tests/unit/test_modules_storage.py

@@ -17,7 +17,7 @@ def minimal_storage_config(
     """set a minimal configuration for testing the director connection only"""
     monkeypatch.setenv("DIRECTOR_ENABLED", "0")
     monkeypatch.setenv("DIRECTOR_V2_DYNAMIC_SCHEDULER_ENABLED", "false")
-    monkeypatch.setenv("DIRECTOR_V0_ENABLED", "0")
+    monkeypatch.setenv("DIRECTOR_ENABLED", "0")
     monkeypatch.setenv("DIRECTOR_V2_CATALOG", "null")
     monkeypatch.setenv("COMPUTATIONAL_BACKEND_DASK_CLIENT_ENABLED", "0")
     monkeypatch.setenv("COMPUTATIONAL_BACKEND_ENABLED", "0")