fixed test

Author: sanderegg

services/clusters-keeper/src/simcore_service_clusters_keeper/core/settings.py

@@ -252,7 +252,7 @@ class PrimaryEC2InstancesSettings(BaseCustomSettings):
         ),
     ] = "172.20.0.0/14"  # nosec
 
-    PRIMARY_EC2_INSTANCES_RABBIT_SETTINGS: Annotated[
+    PRIMARY_EC2_INSTANCES_RABBIT: Annotated[
         RabbitSettings | None,
         Field(
             description="defines the Rabbit settings for the primary instance (may be disabled)",

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

@@ -106,7 +106,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_SETTINGS, show_secrets=True)) if app_settings.CLUSTERS_KEEPER_PRIMARY_EC2_INSTANCES.PRIMARY_EC2_INSTANCES_RABBIT_SETTINGS else 'null'}",
+        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'}",
     ]
 
 

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

@@ -238,7 +238,7 @@ def test_rabbitmq_settings_are_passed_with_pasword_clear(
     assert app_settings.CLUSTERS_KEEPER_PRIMARY_EC2_INSTANCES
     assert (
         rabbitmq_settings_fixture
-        == app_settings.CLUSTERS_KEEPER_PRIMARY_EC2_INSTANCES.PRIMARY_EC2_INSTANCES_RABBIT_SETTINGS
+        == app_settings.CLUSTERS_KEEPER_PRIMARY_EC2_INSTANCES.PRIMARY_EC2_INSTANCES_RABBIT
     )
 
     additional_custom_tags = {