add list and improving warm buffers

Author: sanderegg

packages/aws-library/src/aws_library/ec2/_client.py

@@ -174,7 +174,7 @@ async def launch_instances(
                     {
                         "AssociatePublicIpAddress": True,
                         "DeviceIndex": 0,
-                        "SubnetId": instance_config.subnet_id,
+                        "SubnetId": instance_config.subnet_ids,
                         "Groups": instance_config.security_group_ids,
                     }
                 ],

packages/aws-library/src/aws_library/ec2/_models.py

@@ -134,7 +134,7 @@ class EC2InstanceConfig:
     ami_id: str
     key_name: str
     security_group_ids: list[str]
-    subnet_id: str
+    subnet_ids: list[str]
     iam_instance_profile: str
 
 

packages/aws-library/tests/test_ec2_client.py

@@ -97,7 +97,7 @@ def ec2_instance_config(
         ami_id=aws_ami_id,
         key_name=faker.pystr(),
         security_group_ids=[aws_security_group_id],
-        subnet_id=aws_subnet_id,
+        subnet_ids=aws_subnet_id,
         iam_instance_profile="",
     )
 

services/autoscaling/src/simcore_service_autoscaling/modules/cluster_scaling/_auto_scaling_core.py

@@ -816,7 +816,7 @@ async def _launch_instances(
                     ].ami_id,
                     key_name=app_settings.AUTOSCALING_EC2_INSTANCES.EC2_INSTANCES_KEY_NAME,
                     security_group_ids=app_settings.AUTOSCALING_EC2_INSTANCES.EC2_INSTANCES_SECURITY_GROUP_IDS,
-                    subnet_id=app_settings.AUTOSCALING_EC2_INSTANCES.EC2_INSTANCES_SUBNET_ID,
+                    subnet_ids=app_settings.AUTOSCALING_EC2_INSTANCES.EC2_INSTANCES_SUBNET_ID,
                     iam_instance_profile=app_settings.AUTOSCALING_EC2_INSTANCES.EC2_INSTANCES_ATTACHED_IAM_PROFILE,
                 ),
                 min_number_of_instances=1,  # NOTE: we want at least 1 if possible

services/autoscaling/src/simcore_service_autoscaling/modules/cluster_scaling/_warm_buffer_machines_pool_core.py

@@ -311,10 +311,10 @@ async def _add_remove_buffer_instances(
                 ami_id=ec2_boot_specific.ami_id,
                 key_name=app_settings.AUTOSCALING_EC2_INSTANCES.EC2_INSTANCES_KEY_NAME,
                 security_group_ids=app_settings.AUTOSCALING_EC2_INSTANCES.EC2_INSTANCES_SECURITY_GROUP_IDS,
-                subnet_id=app_settings.AUTOSCALING_EC2_INSTANCES.EC2_INSTANCES_SUBNET_ID,
+                subnet_ids=app_settings.AUTOSCALING_EC2_INSTANCES.EC2_INSTANCES_SUBNET_ID,
                 iam_instance_profile=app_settings.AUTOSCALING_EC2_INSTANCES.EC2_INSTANCES_ATTACHED_IAM_PROFILE,
             ),
-            min_number_of_instances=num_to_start,
+            min_number_of_instances=1,  # NOTE: we want at least 1
             number_of_instances=num_to_start,
             max_total_number_of_instances=app_settings.AUTOSCALING_EC2_INSTANCES.EC2_INSTANCES_MAX_INSTANCES,
         )

services/autoscaling/tests/unit/test_modules_ec2.py

@@ -51,7 +51,7 @@ def _(instance_type: InstanceTypeType) -> EC2InstanceConfig:
             ami_id=aws_ami_id,
             key_name=faker.pystr(),
             security_group_ids=[aws_security_group_id],
-            subnet_id=aws_subnet_id,
+            subnet_ids=aws_subnet_id,
             iam_instance_profile="",
         )
 

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

@@ -46,10 +46,10 @@ async def _get_primary_ec2_params(
             app_settings.CLUSTERS_KEEPER_PRIMARY_EC2_INSTANCES.PRIMARY_EC2_INSTANCES_ALLOWED_TYPES.items()
         )
     )
-    ec2_instance_types: list[
-        EC2InstanceType
-    ] = await ec2_client.get_ec2_instance_capabilities(
-        instance_type_names={ec2_type_name}
+    ec2_instance_types: list[EC2InstanceType] = (
+        await ec2_client.get_ec2_instance_capabilities(
+            instance_type_names={ec2_type_name}
+        )
     )
     assert ec2_instance_types  # nosec
     assert len(ec2_instance_types) == 1  # nosec
@@ -77,7 +77,7 @@ async def create_cluster(
         ami_id=ec2_instance_boot_specs.ami_id,
         key_name=app_settings.CLUSTERS_KEEPER_PRIMARY_EC2_INSTANCES.PRIMARY_EC2_INSTANCES_KEY_NAME,
         security_group_ids=app_settings.CLUSTERS_KEEPER_PRIMARY_EC2_INSTANCES.PRIMARY_EC2_INSTANCES_SECURITY_GROUP_IDS,
-        subnet_id=app_settings.CLUSTERS_KEEPER_PRIMARY_EC2_INSTANCES.PRIMARY_EC2_INSTANCES_SUBNET_ID,
+        subnet_ids=app_settings.CLUSTERS_KEEPER_PRIMARY_EC2_INSTANCES.PRIMARY_EC2_INSTANCES_SUBNET_ID,
         iam_instance_profile=app_settings.CLUSTERS_KEEPER_PRIMARY_EC2_INSTANCES.PRIMARY_EC2_INSTANCES_ATTACHED_IAM_PROFILE,
     )
     new_ec2_instance_data: list[EC2InstanceData] = await ec2_client.launch_instances(