🐛 Fix how sidecar passes the environment variables to the 'car' (#2453)

* Add a test to check if the variables acutally end up in the container created by the sidecar

Author: mguidon

services/sidecar/src/simcore_service_sidecar/executor.py

@@ -304,15 +304,14 @@ async def _get_resource_limitations() -> Dict[str, int]:
         resource_limitations = await _get_resource_limitations()
 
         nano_cpus_limit = resource_limitations["NanoCPUs"]
-        mem_limit = resource_limitations["NanoCPUs"]
+        mem_limit = resource_limitations["Memory"]
 
         env_vars.extend(
             [
-                f"{CPU_RESOURCE_LIMIT_KEY} = {str(nano_cpus_limit)}"
-                f"{MEM_RESOURCE_LIMIT_KEY} = {str(mem_limit)}",
+                f"{CPU_RESOURCE_LIMIT_KEY}={str(nano_cpus_limit)}",
+                f"{MEM_RESOURCE_LIMIT_KEY}={str(mem_limit)}",
             ]
         )
-
         docker_container_config = {
             "Env": env_vars,
             "Cmd": "run",

services/sidecar/tests/integration/mock/osparc_python_print_env.py

@@ -0,0 +1,4 @@
+import os
+
+print("Hello from python. I can see the following env")
+print(os.environ)

services/sidecar/tests/integration/test_sidecar.py

@@ -15,6 +15,7 @@
 from models_library.settings.celery import CeleryConfig
 from models_library.settings.rabbit import RabbitConfig
 from pytest_simcore.helpers.rawdata_fakers import random_project, random_user
+from servicelib.resources import CPU_RESOURCE_LIMIT_KEY, MEM_RESOURCE_LIMIT_KEY
 from simcore_postgres_database.storage_models import projects, users
 from simcore_sdk.models.pipeline_models import ComputationalPipeline, ComputationalTask
 from simcore_service_sidecar import config, utils
@@ -378,6 +379,22 @@ async def _create(
     },
 )
 
+PYTHON_ENV_PRINTER = (
+    "itisfoundation/osparc-python-runner",
+    "1.0.0",
+    {
+        "a13d197a-bf8c-4e11-8a15-44a9894cbbe8": {
+            "next": [],
+            "inputs": {
+                "input_1": {
+                    "store": SIMCORE_S3_ID,
+                    "path": "osparc_python_print_env.py",
+                }
+            },
+        },
+    },
+)
+
 
 # FIXME: input schema in osparc-python-executor service is wrong
 PYTHON_RUNNER_FACTORY_STUDY = (
@@ -410,7 +427,9 @@ async def _create(
     [
         SLEEPERS_STUDY,
         PYTHON_RUNNER_STUDY,
+        PYTHON_ENV_PRINTER,
     ],
+    ids=["sleepers", "python-runner-study", "python-env-printer"],
 )
 async def test_run_services(
     loop,
@@ -452,7 +471,7 @@ async def rabbit_message_handler(message: aio_pika.IncomingMessage):
         await cli.run_sidecar(job_id, user_id, pipeline.project_id, node_id)
 
     await asyncio.sleep(15)  # wait a little bit for logs to come in
-    await _assert_incoming_data_logs(
+    _sidecar_logs, tasks_logs, _progress_logs = await _assert_incoming_data_logs(
         list(pipeline_cfg.keys()),
         incoming_data,
         user_id,
@@ -466,6 +485,12 @@ async def rabbit_message_handler(message: aio_pika.IncomingMessage):
     assert not list(config.SIDECAR_OUTPUT_FOLDER.glob("**/*"))
     assert not list(config.SIDECAR_LOG_FOLDER.glob("**/*"))
 
+    # The python env printer should print what he sees in the environment
+    if pipeline_cfg == PYTHON_ENV_PRINTER[2]:
+        logs = json.dumps(tasks_logs)
+        assert CPU_RESOURCE_LIMIT_KEY in logs
+        assert MEM_RESOURCE_LIMIT_KEY in logs
+
 
 def print_module_variables(module):
     print(module.__name__, ":")