feat: move logger to new infrastructure

Author: heitorlessa

tests/e2e/logger/conftest.py

@@ -0,0 +1,25 @@
+import pytest
+
+from tests.e2e.logger.infrastructure import LoggerStack
+from tests.e2e.utils.infrastructure import deploy_once
+
+
+@pytest.fixture(autouse=True, scope="module")
+def infrastructure(request: pytest.FixtureRequest, tmp_path_factory: pytest.TempPathFactory, worker_id: str):
+    """Setup and teardown logic for E2E test infrastructure
+
+    Parameters
+    ----------
+    request : pytest.FixtureRequest
+        pytest request fixture to introspect absolute path to test being executed
+    tmp_path_factory : pytest.TempPathFactory
+        pytest temporary path factory to discover shared tmp when multiple CPU processes are spun up
+    worker_id : str
+        pytest-xdist worker identification to detect whether parallelization is enabled
+
+    Yields
+    ------
+    Dict[str, str]
+        CloudFormation Outputs from deployed infrastructure
+    """
+    yield from deploy_once(stack=LoggerStack, request=request, tmp_path_factory=tmp_path_factory, worker_id=worker_id)

tests/e2e/logger/handlers/no_context_handler.py

@@ -0,0 +1,19 @@
+from pathlib import Path
+
+from tests.e2e.utils.infrastructure import BaseInfrastructureV2
+
+
+class LoggerStack(BaseInfrastructureV2):
+    LOG_MESSAGE: str = "logger message test"
+    LOG_LEVEL: str = "INFO"
+
+    def __init__(self, handlers_dir: Path, feature_name: str = "logger") -> None:
+        super().__init__(feature_name, handlers_dir)
+
+    def create_resources(self):
+        env_vars = {
+            "MESSAGE": self.LOG_MESSAGE,
+            "LOG_LEVEL": self.LOG_LEVEL,
+            "ADDITIONAL_KEY": "extra_info",
+        }
+        self.create_lambda_functions(function_props={"environment": env_vars})

tests/e2e/logger/infrastructure.py

@@ -1,58 +1,22 @@
 import boto3
 import pytest
-from e2e import conftest
 
 from tests.e2e.utils import data_fetcher
 
 
-@pytest.fixture(scope="module")
-def config() -> conftest.LambdaConfig:
-    return {
-        "parameters": {},
-        "environment_variables": {
-            "MESSAGE": "logger message test",
-            "LOG_LEVEL": "INFO",
-            "ADDITIONAL_KEY": "extra_info",
-        },
-    }
+@pytest.fixture
+def basic_handler_fn(infrastructure: dict) -> str:
+    return infrastructure.get("BasicHandler", "")
 
 
-def test_basic_lambda_logs_visible(execute_lambda: conftest.InfrastructureOutput, config: conftest.LambdaConfig):
-    # GIVEN
-    lambda_name = execute_lambda.get_lambda_function_name(cf_output_name="basichandlerarn")
-    timestamp = execute_lambda.get_lambda_execution_time_timestamp()
-    cw_client = boto3.client("logs")
-
-    # WHEN
-    filtered_logs = data_fetcher.get_logs(lambda_function_name=lambda_name, start_time=timestamp, log_client=cw_client)
+@pytest.fixture
+def basic_handler_fn_arn(infrastructure: dict) -> str:
+    return infrastructure.get("BasicHandlerArn", "")
 
-    # THEN
-    assert any(
-        log.message == config["environment_variables"]["MESSAGE"]
-        and log.level == config["environment_variables"]["LOG_LEVEL"]
-        for log in filtered_logs
-    )
 
-
-def test_basic_lambda_no_debug_logs_visible(
-    execute_lambda: conftest.InfrastructureOutput, config: conftest.LambdaConfig
-):
+def test_basic_lambda_logs_visible(basic_handler_fn, basic_handler_fn_arn):
     # GIVEN
-    lambda_name = execute_lambda.get_lambda_function_name(cf_output_name="basichandlerarn")
-    timestamp = execute_lambda.get_lambda_execution_time_timestamp()
     cw_client = boto3.client("logs")
