sonar

Author: sanderegg

packages/pytest-simcore/src/pytest_simcore/helpers/autoscaling.py

@@ -39,7 +39,7 @@ def create_fake_association(
 ):
     fake_node_to_instance_map = {}
 
-    async def _fake_node_creator(
+    def _fake_node_creator(
         _nodes: list[Node], ec2_instances: list[EC2InstanceData]
     ) -> tuple[list[AssociatedInstance], list[EC2InstanceData]]:
         def _create_fake_node_with_labels(instance: EC2InstanceData) -> Node:

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

@@ -95,7 +95,7 @@ async def _analyze_current_cluster(
         state_names=["stopped"],
     )
 
-    attached_ec2s, pending_ec2s = await associate_ec2_instances_with_nodes(
+    attached_ec2s, pending_ec2s = associate_ec2_instances_with_nodes(
         docker_nodes, existing_ec2_instances
     )
 
@@ -339,10 +339,10 @@ async def _sorted_allowed_instance_types(app: FastAPI) -> list[EC2InstanceType]:
         allowed_instance_type_names
     ), "EC2_INSTANCES_ALLOWED_TYPES cannot be empty!"
 
-    allowed_instance_types: list[EC2InstanceType] = (
-        await ec2_client.get_ec2_instance_capabilities(
-            cast(set[InstanceTypeType], set(allowed_instance_type_names))
-        )
+    allowed_instance_types: list[
+        EC2InstanceType
+    ] = await ec2_client.get_ec2_instance_capabilities(
+        cast(set[InstanceTypeType], set(allowed_instance_type_names))
     )
 
     def _as_selection(instance_type: EC2InstanceType) -> int:
@@ -949,7 +949,7 @@ async def _deactivate_empty_nodes(app: FastAPI, cluster: Cluster) -> Cluster:
     )
 
 
-async def _find_terminateable_instances(
+def _find_terminateable_instances(
     app: FastAPI, cluster: Cluster
 ) -> list[AssociatedInstance]:
     app_settings: ApplicationSettings = app.state.settings
@@ -994,7 +994,7 @@ async def _try_scale_down_cluster(app: FastAPI, cluster: Cluster) -> Cluster:
     assert app_settings.AUTOSCALING_EC2_INSTANCES  # nosec
     # instances found to be terminateable will now start the termination process.
     new_terminating_instances = []
-    for instance in await _find_terminateable_instances(app, cluster):
+    for instance in _find_terminateable_instances(app, cluster):
         assert instance.node.description is not None  # nosec
         with (
             log_context(
@@ -1076,9 +1076,9 @@ async def _notify_based_on_machine_type(
     launch_time_to_tasks: dict[datetime.datetime, list] = collections.defaultdict(list)
     now = datetime.datetime.now(datetime.UTC)
     for instance in instances:
-        launch_time_to_tasks[
-            instance.ec2_instance.launch_time
-        ] += instance.assigned_tasks
+        launch_time_to_tasks[instance.ec2_instance.launch_time] += (
+            instance.assigned_tasks
+        )
 
     for launch_time, tasks in launch_time_to_tasks.items():
         time_since_launch = now - launch_time

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

@@ -23,7 +23,7 @@
 _logger = logging.getLogger(__name__)
 
 
-async def associate_ec2_instances_with_nodes(
+def associate_ec2_instances_with_nodes(
     nodes: list[Node], ec2_instances: list[EC2InstanceData]
 ) -> tuple[list[AssociatedInstance], list[EC2InstanceData]]:
     """returns the associated and non-associated instances"""

services/autoscaling/tests/unit/conftest.py

@@ -1074,8 +1074,8 @@ async def spied_cluster_analysis(mocker: MockerFixture) -> MockType:
 
 
 @pytest.fixture
-async def mocked_associate_ec2_instances_with_nodes(mocker: MockerFixture) -> mock.Mock:
-    async def _(
+def mocked_associate_ec2_instances_with_nodes(mocker: MockerFixture) -> mock.Mock:
+    def _(
         nodes: list[DockerNode], ec2_instances: list[EC2InstanceData]
     ) -> tuple[list[AssociatedInstance], list[EC2InstanceData]]:
         return [], ec2_instances

services/autoscaling/tests/unit/test_utils_cluster_scaling.py

@@ -69,7 +69,7 @@ async def test_associate_ec2_instances_with_nodes_with_no_correspondence(
     (
         associated_instances,
         non_associated_instances,
-    ) = await associate_ec2_instances_with_nodes(nodes, ec2_instances)
+    ) = associate_ec2_instances_with_nodes(nodes, ec2_instances)
 
     assert not associated_instances
     assert non_associated_instances
@@ -92,7 +92,7 @@ async def test_associate_ec2_instances_with_corresponding_nodes(
     (
         associated_instances,
         non_associated_instances,
-    ) = await associate_ec2_instances_with_nodes(nodes, ec2_instances)
+    ) = associate_ec2_instances_with_nodes(nodes, ec2_instances)
 
     assert associated_instances
     assert not non_associated_instances