Remove alpha dependency from CDK. Fix package creation

Author: Michal Ploski

Makefile

@@ -25,7 +25,7 @@ unit-test:
 	poetry run pytest tests/unit
 
 e2e-test:
-	poetry run pytest -n 3 --dist loadscope -rP --durations=0 --durations-min=1 tests/e2e
+	poetry run pytest -n 3 --dist loadscope --durations=0 --durations-min=1 tests/e2e
 
 coverage-html:
 	poetry run pytest -m "not (perf or e2e)" --cov=aws_lambda_powertools --cov-report=html

poetry.lock

@@ -31,7 +31,6 @@ python = "^3.6.2"
 # 2022-04-21: jmespath was removed, to be re-added once we drop python 3.6.
 # issue #1148
 aws-cdk-lib = "^2.23.0"
-"aws-cdk.aws-lambda-python-alpha" = "2.23.0-alpha.0"
 bandit = "^1.7.1"
 black = "^21.12b0"
 coverage = {extras = ["toml"], version = "^6.2"}

pyproject.toml

@@ -1,13 +1,23 @@
 import datetime
 import uuid
+from typing import Generator, TypedDict
 
 import pytest
+from e2e.utils import helpers, infrastructure
 
-from tests.e2e.utils import helpers, infrastructure
+
+class LambdaConfig(TypedDict):
+    parameters: dict
+    environment_variables: dict[str, str]
+
+
+class LambdaExecution(TypedDict):
+    arns: dict[str, str]
+    execution_time: datetime.datetime
 
 
 @pytest.fixture(scope="module")
-def execute_lambda(config, request):
+def execute_lambda(config, request) -> Generator[LambdaExecution, None, None]:
     stack_name = f"test-lambda-{uuid.uuid4()}"
     test_dir = request.fspath.dirname
     handlers_dir = f"{test_dir}/handlers/"
@@ -24,8 +34,6 @@ def execute_lambda(config, request):
 
     for name, arn in lambda_arns.items():
         helpers.trigger_lambda(lambda_arn=arn, client=infra.lambda_client)
-        print(f"lambda {name} triggered")
-
     yield {"arns": lambda_arns, "execution_time": execution_time}
     # Ensure stack deletion is triggered at the end of the test session
     infra.delete()

tests/e2e/conftest.py

@@ -1,11 +1,14 @@
+from typing import TypedDict
+
 import boto3
 import pytest
 
+from .. import conftest
 from ..utils import helpers
 
 
 @pytest.fixture(scope="module")
