🐛Clusters-keeper: ensure json dicitionary is '-escaped (#7564)

Author: sanderegg

services/clusters-keeper/src/simcore_service_clusters_keeper/utils/clusters.py

@@ -9,7 +9,6 @@
 import yaml
 from aws_library.ec2 import EC2InstanceBootSpecific, EC2InstanceData, EC2Tags
 from aws_library.ec2._models import CommandStr
-from common_library.json_serialization import json_dumps
 from common_library.serialization import model_dump_with_secrets
 from fastapi.encoders import jsonable_encoder
 from models_library.api_schemas_clusters_keeper.clusters import (
@@ -106,7 +105,7 @@ def _convert_to_env_dict(entries: dict[str, Any]) -> str:
         f"WORKERS_EC2_INSTANCES_SUBNET_ID={app_settings.CLUSTERS_KEEPER_WORKERS_EC2_INSTANCES.WORKERS_EC2_INSTANCES_SUBNET_ID}",
         f"WORKERS_EC2_INSTANCES_TIME_BEFORE_DRAINING={app_settings.CLUSTERS_KEEPER_WORKERS_EC2_INSTANCES.WORKERS_EC2_INSTANCES_TIME_BEFORE_DRAINING}",
         f"WORKERS_EC2_INSTANCES_TIME_BEFORE_TERMINATION={app_settings.CLUSTERS_KEEPER_WORKERS_EC2_INSTANCES.WORKERS_EC2_INSTANCES_TIME_BEFORE_TERMINATION}",
-        f"AUTOSCALING_RABBITMQ={json_dumps(model_dump_with_secrets(app_settings.CLUSTERS_KEEPER_PRIMARY_EC2_INSTANCES.PRIMARY_EC2_INSTANCES_RABBIT, show_secrets=True)) if app_settings.CLUSTERS_KEEPER_PRIMARY_EC2_INSTANCES.PRIMARY_EC2_INSTANCES_RABBIT else 'null'}",
+        f"AUTOSCALING_RABBITMQ={_convert_to_env_dict(model_dump_with_secrets(app_settings.CLUSTERS_KEEPER_PRIMARY_EC2_INSTANCES.PRIMARY_EC2_INSTANCES_RABBIT, show_secrets=True)) if app_settings.CLUSTERS_KEEPER_PRIMARY_EC2_INSTANCES.PRIMARY_EC2_INSTANCES_RABBIT else 'null'}",
     ]
 
 

services/clusters-keeper/tests/unit/test_utils_clusters.py

@@ -247,7 +247,7 @@ def test_rabbitmq_settings_are_passed_with_pasword_clear(
     )
     assert isinstance(deploy_script, str)
 
-    match = re.search(r"AUTOSCALING_RABBITMQ=({.*?})", deploy_script)
+    match = re.search(r"AUTOSCALING_RABBITMQ=\'({.*?})\'", deploy_script)
     assert match, "AUTOSCALING_RABBITMQ is not present in the deploy script!"
     autoscaling_rabbitmq = match.group(1)
     passed_settings = RabbitSettings.model_validate_json(autoscaling_rabbitmq)