import

Author: sanderegg

services/autoscaling/src/simcore_service_autoscaling/modules/auto_scaling_core.py

@@ -14,18 +14,18 @@
     EC2Tags,
     Resources,
 )
+from aws_library.ec2._errors import (
+    EC2InstanceNotFoundError,
+    EC2InstanceTypeInvalidError,
+    EC2TooManyInstancesError,
+)
 from fastapi import FastAPI
 from models_library.generated_models.docker_rest_api import Node, NodeState
 from servicelib.logging_utils import log_catch, log_context
 from servicelib.utils_formatting import timedelta_as_minute_second
 from types_aiobotocore_ec2.literals import InstanceTypeType
 
-from ..core.errors import (
-    Ec2InstanceInvalidError,
-    Ec2InstanceNotFoundError,
-    Ec2InvalidDnsNameError,
-    Ec2TooManyInstancesError,
-)
+from ..core.errors import Ec2InvalidDnsNameError
 from ..core.settings import ApplicationSettings, get_application_settings
 from ..models import (
     AssignedTasksToInstanceType,
@@ -497,13 +497,13 @@ async def _find_needed_instances(
                             - task_required_resources,
                         )
                     )
-            except Ec2InstanceNotFoundError:
+            except EC2InstanceNotFoundError:
                 _logger.exception(
                     "Task %s needs more resources than any EC2 instance "
                     "can provide with the current configuration. Please check!",
                     f"{task}",
                 )
-            except Ec2InstanceInvalidError:
+            except EC2InstanceTypeInvalidError:
                 _logger.exception("Unexpected error:")
 
     _logger.info(
@@ -568,7 +568,7 @@ async def _cap_needed_instances(
         >= app_settings.AUTOSCALING_EC2_INSTANCES.EC2_INSTANCES_MAX_INSTANCES
     ):
         # ok that is already too much
-        raise Ec2TooManyInstancesError(
+        raise EC2TooManyInstancesError(
             num_instances=app_settings.AUTOSCALING_EC2_INSTANCES.EC2_INSTANCES_MAX_INSTANCES
         )
 

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

@@ -10,14 +10,14 @@
 import arrow
 import pytest
 from aws_library.ec2 import EC2InstanceData
+from aws_library.ec2._errors import EC2InstanceNotFoundError
 from faker import Faker
 from fastapi import FastAPI
 from models_library.users import UserID
 from models_library.wallets import WalletID
 from parse import Result, search
 from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict
 from simcore_service_clusters_keeper._meta import VERSION as APP_VERSION
-from simcore_service_clusters_keeper.core.errors import Ec2InstanceNotFoundError
 from simcore_service_clusters_keeper.core.settings import (
     ApplicationSettings,
     get_application_settings,
@@ -155,7 +155,7 @@ async def test_get_cluster_raises_if_not_found(
     wallet_id: WalletID,
     initialized_app: FastAPI,
 ):
-    with pytest.raises(Ec2InstanceNotFoundError):
+    with pytest.raises(EC2InstanceNotFoundError):
         await get_cluster(initialized_app, user_id=user_id, wallet_id=wallet_id)