Merge branch 'develop' into fix/1153-exception-handler-raises

Author: heitorlessa

.github/mergify.yml

@@ -1,29 +1,31 @@
-queue_rules:
-  - name: default
-    conditions:
-      # Conditions to get out of the queue (= merged)
-      - check-success=Semantic Pull Request
-      - "#approved-reviews-by>=1"
-      - -title~=(WIP|wip)
-      - -label~="do-not-merge"
-      - "#changes-requested-reviews-by=0"
+## Temporarily disabled after Mergify breaking changes
+## might move to custom GitHub Actions altogether
+# queue_rules:
+#   - name: default
+#     conditions:
+#       # Conditions to get out of the queue (= merged)
+#       - check-success=Semantic Pull Request
+#       - "#approved-reviews-by>=1"
+#       - -title~=(WIP|wip)
+#       - -label~="do-not-merge"
+#       - "#changes-requested-reviews-by=0"
 
-pull_request_rules:
-  - name: automatic merge for Dependabot pull requests
-    conditions:
-      - author~=^dependabot(|-preview)\[bot\]$
-    actions:
-      queue:
-        name: default
-        method: squash
-        commit_message: title+body
+# pull_request_rules:
+#   - name: automatic merge for Dependabot pull requests
+#     conditions:
+#       - author~=^dependabot(|-preview)\[bot\]$
+#     actions:
+#       queue:
+#         name: default
+#         method: squash
+#         commit_message: title+body
 
-  - name: Automatic merge ⬇️ on approval ✔
-    conditions:
-      - base!=master
-      - "#approved-reviews-by>=2"
-    actions:
-      queue:
-        name: default
-        method: squash
-        commit_message: title+body
+#   - name: Automatic merge ⬇️ on approval ✔
+#     conditions:
+#       - base!=master
+#       - "#approved-reviews-by>=2"
+#     actions:
+#       queue:
+#         name: default
+#         method: squash
+#         commit_message: title+body

.github/workflows/codeql-analysis.yml

@@ -24,7 +24,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -33,4 +33,4 @@ jobs:
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2

.github/workflows/post_release.js

@@ -15,7 +15,7 @@ const fetchIssues = async ({
 	gh_client,
 	org,
 	repository,
-	state = "open",
+	state = "all",
 	label = STAGED_LABEL,
 }) => {
 

aws_lambda_powertools/event_handler/api_gateway.py

@@ -491,6 +491,11 @@ def resolve(self, event, context) -> Dict[str, Any]:
         dict
             Returns the dict response
         """
+        if isinstance(event, BaseProxyEvent):
+            warnings.warn(
+                "You don't need to serialize event to Event Source Data Class when using Event Handler; see issue #1152"
+            )
+            event = event.raw_event
         if self._debug:
             print(self._json_dump(event), end="")
         BaseRouter.current_event = self._to_proxy_event(event)

aws_lambda_powertools/utilities/batch/sqs.py

@@ -135,6 +135,10 @@ def _clean(self) -> Optional[List]:
             return None
 
         queue_url = self._get_queue_url()
+        if queue_url is None:
+            logger.debug("No queue url found")
+            return None
+
         entries_to_remove = self._get_entries_to_clean()
         # Batch delete up to 10 messages at a time (SQS limit)
         max_workers = math.ceil(len(entries_to_remove) / self.max_message_batch)

aws_lambda_powertools/utilities/idempotency/persistence/dynamodb.py

@@ -22,7 +22,7 @@ def __init__(
         self,
         table_name: str,
         key_attr: str = "id",
-        static_pk_value: str = f"idempotency#{os.getenv(constants.LAMBDA_FUNCTION_NAME_ENV, '')}",
+        static_pk_value: Optional[str] = None,
         sort_key_attr: Optional[str] = None,
         expiry_attr: str = "expiration",
         status_attr: str = "status",
@@ -76,6 +76,9 @@ def __init__(
         if sort_key_attr == key_attr:
             raise ValueError(f"key_attr [{key_attr}] and sort_key_attr [{sort_key_attr}] cannot be the same!")
 
+        if static_pk_value is None:
+            static_pk_value = f"idempotency#{os.getenv(constants.LAMBDA_FUNCTION_NAME_ENV, '')}"
+
         self._table = None
         self.table_name = table_name
         self.key_attr = key_attr

poetry.lock

@@ -49,11 +49,11 @@ pytest-asyncio = "^0.16.0"
 bandit = "^1.7.1"
 radon = "^5.1.0"
 xenon = "^0.9.0"
-flake8-eradicate = "^1.2.0"
-flake8-bugbear = "^22.1.11"
+flake8-eradicate = "^1.2.1"
+flake8-bugbear = "^22.4.25"
 mkdocs-git-revision-date-plugin = "^0.3.2"
 mike = "^0.6.0"
-mypy = "^0.942"
+mypy = "^0.950"
 mkdocs-material = "^8.2.7"
 
 

pyproject.toml

@@ -31,7 +31,12 @@
 )
 from aws_lambda_powertools.shared import constants
 from aws_lambda_powertools.shared.json_encoder import Encoder
-from aws_lambda_powertools.utilities.data_classes import ALBEvent, APIGatewayProxyEvent, APIGatewayProxyEventV2
+from aws_lambda_powertools.utilities.data_classes import (
+    ALBEvent,
+    APIGatewayProxyEvent,
+    APIGatewayProxyEventV2,
+    event_source,
+)
 from tests.functional.utils import load_event
 
 
@@ -1213,8 +1218,7 @@ def handle_not_found(_) -> Response:
 
 
 def test_exception_handler_raises_service_error(json_dump):
-    # SCENARIO: Support an exception_handler that raises a ServiceError
-    # GIVEN
+    # GIVEN an exception handler raises a ServiceError (BadRequestError)
     app = ApiGatewayResolver()
 
     @app.exception_handler(ValueError)
@@ -1234,3 +1238,23 @@ def get_lambda() -> Response:
     assert result["headers"]["Content-Type"] == content_types.APPLICATION_JSON
     expected = {"statusCode": 400, "message": "Bad request"}
     assert result["body"] == json_dump(expected)
+
+
+def test_event_source_compatibility():
+    # GIVEN
+    app = APIGatewayHttpResolver()
+
+    @app.post("/my/path")
+    def my_path():
+        assert isinstance(app.current_event, APIGatewayProxyEventV2)
+        return {}
+
+    # WHEN
+    @event_source(data_class=APIGatewayProxyEventV2)
+    def handler(event: APIGatewayProxyEventV2, context):
+        assert isinstance(event, APIGatewayProxyEventV2)
+        return app.resolve(event, context)
+
+    # THEN
+    result = handler(load_event("apiGatewayProxyV2Event.json"), None)
+    assert result["statusCode"] == 200