-
-    # WHEN
-    filtered_logs = data_fetcher.get_logs(lambda_function_name=lambda_name, start_time=timestamp, log_client=cw_client)
-
-    # THEN
-    assert not any(
-        log.message == config["environment_variables"]["MESSAGE"] and log.level == "DEBUG" for log in filtered_logs
-    )
-
-
-def test_basic_lambda_contextual_data_logged(execute_lambda: conftest.InfrastructureOutput):
-    # GIVEN
     required_keys = (
         "xray_trace_id",
         "function_request_id",
@@ -62,82 +26,11 @@ def test_basic_lambda_contextual_data_logged(execute_lambda: conftest.Infrastruc
         "cold_start",
     )
 
-    lambda_name = execute_lambda.get_lambda_function_name(cf_output_name="basichandlerarn")
-    timestamp = execute_lambda.get_lambda_execution_time_timestamp()
-    cw_client = boto3.client("logs")
-
     # WHEN
-    filtered_logs = data_fetcher.get_logs(lambda_function_name=lambda_name, start_time=timestamp, log_client=cw_client)
-
-    # THEN
-    assert all(keys in logs.dict(exclude_unset=True) for logs in filtered_logs for keys in required_keys)
-
-
-def test_basic_lambda_additional_key_persistence_basic_lambda(
-    execute_lambda: conftest.InfrastructureOutput, config: conftest.LambdaConfig
-):
-    # GIVEN
-    lambda_name = execute_lambda.get_lambda_function_name(cf_output_name="basichandlerarn")
-    timestamp = execute_lambda.get_lambda_execution_time_timestamp()
-    cw_client = boto3.client("logs")
-
-    # WHEN
-    filtered_logs = data_fetcher.get_logs(lambda_function_name=lambda_name, start_time=timestamp, log_client=cw_client)
-
-    # THEN
-    assert any(
-        log.extra_info
-        and log.message == config["environment_variables"]["MESSAGE"]
-        and log.level == config["environment_variables"]["LOG_LEVEL"]
-        for log in filtered_logs
+    _, execution_time = data_fetcher.get_lambda_response(lambda_arn=basic_handler_fn_arn)
+    filtered_logs = data_fetcher.get_logs(
+        lambda_function_name=basic_handler_fn, start_time=int(execution_time.timestamp()), log_client=cw_client
     )
 
-
-def test_basic_lambda_empty_event_logged(execute_lambda: conftest.InfrastructureOutput):
-
-    # GIVEN
-    lambda_name = execute_lambda.get_lambda_function_name(cf_output_name="basichandlerarn")
-    timestamp = execute_lambda.get_lambda_execution_time_timestamp()
-    cw_client = boto3.client("logs")
-
-    # WHEN
-    filtered_logs = data_fetcher.get_logs(lambda_function_name=lambda_name, start_time=timestamp, log_client=cw_client)
-
-    # THEN
-    assert any(log.message == {} for log in filtered_logs)
-
-
-def test_no_context_lambda_contextual_data_not_logged(execute_lambda: conftest.InfrastructureOutput):
-
-    # GIVEN
-    required_missing_keys = (
-        "function_request_id",
-        "function_arn",
-        "function_memory_size",
-        "function_name",
-        "cold_start",
-    )
-
-    lambda_name = execute_lambda.get_lambda_function_name(cf_output_name="nocontexthandlerarn")
-    timestamp = execute_lambda.get_lambda_execution_time_timestamp()
-    cw_client = boto3.client("logs")
-
-    # WHEN
-    filtered_logs = data_fetcher.get_logs(lambda_function_name=lambda_name, start_time=timestamp, log_client=cw_client)
-
     # THEN
-    assert not any(keys in logs.dict(exclude_unset=True) for logs in filtered_logs for keys in required_missing_keys)
-
-
-def test_no_context_lambda_event_not_logged(execute_lambda: conftest.InfrastructureOutput):
-
-    # GIVEN
-    lambda_name = execute_lambda.get_lambda_function_name(cf_output_name="nocontexthandlerarn")
-    timestamp = execute_lambda.get_lambda_execution_time_timestamp()
-    cw_client = boto3.client("logs")
-
-    # WHEN
-    filtered_logs = data_fetcher.get_logs(lambda_function_name=lambda_name, start_time=timestamp, log_client=cw_client)
-
-    # THEN
-    assert not any(log.message == {} for log in filtered_logs)
+    assert all(keys in logs.dict(exclude_unset=True) for logs in filtered_logs for keys in required_keys)