fix code

Author: sanderegg

services/autoscaling/src/simcore_service_autoscaling/utils/warm_buffer_machines.py

@@ -94,7 +94,7 @@ def list_pre_pulled_images_tag_keys(tags: EC2Tags) -> list[AWSTagKey]:
     return [
         TypeAdapter(AWSTagKey).validate_python(key)
         for key in tags
-        if PRE_PULLED_IMAGES_RE.match(key)
+        if PRE_PULLED_IMAGES_EC2_TAG_KEY in key
     ]
 
 

services/autoscaling/tests/unit/test_utils_warm_buffer_machines.py

@@ -25,6 +25,7 @@
     get_activated_warm_buffer_ec2_tags,
     get_deactivated_warm_buffer_ec2_tags,
     is_warm_buffer_machine,
+    list_pre_pulled_images_tag_keys,
     load_pre_pulled_images_from_tags,
 )
 
@@ -174,3 +175,53 @@ def test_dump_load_pre_pulled_images_as_tags(
 
 def test_load_pre_pulled_images_as_tags_no_tag_present_returns_empty_list(faker: Faker):
     assert load_pre_pulled_images_from_tags(faker.pydict(allowed_types=(str,))) == []
+
+
+@pytest.mark.parametrize(
+    "images, expected_tags",
+    [
+        pytest.param(
+            [
+                "itisfoundation/dynamic-sidecar:latest",
+                "itisfoundation/agent:latest",
+                "registry.pytest.com/simcore/services/dynamic/ti-postpro:2.0.34",
+                "registry.pytest.com/simcore/services/dynamic/ti-simu:1.0.12",
+                "registry.pytest.com/simcore/services/dynamic/ti-pers:1.0.19",
+                "registry.pytest.com/simcore/services/dynamic/sim4life-postpro:2.0.106",
+                "registry.pytest.com/simcore/services/dynamic/s4l-core-postpro:2.0.106",
+                "registry.pytest.com/simcore/services/dynamic/s4l-core-stream:2.0.106",
+                "registry.pytest.com/simcore/services/dynamic/sym-server-8-0-0-dy:2.0.106",
+                "registry.pytest.com/simcore/services/dynamic/sim4life-8-0-0-modeling:3.2.34",
+                "registry.pytest.com/simcore/services/dynamic/s4l-core-8-0-0-modeling:3.2.34",
+                "registry.pytest.com/simcore/services/dynamic/s4l-stream-8-0-0-dy:3.2.34",
+                "registry.pytest.com/simcore/services/dynamic/sym-server-8-0-0-dy:3.2.34",
+            ],
+            {
+                f"{PRE_PULLED_IMAGES_EC2_TAG_KEY}_0": '["itisfoundation/dynamic-sidecar:latest","itisfoundation/agent:latest","registry.pytest.com/simcore/services/dynamic/ti-postpro:2.0.34","registry.pytest.com/simcore/services/dynamic/ti-simu:1.0.12","registry.pytest.com/simcore/services/dynamic/ti-pers:1.0.',
+                f"{PRE_PULLED_IMAGES_EC2_TAG_KEY}_1": '19","registry.pytest.com/simcore/services/dynamic/sim4life-postpro:2.0.106","registry.pytest.com/simcore/services/dynamic/s4l-core-postpro:2.0.106","registry.pytest.com/simcore/services/dynamic/s4l-core-stream:2.0.106","registry.pytest.com/simcore/services',
+                f"{PRE_PULLED_IMAGES_EC2_TAG_KEY}_2": '/dynamic/sym-server-8-0-0-dy:2.0.106","registry.pytest.com/simcore/services/dynamic/sim4life-8-0-0-modeling:3.2.34","registry.pytest.com/simcore/services/dynamic/s4l-core-8-0-0-modeling:3.2.34","registry.pytest.com/simcore/services/dynamic/s4l-stream-8-0-0',
+                f"{PRE_PULLED_IMAGES_EC2_TAG_KEY}_3": '-dy:3.2.34","registry.pytest.com/simcore/services/dynamic/sym-server-8-0-0-dy:3.2.34"]',
+            },
+            id="many images that get chunked to AWS Tag max length",
+        ),
+        pytest.param(
+            ["itisfoundation/dynamic-sidecar:latest", "itisfoundation/agent:latest"],
+            {
+                PRE_PULLED_IMAGES_EC2_TAG_KEY: '["itisfoundation/dynamic-sidecar:latest","itisfoundation/agent:latest"]'
+            },
+            id="<256 characters jsonized number of images does not get chunked",
+        ),
+        pytest.param(
+            [],
+            {PRE_PULLED_IMAGES_EC2_TAG_KEY: "[]"},
+            id="empty list",
+        ),
+    ],
+)
+def test_list_pre_pulled_images_tag_keys(
+    images: list[DockerGenericTag], expected_tags: EC2Tags
+):
+    assert dump_pre_pulled_images_as_tags(images) == expected_tags
+    assert list_pre_pulled_images_tag_keys(expected_tags) == sorted(
+        expected_tags.keys()
+    )