feat: simplify access to lambda layer arn

Author: heitorlessa

tests/e2e/conftest.py

@@ -3,6 +3,11 @@
 from tests.e2e.utils.infrastructure import LambdaLayerStack, deploy_once
 
 
+@pytest.fixture(scope="session")
+def lambda_layer_arn(lambda_layer_deployment):
+    yield lambda_layer_deployment.get("LayerArn")
+
+
 @pytest.fixture(scope="session")
 def lambda_layer_deployment(request: pytest.FixtureRequest, tmp_path_factory: pytest.TempPathFactory, worker_id: str):
     """Setup and teardown logic for E2E test infrastructure

tests/e2e/logger/conftest.py

@@ -6,30 +6,22 @@
 
 
 @pytest.fixture(autouse=True, scope="module")
-def infrastructure(
-    request: pytest.FixtureRequest,
-    tmp_path_factory: pytest.TempPathFactory,
-    worker_id: str,
-    lambda_layer_deployment: dict,
-):
+def infrastructure(request: pytest.FixtureRequest, lambda_layer_arn: 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
+    lambda_layer_arn : str
+        Lambda Layer ARN
 
     Yields
     ------
     Dict[str, str]
         CloudFormation Outputs from deployed infrastructure
     """
-    layer_arn = lambda_layer_deployment.get("LayerArn")
-    stack = LoggerStack(handlers_dir=Path(f"{request.path.parent}/handlers"), layer_arn=layer_arn)
+    stack = LoggerStack(handlers_dir=Path(f"{request.path.parent}/handlers"), layer_arn=lambda_layer_arn)
     try:
         yield stack.deploy()
     finally:

tests/e2e/metrics/conftest.py

@@ -6,30 +6,22 @@
 
 
 @pytest.fixture(autouse=True, scope="module")
-def infrastructure(
-    request: pytest.FixtureRequest,
-    tmp_path_factory: pytest.TempPathFactory,
-    worker_id: str,
-    lambda_layer_deployment: dict,
-):
+def infrastructure(request: pytest.FixtureRequest, lambda_layer_arn: 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
+    lambda_layer_arn : str
+        Lambda Layer ARN
 
     Yields
     ------
     Dict[str, str]
         CloudFormation Outputs from deployed infrastructure
     """
-    layer_arn = lambda_layer_deployment.get("LayerArn")
-    stack = MetricsStack(handlers_dir=Path(f"{request.path.parent}/handlers"), layer_arn=layer_arn)
+    stack = MetricsStack(handlers_dir=Path(f"{request.path.parent}/handlers"), layer_arn=lambda_layer_arn)
     try:
         yield stack.deploy()
     finally:

tests/e2e/tracer/conftest.py

@@ -6,30 +6,22 @@
 
 
 @pytest.fixture(autouse=True, scope="module")
-def infrastructure(
-    request: pytest.FixtureRequest,
-    tmp_path_factory: pytest.TempPathFactory,
-    worker_id: str,
-    lambda_layer_deployment: dict,
-):
+def infrastructure(request: pytest.FixtureRequest, lambda_layer_arn: 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
+    lambda_layer_arn : str
+        Lambda Layer ARN
 
     Yields
     ------
     Dict[str, str]
         CloudFormation Outputs from deployed infrastructure
     """
-    layer_arn = lambda_layer_deployment.get("LayerArn")
-    stack = TracerStack(handlers_dir=Path(f"{request.path.parent}/handlers"), layer_arn=layer_arn)
+    stack = TracerStack(handlers_dir=Path(f"{request.path.parent}/handlers"), layer_arn=lambda_layer_arn)
     try:
         yield stack.deploy()
     finally:

tests/e2e/utils/infrastructure.py

@@ -87,7 +87,10 @@ def create_lambda_functions(self, function_props: Optional[Dict] = None):
         source = Code.from_asset(f"{self.handlers_dir}")
         props_override = function_props or {}
         if not self.layer_arn:
-            self.layer_arn = LambdaLayerStack.get_lambda_layer_arn()
+            raise ValueError(
+                """Lambda Layer ARN cannot be empty when creating Lambda functions.
+                Make sure to inject `lambda_layer_arn` fixture and pass at the constructor level"""
+            )
 
         layer = LayerVersion.from_layer_version_arn(self.stack, "layer-arn", layer_version_arn=self.layer_arn)
 
@@ -305,14 +308,3 @@ def _create_layer(self) -> str:
             ),
         )
         return layer.layer_version_arn
-
-    @classmethod
-    def get_lambda_layer_arn(cls: "LambdaLayerStack") -> str:
-        """Lambda Layer deployed by LambdaLayer Stack
-
-        Returns
-        -------
-        str
-            Lambda Layer ARN
-        """
-        return cls.STACKS_OUTPUT.get(cls.FEATURE_NAME, {}).get("LayerArn")