Merge branch 'develop' into feat-apigw-prefix

Author: Michael Brewer

aws_lambda_powertools/event_handler/api_gateway.py

@@ -531,10 +531,10 @@ def _resolve(self) -> ResponseBuilder:
         for route in self._routes:
             if method != route.method:
                 continue
-            match: Optional[re.Match] = route.rule.match(path)
-            if match:
+            match_results: Optional[re.Match] = route.rule.match(path)
+            if match_results:
                 logger.debug("Found a registered route. Calling function")
-                return self._call_route(route, match.groupdict())  # pass fn args
+                return self._call_route(route, match_results.groupdict())  # pass fn args
 
         logger.debug(f"No match found for path {path} and method {method}")
         return self._not_found(method)

aws_lambda_powertools/exceptions/__init__.py

@@ -0,0 +1,5 @@
+"""Shared exceptions that don't belong to a single utility"""
+
+
+class InvalidEnvelopeExpressionError(Exception):
+    """When JMESPath fails to parse expression"""

aws_lambda_powertools/shared/jmespath_utils.py

@@ -1,13 +1,15 @@
 import base64
 import gzip
 import json
+import logging
 from typing import Any, Dict, Optional, Union
 
 import jmespath
 from jmespath.exceptions import LexerError
 
-from aws_lambda_powertools.utilities.validation import InvalidEnvelopeExpressionError
-from aws_lambda_powertools.utilities.validation.base import logger
+from aws_lambda_powertools.exceptions import InvalidEnvelopeExpressionError
+
+logger = logging.getLogger(__name__)
 
 
 class PowertoolsFunctions(jmespath.functions.Functions):
@@ -27,7 +29,7 @@ def _func_powertools_base64_gzip(self, value):
         return uncompressed.decode()
 
 
-def unwrap_event_from_envelope(data: Union[Dict, str], envelope: str, jmespath_options: Optional[Dict]) -> Any:
+def extract_data_from_envelope(data: Union[Dict, str], envelope: str, jmespath_options: Optional[Dict]) -> Any:
     """Searches data using JMESPath expression
 
     Parameters

aws_lambda_powertools/utilities/data_classes/appsync_authorizer_event.py

@@ -68,18 +68,18 @@ class AppSyncAuthorizerResponse:
         is authorized to make calls to the GraphQL API. If this value is
         true, execution of the GraphQL API continues. If this value is false,
         an UnauthorizedException is raised
-    max_age: Optional[int]
+    max_age: int, optional
         Set the ttlOverride. The number of seconds that the response should be
         cached for. If no value is returned, the value from the API (if configured)
         or the default of 300 seconds (five minutes) is used. If this is 0, the response
         is not cached.
-    resolver_context: Optional[Dict[str, Any]]
+    resolver_context: Dict[str, Any], optional
         A JSON object visible as `$ctx.identity.resolverContext` in resolver templates
 
         The resolverContext object only supports key-value pairs. Nested keys are not supported.
 
         Warning: The total size of this JSON object must not exceed 5MB.
-    deny_fields: Optional[List[str]]
+    deny_fields: List[str], optional
         A list of fields that will be set to `null` regardless of the resolver's return.
 
         A field is either `TypeName.FieldName`, or an ARN such as

aws_lambda_powertools/utilities/feature_flags/appconfig.py

@@ -80,7 +80,7 @@ def get_configuration(self) -> Dict[str, Any]:
             )
 
             if self.envelope:
-                config = jmespath_utils.unwrap_event_from_envelope(
+                config = jmespath_utils.extract_data_from_envelope(
                     data=config, envelope=self.envelope, jmespath_options=self.jmespath_options
                 )
 

aws_lambda_powertools/utilities/validation/exceptions.py

@@ -1,3 +1,6 @@
+from ...exceptions import InvalidEnvelopeExpressionError
+
+
 class SchemaValidationError(Exception):
     """When serialization fail schema validation"""
 
@@ -6,5 +9,4 @@ class InvalidSchemaFormatError(Exception):
     """When JSON Schema is in invalid format"""
 
 
-class InvalidEnvelopeExpressionError(Exception):
-    """When JMESPath fails to parse expression"""
+__all__ = ["SchemaValidationError", "InvalidSchemaFormatError", "InvalidEnvelopeExpressionError"]

aws_lambda_powertools/utilities/validation/validator.py

@@ -117,7 +117,7 @@ def handler(event, context):
         When JMESPath expression to unwrap event is invalid
     """
     if envelope:
-        event = jmespath_utils.unwrap_event_from_envelope(
+        event = jmespath_utils.extract_data_from_envelope(
             data=event, envelope=envelope, jmespath_options=jmespath_options
         )
 
@@ -219,7 +219,7 @@ def handler(event, context):
         When JMESPath expression to unwrap event is invalid
     """
     if envelope:
-        event = jmespath_utils.unwrap_event_from_envelope(
+        event = jmespath_utils.extract_data_from_envelope(
             data=event, envelope=envelope, jmespath_options=jmespath_options
         )
 

poetry.lock

@@ -34,7 +34,7 @@ black = "^20.8b1"
 flake8 = "^3.9.0"
 flake8-black = "^0.2.3"
 flake8-builtins = "^1.5.3"
-flake8-comprehensions = "^3.6.0"
+flake8-comprehensions = "^3.6.1"
 flake8-debugger = "^4.0.0"
 flake8-fixme = "^1.1.1"
 flake8-isort = "^4.0.0"
@@ -60,7 +60,7 @@ pydantic = ["pydantic", "email-validator"]
 
 [tool.coverage.run]
 source = ["aws_lambda_powertools"]
-omit = ["tests/*"]
+omit = ["tests/*", "aws_lambda_powertools/exceptions/*"]
 branch = true
 
 [tool.coverage.html]

pyproject.toml

@@ -11,7 +11,7 @@
 from botocore.config import Config
 from jmespath import functions
 
-from aws_lambda_powertools.shared.jmespath_utils import unwrap_event_from_envelope
+from aws_lambda_powertools.shared.jmespath_utils import extract_data_from_envelope
 from aws_lambda_powertools.shared.json_encoder import Encoder
 from aws_lambda_powertools.utilities.idempotency import DynamoDBPersistenceLayer
 from aws_lambda_powertools.utilities.idempotency.idempotency import IdempotencyConfig
@@ -149,7 +149,7 @@ def hashed_idempotency_key(lambda_apigw_event, default_jmespath, lambda_context)
 
 @pytest.fixture
 def hashed_idempotency_key_with_envelope(lambda_apigw_event):
-    event = unwrap_event_from_envelope(
+    event = extract_data_from_envelope(
         data=lambda_apigw_event, envelope=envelopes.API_GATEWAY_HTTP, jmespath_options={}
     )
     return "test-func#" + hashlib.md5(json.dumps(event).encode()).hexdigest()