Skip to content

♻️ Maintenance: Cleanup Unused Env Var and Minor Validation Fix #8132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 22, 2025
Merged

♻️ Maintenance: Cleanup Unused Env Var and Minor Validation Fix #8132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
34ba4cf
minor fix on phone numbers
pcrespov Jul 21, 2025
800238c
🔧 Remove WEBSERVER_CLUSTERS environment variable from multiple config…
pcrespov Jul 21, 2025
898a39e
Merge branch 'master' into is8129/unused-environs
pcrespov Jul 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions services/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -846,7 +846,6 @@ services:
WEBSERVER_DB_LISTENER: ${WEBSERVER_DB_LISTENER}
WEBSERVER_ANNOUNCEMENTS: ${WEBSERVER_ANNOUNCEMENTS}
WEBSERVER_NOTIFICATIONS: ${WEBSERVER_NOTIFICATIONS}
WEBSERVER_CLUSTERS: ${WEBSERVER_CLUSTERS}
WEBSERVER_FUNCTIONS: ${WEBSERVER_FUNCTIONS} # neede for front-end
WEBSERVER_GROUPS: ${WEBSERVER_GROUPS}
WEBSERVER_PRODUCTS: ${WEBSERVER_PRODUCTS}
Expand Down Expand Up @@ -955,7 +954,6 @@ services:
WEBSERVER_ACTIVITY: ${WB_DB_EL_ACTIVITY}
WEBSERVER_ANNOUNCEMENTS: ${WB_DB_EL_ANNOUNCEMENTS}
WEBSERVER_CATALOG: ${WB_DB_EL_CATALOG}
WEBSERVER_CLUSTERS: ${WB_DB_EL_CLUSTERS}
WEBSERVER_DB_LISTENER: ${WB_DB_EL_DB_LISTENER}
WEBSERVER_DIAGNOSTICS: ${WB_DB_EL_DIAGNOSTICS}
WEBSERVER_EMAIL: ${WB_DB_EL_EMAIL}
Expand Down Expand Up @@ -1068,7 +1066,6 @@ services:
WEBSERVER_ACTIVITY: ${WB_GC_ACTIVITY}
WEBSERVER_ANNOUNCEMENTS: ${WB_GC_ANNOUNCEMENTS}
WEBSERVER_CATALOG: ${WB_GC_CATALOG}
WEBSERVER_CLUSTERS: ${WB_GC_CLUSTERS}
WEBSERVER_DB_LISTENER: ${WB_GC_DB_LISTENER}
WEBSERVER_DIAGNOSTICS: ${WB_GC_DIAGNOSTICS}
WEBSERVER_EMAIL: ${WB_GC_EMAIL}
Expand Down
6 changes: 5 additions & 1 deletion services/web/server/src/simcore_service_webserver/users/_controller/rest/_rest_schemas.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
from models_library.api_schemas_webserver._base import InputSchema
from models_library.api_schemas_webserver.users import UserAccountGet
from models_library.emails import LowerCaseEmailStr
from models_library.utils.common_validators import empty_str_to_none_pre_validator
from pydantic import (
BeforeValidator,
ConfigDict,
Field,
StringConstraints,
Expand Down Expand Up @@ -64,7 +66,9 @@ class UserAccountRestPreRegister(InputSchema):
institution: Annotated[
str | None, Field(description="company, university, ...")
] = None
phone: PhoneNumberStr | None
phone: Annotated[
PhoneNumberStr | None, BeforeValidator(empty_str_to_none_pre_validator)
]

# billing details
address: str
Expand Down
1 change: 0 additions & 1 deletion services/web/server/tests/unit/isolated/test_studies_dispatcher_projects_permalinks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ def app_environment(
**env_devel_dict,
"WEBSERVER_ACTIVITY": "null",
"WEBSERVER_CATALOG": "null",
"WEBSERVER_CLUSTERS": "false",
"WEBSERVER_NOTIFICATIONS": "0",
"WEBSERVER_DIAGNOSTICS": "null",
"WEBSERVER_DIRECTOR_V2": "null",
Expand Down
1 change: 0 additions & 1 deletion services/web/server/tests/unit/with_dbs/01/test_groups_handlers_classifers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ def app_environment(
# exclude
"WEBSERVER_ACTIVITY": "null",
"WEBSERVER_CATALOG": "null",
"WEBSERVER_CLUSTERS": "null",
"WEBSERVER_COMPUTATION": "null",
"WEBSERVER_DIAGNOSTICS": "null",
"WEBSERVER_EMAIL": "null",
Expand Down
1 change: 0 additions & 1 deletion services/web/server/tests/unit/with_dbs/03/test__openapi_specs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ def app_environment(
"WEBSERVER_GARBAGE_COLLECTOR": "null",
# enable plugins that by default are disabled
"WEBSERVER_DEV_FEATURES_ENABLED": "1",
"WEBSERVER_CLUSTERS": "1",
# enables activity WEBSERVER_ACTIVITY
"PROMETHEUS_URL": f"https://{faker.domain_name()}",
"PROMETHEUS_USERNAME": faker.user_name(),
Expand Down
Loading