Fixing tests on setup_settings

Author: pcrespov

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

@@ -54,14 +54,14 @@ async def check_action(request: web.Request):
 
 async def get_config(request: web.Request):
     """
-        This entrypoint aims to provide an extra configuration mechanism for
-        the front-end app.
+    This entrypoint aims to provide an extra configuration mechanism for
+    the front-end app.
 
-        Some of the server configuration can be forwarded to the front-end here
+    Some of the server configuration can be forwarded to the front-end here
 
-        Example use case: the front-end app is served to the client. Then the user wants to
-        register but the server has been setup to require an invitation. This option is setup
-        at runtime and the front-end can only get it upon request to /config
+    Example use case: the front-end app is served to the client. Then the user wants to
+    register but the server has been setup to require an invitation. This option is setup
+    at runtime and the front-end can only get it upon request to /config
     """
     await extract_and_validate(request)
 
@@ -72,6 +72,6 @@ async def get_config(request: web.Request):
     data = {
         "invitation_required": login_cfg.get("registration_invitation_required", False)
     }
-    data.update( app[APP_SETTINGS_KEY].public_dict() )
+    data.update(request.app[APP_SETTINGS_KEY].public_dict())
 
     return data

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

@@ -2,13 +2,16 @@
 TODO: pydantic settings comming soon and replacing trafaret
 
 """
+import logging
+from typing import Dict, Optional
+
 from aiohttp import web
 from pydantic import BaseSettings
-from pprint import pprint
-from typing import Dict
 
 APP_SETTINGS_KEY = f"{__name__ }.build_time_settings"
 
+log = logging.getLogger(__name__)
+
 
 class BuildTimeSettings(BaseSettings):
     # All these settings are defined in the Dockerfile at build-image time
@@ -33,7 +36,7 @@ class Config:
     def public_dict(self) -> Dict:
         """ Data publicaly available  """
         return self.dict(
-            include=["vsc_url", "vsc_ref", "build_date"],
+            include={"vsc_url", "vsc_ref", "build_date"},
             exclude_unset=True,
             exclude_none=True,
         )

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

@@ -65,7 +65,7 @@ def write_statics_file(app: web.Application, directory: Path) -> None:
     statics = {}
     statics["stackName"] = os.environ.get("SWARM_STACK_NAME")
     statics["buildDate"] = app[APP_SETTINGS_KEY].build_date
-    statics.udpate(app[APP_SETTINGS_KEY].public_dict())
+    statics.update(app[APP_SETTINGS_KEY].public_dict())
 
     with open(directory / "statics.json", "wt") as fh:
         json.dump(statics, fh)

services/web/server/tests/unit/isolated/test_rest.py

@@ -16,6 +16,7 @@
 from simcore_service_webserver.resources import resources
 from simcore_service_webserver.rest import setup_rest
 from simcore_service_webserver.security import setup_security
+from simcore_service_webserver.settings import setup_settings
 
 
 @pytest.fixture
@@ -43,7 +44,9 @@ async def slow_handler(request: web.Request):
         "main": server_kwargs,
         "rest": {"enabled": True, "version": api_version_prefix},
     }
+
     # activates only security+restAPI sub-modules
+    setup_settings(app)
     setup_security(app)
     setup_rest(app)
 

services/web/server/tests/unit/with_dbs/fast/test_access_to_studies.py

@@ -28,6 +28,7 @@
 from simcore_service_webserver.rest import setup_rest
 from simcore_service_webserver.security import setup_security
 from simcore_service_webserver.session import setup_session
+from simcore_service_webserver.settings import setup_settings
 from simcore_service_webserver.statics import setup_statics
 from simcore_service_webserver.studies_access import setup_studies_access
 from simcore_service_webserver.users import setup_users
@@ -77,6 +78,7 @@ def client(loop, aiohttp_client, app_cfg, postgres_db, qx_client_outdir, monkeyp
 
     app = create_safe_application(cfg)
 
+    setup_settings(app)
     setup_statics(app)
     setup_db(app)
     setup_session(app)
@@ -98,7 +100,7 @@ def client(loop, aiohttp_client, app_cfg, postgres_db, qx_client_outdir, monkeyp
 
 @pytest.fixture
 async def logged_user(client):  # , role: UserRole):
-    """ adds a user in db and logs in with client
+    """adds a user in db and logs in with client
 
     NOTE: role fixture is defined as a parametrization below
     """