fix: fix broken test (#700)

Author: ran-isenberg

cdk/my_service/api_construct.py

@@ -5,9 +5,9 @@
 from aws_cdk.aws_lambda_python_alpha import PythonLayerVersion
 from aws_cdk.aws_logs import RetentionDays
 from constructs import Construct
-from my_service.api_db_construct import ApiDbConstruct  # type: ignore
 
 import cdk.my_service.constants as constants
+from cdk.my_service.api_db_construct import ApiDbConstruct
 
 
 class ApiConstruct(Construct):

cdk/my_service/service_stack.py

@@ -5,8 +5,8 @@
 from cdk_nag import AwsSolutionsChecks, NagSuppressions
 from constructs import Construct
 from git import Repo
-from my_service.api_construct import ApiConstruct  # type: ignore
 
+from cdk.my_service.api_construct import ApiConstruct
 from cdk.my_service.configuration.configuration_construct import ConfigurationStore
 from cdk.my_service.constants import CONFIGURATION_NAME, ENVIRONMENT, SERVICE_NAME
 

poetry.lock

@@ -28,10 +28,10 @@ aws-lambda-env-modeler = "*"
 [tool.poetry.dev-dependencies]
 # CDK
 service-cdk = {path = "cdk", develop = true}
-aws-cdk-lib = ">=2.75.0"
+aws-cdk-lib = ">=2.88.0"
 constructs = ">=10.0.0"
 cdk-nag = ">2.0.0"
-"aws-cdk.aws-lambda-python-alpha" = "^2.75.0-alpha.0"
+"aws-cdk.aws-lambda-python-alpha" = "^2.88.0-alpha.0"
 # DEV
 pytest = "*"
 pytest-mock = "*"

pyproject.toml

@@ -1,9 +1,18 @@
-from abc import ABC, abstractmethod
+from abc import ABC, ABCMeta, abstractmethod
 
 from service.dal.schemas.db import OrderEntry
 
 
-class DalHandler(ABC):
+class _SingletonMeta(ABCMeta):
+    _instances: dict = {}
+
+    def __call__(cls, *args, **kwargs):
+        if cls not in cls._instances:
+            cls._instances[cls] = super(_SingletonMeta, cls).__call__(*args, **kwargs)
+        return cls._instances[cls]
+
+
+class DalHandler(ABC, metaclass=_SingletonMeta):
 
     @abstractmethod
     def create_order_in_db(self, customer_name: str, order_item_count: int) -> OrderEntry:

service/dal/db_handler.py

@@ -42,7 +42,7 @@ def create_order(event: Dict[str, Any], context: LambdaContext) -> Dict[str, Any
         # we want to extract and parse the HTTP body from the api gw envelope
         create_input: CreateOrderRequest = parse(event=event, model=CreateOrderRequest, envelope=ApiGatewayEnvelope)
         logger.info('got create order request', extra={'order_item_count': create_input.order_item_count})
-    except (ValidationError, TypeError) as exc:
+    except (ValidationError, TypeError) as exc:  # pragma: no cover
         logger.error('event failed input validation', extra={'error': str(exc)})
         return build_response(http_status=HTTPStatus.BAD_REQUEST, body={})
 

service/handlers/create_order.py

@@ -72,7 +72,8 @@ def test_handler_200_ok(mocker, table_name: str):
     assert response['Item']['order_item_count'] == order_item_count
 
 
-def test_internal_server_error():
+def test_internal_server_error(mocker):
+    mock_dynamic_configuration(mocker, MOCKED_SCHEMA)
     db_handler: DynamoDalHandler = DynamoDalHandler('table')
     table = db_handler._get_db_handler()
     stubber = Stubber(table.meta.client)
@@ -81,6 +82,8 @@ def test_internal_server_error():
     body = CreateOrderRequest(customer_name='RanTheBuilder', order_item_count=5)
     response = call_create_order(generate_api_gw_event(body.model_dump()))
     assert response['statusCode'] == HTTPStatus.INTERNAL_SERVER_ERROR
+    stubber.deactivate()
+    DynamoDalHandler._instances = {}
 
 
 def test_handler_bad_request(mocker):

tests/integration/test_create_order.py

@@ -13,3 +13,5 @@ def test_raise_exception():
     stubber.activate()
     with pytest.raises(InternalServerException):
         db_handler.create_order_in_db(customer_name='customer', order_item_count=5)
+    stubber.deactivate()
+    DynamoDalHandler._instances = {}