Merge branch 'develop' into ci-changelog-9577574922

Author: leandrodamascena

noxfile.py

@@ -50,9 +50,70 @@ def build_and_run_test(session: nox.Session, folders: List, extras: Optional[str
 def test_with_only_required_packages(session: nox.Session):
     """Tests that only depends for required libraries"""
     # Logger
+    # Metrics - Amazon CloudWatch EMF
+    # Metrics - Base provider
+    # Middleware factory without tracer
     build_and_run_test(
         session,
         folders=[
-            f"{PREFIX_TESTS_FUNCTIONAL}/logger/",
+            f"{PREFIX_TESTS_FUNCTIONAL}/logger/required_dependencies/",
+            f"{PREFIX_TESTS_FUNCTIONAL}/metrics/required_dependencies/",
+            f"{PREFIX_TESTS_FUNCTIONAL}/middleware_factory/required_dependencies/",
         ],
     )
+
+
+@nox.session()
+def test_with_datadog_as_required_package(session: nox.Session):
+    """Tests that depends on Datadog library"""
+    # Metrics - Datadog
+    build_and_run_test(
+        session,
+        folders=[
+            f"{PREFIX_TESTS_FUNCTIONAL}/metrics/datadog/",
+        ],
+        extras="datadog",
+    )
+
+
+@nox.session()
+def test_with_xray_sdk_as_required_package(session: nox.Session):
+    """Tests that depends on AWS XRAY SDK library"""
+    # Tracer
+    # Middleware factory with tracer
+    build_and_run_test(
+        session,
+        folders=[
+            f"{PREFIX_TESTS_FUNCTIONAL}/tracer/_aws_xray_sdk/",
+            f"{PREFIX_TESTS_FUNCTIONAL}/middleware_factory/_aws_xray_sdk/",
+        ],
+        extras="tracer",
+    )
+
+
+@nox.session()
+def test_with_boto3_sdk_as_required_package(session: nox.Session):
+    """Tests that depends on boto3/botocore library"""
+    # Parameters
+    # Feature Flags
+    build_and_run_test(
+        session,
+        folders=[
+            f"{PREFIX_TESTS_FUNCTIONAL}/parameters/_boto3/",
+            f"{PREFIX_TESTS_FUNCTIONAL}/feature_flags/_boto3/",
+        ],
+        extras="aws-sdk",
+    )
+
+
+@nox.session()
+def test_with_fastjsonschema_as_required_package(session: nox.Session):
+    """Tests that depends on boto3/botocore library"""
+    # Validation
+    build_and_run_test(
+        session,
+        folders=[
+            f"{PREFIX_TESTS_FUNCTIONAL}/validator/_fastjsonschema/",
+        ],
+        extras="validation",
+    )

tests/functional/feature_flags/__init__.py renamed to tests/functional/feature_flags/_boto3/__init__.py

@@ -3,7 +3,6 @@
 from collections import namedtuple
 
 import pytest
-from test_metrics_provider import capture_metrics_output
 
 from aws_lambda_powertools.metrics.exceptions import MetricValueError, SchemaValidationError
 from aws_lambda_powertools.metrics.provider.cold_start import reset_cold_start_flag
@@ -40,7 +39,7 @@ def test_datadog_write_to_log_with_env_variable(capsys, monkeypatch):
     # WHEN we add a metric
     metrics.add_metric(name="item_sold", value=1, product="latte", order="online")
     metrics.flush_metrics()
-    logs = capture_metrics_output(capsys)
+    logs = json.loads(capsys.readouterr().out.strip())
 
     # THEN metrics is flushed to log
     logs["e"] = ""

tests/functional/feature_flags/test_feature_flags.py renamed to tests/functional/feature_flags/_boto3/test_feature_flags.py

@@ -0,0 +1,32 @@
+from aws_lambda_powertools.middleware_factory import lambda_handler_decorator
+
+
+def test_factory_explicit_tracing(monkeypatch):
+    monkeypatch.setenv("POWERTOOLS_TRACE_DISABLED", "true")
+
+    @lambda_handler_decorator(trace_execution=True)
+    def no_op(handler, event, context):
+        ret = handler(event, context)
+        return ret
+
+    @no_op
+    def lambda_handler(evt, ctx):
+        return True
+
+    lambda_handler({}, {})
+
+
+def test_factory_explicit_tracing_env_var(monkeypatch):
+    monkeypatch.setenv("POWERTOOLS_TRACE_MIDDLEWARES", "true")
+    monkeypatch.setenv("POWERTOOLS_TRACE_DISABLED", "true")
+
+    @lambda_handler_decorator
+    def no_op(handler, event, context):
+        ret = handler(event, context)
+        return ret
+
+    @no_op
+    def lambda_handler(evt, ctx):
+        return True
+
+    lambda_handler({}, {})

tests/functional/feature_flags/test_schema_validation.py renamed to tests/functional/feature_flags/_boto3/test_schema_validation.py

@@ -62,37 +62,6 @@ def lambda_handler(evt, ctx):
         lambda_handler({}, {})
 
 
-def test_factory_explicit_tracing(monkeypatch):
-    monkeypatch.setenv("POWERTOOLS_TRACE_DISABLED", "true")
-
-    @lambda_handler_decorator(trace_execution=True)
-    def no_op(handler, event, context):
-        ret = handler(event, context)
-        return ret
-
-    @no_op
-    def lambda_handler(evt, ctx):
-        return True
-
-    lambda_handler({}, {})
-
-
-def test_factory_explicit_tracing_env_var(monkeypatch):
-    monkeypatch.setenv("POWERTOOLS_TRACE_MIDDLEWARES", "true")
-    monkeypatch.setenv("POWERTOOLS_TRACE_DISABLED", "true")
-
-    @lambda_handler_decorator
-    def no_op(handler, event, context):
-        ret = handler(event, context)
-        return ret
-
-    @no_op
-    def lambda_handler(evt, ctx):
-        return True
-
-    lambda_handler({}, {})
-
-
 def test_factory_decorator_with_kwarg_params(capsys):
     @lambda_handler_decorator
     def log_event(handler, event, context, log_event=False):