Merge branch 'develop' into drop-python37

Author: leandrodamascena

CHANGELOG.md

@@ -4,32 +4,16 @@
 <a name="unreleased"></a>
 # Unreleased
 
-## Bug Fixes
-
-* **event-handler:** strip whitespace from Content-Type headers during OpenAPI schema validation ([#3677](https://github.com/aws-powertools/powertools-lambda-python/issues/3677))
-
-## Documentation
 
-* **metrics:** fix empty metric warning filter ([#3660](https://github.com/aws-powertools/powertools-lambda-python/issues/3660))
-* **proccess:** add versioning and maintenance policy ([#3682](https://github.com/aws-powertools/powertools-lambda-python/issues/3682))
-
-## Features
+<a name="v2.33.0"></a>
+## [v2.33.0] - 2024-02-02
+## Bug Fixes
 
-* **event_handler:** add support for multiValueQueryStringParameters in OpenAPI schema ([#3667](https://github.com/aws-powertools/powertools-lambda-python/issues/3667))
+* **data-masking:** fix and improve e2e tests for DataMasking ([#3695](https://github.com/aws-powertools/powertools-lambda-python/issues/3695))
 
 ## Maintenance
 
-* **deps:** bump codecov/codecov-action from 3.1.4 to 3.1.5 ([#3674](https://github.com/aws-powertools/powertools-lambda-python/issues/3674))
-* **deps:** bump squidfunk/mkdocs-material from `58eef6c` to `9aad7af` in /docs ([#3670](https://github.com/aws-powertools/powertools-lambda-python/issues/3670))
-* **deps:** bump squidfunk/mkdocs-material from `9aad7af` to `a4a2029` in /docs ([#3679](https://github.com/aws-powertools/powertools-lambda-python/issues/3679))
-* **deps:** bump the layer-balancer group in /layer/scripts/layer-balancer with 1 update ([#3665](https://github.com/aws-powertools/powertools-lambda-python/issues/3665))
-* **deps:** bump codecov/codecov-action from 3.1.5 to 3.1.6 ([#3683](https://github.com/aws-powertools/powertools-lambda-python/issues/3683))
-* **deps:** bump pydantic from 1.10.13 to 1.10.14 ([#3655](https://github.com/aws-powertools/powertools-lambda-python/issues/3655))
-* **deps-dev:** bump aws-cdk from 2.123.0 to 2.124.0 ([#3678](https://github.com/aws-powertools/powertools-lambda-python/issues/3678))
-* **deps-dev:** bump sentry-sdk from 1.39.2 to 1.40.0 ([#3684](https://github.com/aws-powertools/powertools-lambda-python/issues/3684))
-* **deps-dev:** bump ruff from 0.1.13 to 0.1.14 ([#3656](https://github.com/aws-powertools/powertools-lambda-python/issues/3656))
-* **deps-dev:** bump ruff from 0.1.14 to 0.1.15 ([#3685](https://github.com/aws-powertools/powertools-lambda-python/issues/3685))
-* **deps-dev:** bump aws-cdk from 2.122.0 to 2.123.0 ([#3673](https://github.com/aws-powertools/powertools-lambda-python/issues/3673))
+* version bump
 
 
 <a name="v2.32.0"></a>
@@ -4303,7 +4287,8 @@
 * Merge pull request [#5](https://github.com/aws-powertools/powertools-lambda-python/issues/5) from jfuss/feat/python38
 
 
-[Unreleased]: https://github.com/aws-powertools/powertools-lambda-python/compare/v2.32.0...HEAD
+[Unreleased]: https://github.com/aws-powertools/powertools-lambda-python/compare/v2.33.0...HEAD
+[v2.33.0]: https://github.com/aws-powertools/powertools-lambda-python/compare/v2.32.0...v2.33.0
 [v2.32.0]: https://github.com/aws-powertools/powertools-lambda-python/compare/v2.31.0...v2.32.0
 [v2.31.0]: https://github.com/aws-powertools/powertools-lambda-python/compare/v2.30.2...v2.31.0
 [v2.30.2]: https://github.com/aws-powertools/powertools-lambda-python/compare/v2.30.1...v2.30.2

aws_lambda_powertools/shared/version.py

@@ -1,3 +1,3 @@
 """Exposes version constant to avoid circular dependencies."""
 
-VERSION = "2.32.0"
+VERSION = "2.33.0"

docs/index.md

@@ -14,7 +14,7 @@ Globals:
     Layers:
       # Find the latest Layer version in the official documentation
       # https://docs.powertools.aws.dev/lambda/python/latest/#lambda-layer
-      - !Sub arn:aws:lambda:${AWS::Region}:017000801446:layer:AWSLambdaPowertoolsPythonV2:60
+      - !Sub arn:aws:lambda:${AWS::Region}:017000801446:layer:AWSLambdaPowertoolsPythonV2:61
 
 Resources:
   LoggerLambdaHandlerExample:

examples/logger/sam/template.yaml

@@ -15,7 +15,7 @@ Globals:
     Layers:
       # Find the latest Layer version in the official documentation
       # https://docs.powertools.aws.dev/lambda/python/latest/#lambda-layer
-      - !Sub arn:aws:lambda:${AWS::Region}:017000801446:layer:AWSLambdaPowertoolsPythonV2:60
+      - !Sub arn:aws:lambda:${AWS::Region}:017000801446:layer:AWSLambdaPowertoolsPythonV2:61
 
 Resources:
   CaptureLambdaHandlerExample:

examples/metrics/sam/template.yaml

@@ -13,7 +13,7 @@ Globals:
     Layers:
       # Find the latest Layer version in the official documentation
       # https://docs.powertools.aws.dev/lambda/python/latest/#lambda-layer
-      - !Sub arn:aws:lambda:${AWS::Region}:017000801446:layer:AWSLambdaPowertoolsPythonV2:60
+      - !Sub arn:aws:lambda:${AWS::Region}:017000801446:layer:AWSLambdaPowertoolsPythonV2:61
 
 Resources:
   CaptureLambdaHandlerExample:

examples/tracer/sam/template.yaml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "aws_lambda_powertools"
-version = "2.32.0"
+version = "2.33.0"
 description = "Powertools for AWS Lambda (Python) is a developer toolkit to implement Serverless best practices and increase developer velocity."
 authors = ["Amazon Web Services"]
 include = ["aws_lambda_powertools/py.typed", "THIRD-PARTY-LICENSES"]

pyproject.toml

@@ -2,16 +2,23 @@
 from uuid import uuid4
 
 import pytest
-from aws_encryption_sdk.exceptions import DecryptKeyError
 
 from aws_lambda_powertools.utilities.data_masking import DataMasking
-from aws_lambda_powertools.utilities.data_masking.exceptions import DataMaskingContextMismatchError
+from aws_lambda_powertools.utilities.data_masking.exceptions import (
+    DataMaskingContextMismatchError,
+    DataMaskingDecryptKeyError,
+)
 from aws_lambda_powertools.utilities.data_masking.provider.kms.aws_encryption_sdk import (
     AWSEncryptionSDKProvider,
 )
 from tests.e2e.utils import data_fetcher
 
 
+@pytest.fixture
+def security_context():
+    return {"this": "is_secure"}
+
+
 @pytest.fixture
 def basic_handler_fn(infrastructure: dict) -> str:
     return infrastructure.get("BasicHandler", "")
@@ -53,36 +60,35 @@ def test_encryption(data_masker):
 
 
 @pytest.mark.xdist_group(name="data_masking")
-def test_encryption_context(data_masker):
+def test_encryption_context(data_masker, security_context):
     # GIVEN an instantiation of DataMasking with the AWS encryption provider
 
     value = [1, 2, "string", 4.5]
-    context = {"this": "is_secure"}
 
     # WHEN encrypting and then decrypting the encrypted data with an encryption_context
-    encrypted_data = data_masker.encrypt(value, encryption_context=context)
-    decrypted_data = data_masker.decrypt(encrypted_data, encryption_context=context)
+    encrypted_data = data_masker.encrypt(value, **security_context)
+    decrypted_data = data_masker.decrypt(encrypted_data, **security_context)
 
     # THEN the result is the original input data
     assert decrypted_data == value
 
 
 @pytest.mark.xdist_group(name="data_masking")
-def test_encryption_context_mismatch(data_masker):
+def test_encryption_context_mismatch(data_masker, security_context):
     # GIVEN an instantiation of DataMasking with the AWS encryption provider
 
     value = [1, 2, "string", 4.5]
 
     # WHEN encrypting with a encryption_context
-    encrypted_data = data_masker.encrypt(value, encryption_context={"this": "is_secure"})
+    encrypted_data = data_masker.encrypt(value, **security_context)
 
     # THEN decrypting with a different encryption_context should raise a ContextMismatchError
     with pytest.raises(DataMaskingContextMismatchError):
-        data_masker.decrypt(encrypted_data, encryption_context={"not": "same_context"})
+        data_masker.decrypt(encrypted_data, this="different_context")
 
 
 @pytest.mark.xdist_group(name="data_masking")
-def test_encryption_no_context_fail(data_masker):
+def test_encryption_no_context_fail(data_masker, security_context):
     # GIVEN an instantiation of DataMasking with the AWS encryption provider
 
     value = [1, 2, "string", 4.5]
@@ -92,7 +98,7 @@ def test_encryption_no_context_fail(data_masker):
 
     # THEN decrypting with an encryption_context should raise a ContextMismatchError
     with pytest.raises(DataMaskingContextMismatchError):
-        data_masker.decrypt(encrypted_data, encryption_context={"this": "is_secure"})
+        data_masker.decrypt(encrypted_data, **security_context)
 
 
 @pytest.mark.xdist_group(name="data_masking")
@@ -106,7 +112,7 @@ def test_encryption_decryption_key_mismatch(data_masker, kms_key2_arn):
     # THEN when decrypting with a different key it should fail
     data_masker_key2 = DataMasking(provider=AWSEncryptionSDKProvider(keys=[kms_key2_arn]))
 
-    with pytest.raises(DecryptKeyError):
+    with pytest.raises(DataMaskingDecryptKeyError):
         data_masker_key2.decrypt(encrypted_data)