-def config():
+def config() -> conftest.LambdaConfig:
     return {
         "parameters": {},
         "environment_variables": {
@@ -17,15 +20,15 @@ def config():
 
 
 @pytest.mark.e2e
-def test_basic_lambda_logs_visible(execute_lambda, config):
+def test_basic_lambda_logs_visible(execute_lambda: conftest.LambdaExecution, config: conftest.LambdaConfig):
     # GIVEN
     lambda_arn = execute_lambda["arns"]["basichandlerarn"]
     timestamp = int(execute_lambda["execution_time"].timestamp() * 1000)
     cw_client = boto3.client("logs")
 
     # WHEN
     filtered_logs = helpers.get_logs(
-        lambda_function_name=lambda_arn.split(":")[-1], start_time=timestamp, log_client=cw_client
+        lambda_function_name=lambda_arn.split(":")[-1], start_time=timestamp, log_client=cw_client, run="first"
     )
 
     # THEN
@@ -37,7 +40,7 @@ def test_basic_lambda_logs_visible(execute_lambda, config):
 
 
 @pytest.mark.e2e
-def test_basic_lambda_no_debug_logs_visible(execute_lambda, config):
+def test_basic_lambda_no_debug_logs_visible(execute_lambda: conftest.LambdaExecution, config: conftest.LambdaConfig):
     # GIVEN
     lambda_arn = execute_lambda["arns"]["basichandlerarn"]
     timestamp = int(execute_lambda["execution_time"].timestamp() * 1000)
@@ -55,7 +58,7 @@ def test_basic_lambda_no_debug_logs_visible(execute_lambda, config):
 
 
 @pytest.mark.e2e
-def test_basic_lambda_contextual_data_logged(execute_lambda):
+def test_basic_lambda_contextual_data_logged(execute_lambda: conftest.LambdaExecution):
     # GIVEN
     lambda_arn = execute_lambda["arns"]["basichandlerarn"]
     timestamp = int(execute_lambda["execution_time"].timestamp() * 1000)
@@ -79,9 +82,10 @@ def test_basic_lambda_contextual_data_logged(execute_lambda):
 
 
 @pytest.mark.e2e
-def test_basic_lambda_additional_key_persistence_basic_lambda(execute_lambda, config):
+def test_basic_lambda_additional_key_persistence_basic_lambda(
+    execute_lambda: conftest.LambdaExecution, config: conftest.LambdaConfig
+):
     # GIVEN
-
     lambda_arn = execute_lambda["arns"]["basichandlerarn"]
     timestamp = int(execute_lambda["execution_time"].timestamp() * 1000)
     cw_client = boto3.client("logs")
@@ -101,7 +105,7 @@ def test_basic_lambda_additional_key_persistence_basic_lambda(execute_lambda, co
 
 
 @pytest.mark.e2e
-def test_basic_lambda_empty_event_logged(execute_lambda):
+def test_basic_lambda_empty_event_logged(execute_lambda: conftest.LambdaExecution):
 
     # GIVEN
     lambda_arn = execute_lambda["arns"]["basichandlerarn"]
@@ -118,7 +122,7 @@ def test_basic_lambda_empty_event_logged(execute_lambda):
 
 
 @pytest.mark.e2e
-def test_no_context_lambda_contextual_data_not_logged(execute_lambda):
+def test_no_context_lambda_contextual_data_not_logged(execute_lambda: conftest.LambdaExecution):
 
     # GIVEN
     lambda_arn = execute_lambda["arns"]["nocontexthandlerarn"]
@@ -145,7 +149,7 @@ def test_no_context_lambda_contextual_data_not_logged(execute_lambda):
 
 
 @pytest.mark.e2e
-def test_no_context_lambda_event_not_logged(execute_lambda):
+def test_no_context_lambda_event_not_logged(execute_lambda: conftest.LambdaExecution):
 
     # GIVEN
     lambda_arn = execute_lambda["arns"]["nocontexthandlerarn"]

tests/e2e/logger/test_logger.py

@@ -4,11 +4,12 @@
 import boto3
 import pytest
 
+from .. import conftest
 from ..utils import helpers
 
 
 @pytest.fixture(scope="module")
-def config():
+def config() -> conftest.LambdaConfig:
     return {
         "parameters": {},
         "environment_variables": {
@@ -20,7 +21,7 @@ def config():
 
 
 @pytest.mark.e2e
-def test_basic_lambda_metric_visible(execute_lambda, config):
+def test_basic_lambda_metric_visible(execute_lambda: conftest.LambdaExecution, config: conftest.LambdaConfig):
     start_date = execute_lambda["execution_time"]
     end_date = start_date + datetime.timedelta(minutes=5)
 

tests/e2e/metrics/test_metrics.py

@@ -5,6 +5,7 @@
 import boto3
 import pytest
 
+from .. import conftest
 from ..utils import helpers
 
 
@@ -17,7 +18,7 @@ def config():
 
 
 @pytest.mark.e2e
-def test_basic_lambda_trace_visible(execute_lambda, config):
+def test_basic_lambda_trace_visible(execute_lambda: conftest.LambdaExecution, config: conftest.LambdaConfig):
     lambda_arn = execute_lambda["arns"]["basichandlerarn"]
     start_date = execute_lambda["execution_time"]
     end_date = start_date + datetime.timedelta(minutes=5)

tests/e2e/tracer/test_tracer.py

@@ -0,0 +1,14 @@
+# The correct AWS SAM build image based on the runtime of the function will be
+# passed as build arg. The default allows to do `docker build .` when testing.
+ARG IMAGE=public.ecr.aws/sam/build-python3.7
+FROM $IMAGE
+
+ARG PIP_INDEX_URL
+ARG PIP_EXTRA_INDEX_URL
+ARG HTTPS_PROXY
+
+# Upgrade pip (required by cryptography v3.4 and above, which is a dependency of poetry)
+RUN pip install --upgrade pip
+RUN pip install pipenv poetry
+
+CMD [ "python" ]

tests/e2e/utils/Dockerfile

@@ -1,4 +1,5 @@
 import json
+from datetime import datetime
 from functools import lru_cache
 from typing import Any, Optional, Union
 
@@ -22,14 +23,14 @@ class Log(BaseModel):
     extra_info: Optional[str]
 
 
-def trigger_lambda(lambda_arn, client):
+def trigger_lambda(lambda_arn: str, client: Any):
     response = client.invoke(FunctionName=lambda_arn, InvocationType="RequestResponse")
     return response
 
 
 @lru_cache(maxsize=10, typed=False)
 @retry(ValueError, delay=1, jitter=1, tries=10)
-def get_logs(lambda_function_name: str, log_client: Any, start_time: int, **kwargs):
+def get_logs(lambda_function_name: str, log_client: Any, start_time: int, **kwargs: dict):
     response = log_client.filter_log_events(logGroupName=f"/aws/lambda/{lambda_function_name}", startTime=start_time)
     if not response["events"]:
         raise ValueError("Empty response from Cloudwatch Logs. Repeating...")
@@ -46,7 +47,9 @@ def get_logs(lambda_function_name: str, log_client: Any, start_time: int, **kwar
 
 @lru_cache(maxsize=10, typed=False)
 @retry(ValueError, delay=1, jitter=1, tries=10)
-def get_metrics(namespace, cw_client, start_date, end_date, metric_name, service_name):
+def get_metrics(
+    namespace: str, cw_client: Any, start_date: datetime, end_date: datetime, metric_name: str, service_name: str
+):
     response = cw_client.get_metric_data(
         MetricDataQueries=[
             {
@@ -73,7 +76,7 @@ def get_metrics(namespace, cw_client, start_date, end_date, metric_name, service
 
 
 @retry(ValueError, delay=1, jitter=1, tries=10)
-def get_traces(lambda_function_name: str, xray_client, start_date, end_date):
+def get_traces(lambda_function_name: str, xray_client: Any, start_date: datetime, end_date: datetime):
     paginator = xray_client.get_paginator("get_trace_summaries")
     response_iterator = paginator.paginate(
         StartTime=start_date,