renames trash settings

Author: pcrespov

.env-devel

@@ -334,7 +334,6 @@ LOGIN_ACCOUNT_DELETION_RETENTION_DAYS=31
 LOGIN_REGISTRATION_CONFIRMATION_REQUIRED=0
 LOGIN_REGISTRATION_INVITATION_REQUIRED=0
 PROJECTS_INACTIVITY_INTERVAL=00:00:20
-PROJECTS_TRASH_RETENTION_DAYS=7
 PROJECTS_MAX_COPY_SIZE_BYTES=30Gib
 PROJECTS_MAX_NUM_RUNNING_DYNAMIC_NODES=5
 REST_SWAGGER_API_DOC_ENABLED=1
@@ -348,11 +347,12 @@ SIMCORE_VCS_RELEASE_TAG=latest
 STUDIES_ACCESS_ANONYMOUS_ALLOWED=0
 STUDIES_DEFAULT_SERVICE_THUMBNAIL=https://via.placeholder.com/170x120.png
 TRACING_OPENTELEMETRY_COLLECTOR_BATCH_SIZE=2
-TRACING_OPENTELEMETRY_COLLECTOR_PORT=4318
 TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT=http://opentelemetry-collector
-TRACING_OPENTELEMETRY_COLLECTOR_SAMPLING_PERCENTAGE=100
 TRACING_OPENTELEMETRY_COLLECTOR_EXPORTER_ENDPOINT=http://jaeger:4318
+TRACING_OPENTELEMETRY_COLLECTOR_PORT=4318
+TRACING_OPENTELEMETRY_COLLECTOR_SAMPLING_PERCENTAGE=100
 TRAEFIK_SIMCORE_ZONE=internal_simcore_stack
+TRASH_RETENTION_DAYS=7
 TWILIO_ACCOUNT_SID=DUMMY
 TWILIO_AUTH_TOKEN=DUMMY
 TWILIO_COUNTRY_CODES_W_ALPHANUMERIC_SID_SUPPORT=["41"]
@@ -365,8 +365,8 @@ WEBSERVER_DEV_FEATURES_ENABLED=0
 WEBSERVER_DIAGNOSTICS={}
 WEBSERVER_EMAIL={}
 WEBSERVER_EXPORTER={}
-WEBSERVER_FRONTEND={}
 WEBSERVER_FOLDERS=1
+WEBSERVER_FRONTEND={}
 WEBSERVER_GARBAGE_COLLECTOR=null
 WEBSERVER_GROUPS=1
 WEBSERVER_GUNICORN_CMD_ARGS=--timeout=180

services/docker-compose.yml

@@ -778,7 +778,7 @@ services:
       PROJECTS_INACTIVITY_INTERVAL: ${PROJECTS_INACTIVITY_INTERVAL}
       PROJECTS_MAX_COPY_SIZE_BYTES: ${PROJECTS_MAX_COPY_SIZE_BYTES}
       PROJECTS_MAX_NUM_RUNNING_DYNAMIC_NODES: ${PROJECTS_MAX_NUM_RUNNING_DYNAMIC_NODES}
-      PROJECTS_TRASH_RETENTION_DAYS: ${PROJECTS_TRASH_RETENTION_DAYS}
+
 
       # WEBSERVER_RABBITMQ
       RABBIT_HOST: ${RABBIT_HOST}
@@ -787,6 +787,10 @@ services:
       RABBIT_SECURE: ${RABBIT_SECURE}
       RABBIT_USER: ${RABBIT_USER}
 
+      # WEBSERVER_TRASH
+      TRASH_RETENTION_DAYS: ${TRASH_RETENTION_DAYS}
+
+
       # ARBITRARY ENV VARS
 
       # see [https://docs.gunicorn.org/en/stable/settings.html#timeout],

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

@@ -7,9 +7,7 @@
 
 class TrashSettings(BaseCustomSettings):
     TRASH_RETENTION_DAYS: NonNegativeInt = Field(
-        default=7,
         description="Trashed items will be deleted after this time",
-        alias="PROJECTS_TRASH_RETENTION_DAYS",
     )