adds test

Author: pcrespov

services/autoscaling/src/simcore_service_autoscaling/core/settings.py

@@ -61,7 +61,7 @@ class EC2InstancesSettings(BaseCustomSettings):
     EC2_INSTANCES_ALLOWED_TYPES: dict[str, EC2InstanceBootSpecific] = Field(
         ...,
         description="Defines which EC2 instances are considered as candidates for new EC2 instance and their respective boot specific parameters"
-        "WARNING: if empty, all available ec2 instances are allowed",
+        "NOTE: minimum length >0",
     )
 
     EC2_INSTANCES_KEY_NAME: str = Field(
@@ -134,7 +134,7 @@ class EC2InstancesSettings(BaseCustomSettings):
 
     @validator("EC2_INSTANCES_TIME_BEFORE_DRAINING")
     @classmethod
-    def ensure_draining_delay_time_is_in_range(
+    def _ensure_draining_delay_time_is_in_range(
         cls, value: datetime.timedelta
     ) -> datetime.timedelta:
         if value < datetime.timedelta(seconds=10):
@@ -145,7 +145,7 @@ def ensure_draining_delay_time_is_in_range(
 
     @validator("EC2_INSTANCES_TIME_BEFORE_TERMINATION")
     @classmethod
-    def ensure_termination_delay_time_is_in_range(
+    def _ensure_termination_delay_time_is_in_range(
         cls, value: datetime.timedelta
     ) -> datetime.timedelta:
         if value < datetime.timedelta(minutes=0):
@@ -156,12 +156,18 @@ def ensure_termination_delay_time_is_in_range(
 
     @validator("EC2_INSTANCES_ALLOWED_TYPES")
     @classmethod
-    def check_valid_instance_names(
+    def _check_valid_instance_names_and_not_empty(
         cls, value: dict[str, EC2InstanceBootSpecific]
     ) -> dict[str, EC2InstanceBootSpecific]:
         # NOTE: needed because of a flaw in BaseCustomSettings
         # issubclass raises TypeError if used on Aliases
         parse_obj_as(list[InstanceTypeType], list(value))
+
+        if not value:
+            # NOTE: Field( ... , min_items=...) cannot be used to contraint number of iterms in a dict
+            msg = "At least one item expecte EC2_INSTANCES_ALLOWED_TYPES, got none"
+            raise ValueError(msg)
+
         return value
 
 
@@ -294,12 +300,12 @@ def LOG_LEVEL(self):  # noqa: N802
 
     @validator("AUTOSCALING_LOGLEVEL")
     @classmethod
-    def valid_log_level(cls, value: str) -> str:
+    def _valid_log_level(cls, value: str) -> str:
         return cls.validate_log_level(value)
 
     @root_validator()
     @classmethod
-    def exclude_both_dynamic_computational_mode(cls, values):
+    def _exclude_both_dynamic_computational_mode(cls, values):
         if (
             values.get("AUTOSCALING_DASK") is not None
             and values.get("AUTOSCALING_NODES_MONITORING") is not None

services/autoscaling/tests/unit/test_core_settings.py

@@ -132,12 +132,16 @@ def test_invalid_EC2_INSTANCES_TIME_BEFORE_TERMINATION(  # noqa: N802
     )
 
 
-def test_EC2_INSTANCES_ALLOWED_TYPES(  # noqa: N802
+def test_EC2_INSTANCES_ALLOWED_TYPES_valid(  # noqa: N802
     app_environment: EnvVarsDict, monkeypatch: pytest.MonkeyPatch, faker: Faker
 ):
     settings = ApplicationSettings.create_from_envs()
     assert settings.AUTOSCALING_EC2_INSTANCES
 
+
+def test_EC2_INSTANCES_ALLOWED_TYPES_passing_invalid_image_tags(  # noqa: N802
+    app_environment: EnvVarsDict, monkeypatch: pytest.MonkeyPatch, faker: Faker
+):
     # passing an invalid image tag name will fail
     setenvs_from_dict(
         monkeypatch,
@@ -155,6 +159,10 @@ def test_EC2_INSTANCES_ALLOWED_TYPES(  # noqa: N802
     with pytest.raises(ValidationError):
         ApplicationSettings.create_from_envs()
 
+
+def test_EC2_INSTANCES_ALLOWED_TYPES_passing_valid_image_tags(  # noqa: N802
+    app_environment: EnvVarsDict, monkeypatch: pytest.MonkeyPatch, faker: Faker
+):
     # passing a valid will pass
     setenvs_from_dict(
         monkeypatch,
@@ -176,14 +184,23 @@ def test_EC2_INSTANCES_ALLOWED_TYPES(  # noqa: N802
     )
     settings = ApplicationSettings.create_from_envs()
     assert settings.AUTOSCALING_EC2_INSTANCES
-    assert [
+    assert next(
+        iter(settings.AUTOSCALING_EC2_INSTANCES.EC2_INSTANCES_ALLOWED_TYPES.values())
+    ).pre_pull_images == [
         "nginx:latest",
         "itisfoundation/my-very-nice-service:latest",
         "simcore/services/dynamic/another-nice-one:2.4.5",
         "asd",
-    ] == next(
-        iter(settings.AUTOSCALING_EC2_INSTANCES.EC2_INSTANCES_ALLOWED_TYPES.values())
-    ).pre_pull_images
+    ]
+
+
+def test_EC2_INSTANCES_ALLOWED_TYPES_empty_not_allowed(  # noqa: N802
+    app_environment: EnvVarsDict, monkeypatch: pytest.MonkeyPatch
+):
+    monkeypatch.setenv("EC2_INSTANCES_ALLOWED_TYPES", "{}")
+
+    with pytest.raises(ValidationError):
+        ApplicationSettings.create_from_envs()
 
 
 def test_invalid_instance_names(