Addressing feedback

Author: leandrodamascena

aws_lambda_powertools/event_handler/api_gateway.py

@@ -43,7 +43,7 @@
     validation_error_definition,
     validation_error_response_definition,
 )
-from aws_lambda_powertools.event_handler.util import _FrozenDict
+from aws_lambda_powertools.event_handler.util import _FrozenDict, extract_origin_header
 from aws_lambda_powertools.shared.cookies import Cookie
 from aws_lambda_powertools.shared.functions import powertools_dev_is_set
 from aws_lambda_powertools.shared.json_encoder import Encoder
@@ -58,7 +58,6 @@
     VPCLatticeEventV2,
 )
 from aws_lambda_powertools.utilities.data_classes.common import BaseProxyEvent
-from aws_lambda_powertools.utilities.data_classes.shared_functions import get_header_value
 from aws_lambda_powertools.utilities.typing import LambdaContext
 
 logger = logging.getLogger(__name__)
@@ -218,27 +217,6 @@ def to_dict(self, origin: Optional[str]) -> Dict[str, str]:
             headers["Access-Control-Allow-Credentials"] = "true"
         return headers
 
-    @staticmethod
-    def extract_origin_header(resolver_headers: Dict):
-        """
-        Extracts the 'origin' or 'Origin' header from the provided resolver headers.
-
-        The 'origin' or 'Origin' header can be either a single header or a multi-header.
-
-        Args:
-            resolver_headers (Dict): A dictionary containing the headers.
-
-        Returns:
-            Optional[str]: The value(s) of the origin header or None.
-        """
-        resolved_header = get_header_value(resolver_headers, "origin", None, case_sensitive=False)
-        if isinstance(resolved_header, str):
-            return resolved_header
-        if isinstance(resolved_header, list):
-            return resolved_header[0]
-
-        return resolved_header
-
 
 class Response(Generic[ResponseT]):
     """Response data class that provides greater control over what is returned from the proxy event"""
@@ -804,7 +782,7 @@ def __init__(
 
     def _add_cors(self, event: ResponseEventT, cors: CORSConfig):
         """Update headers to include the configured Access-Control headers"""
-        extracted_origin_header = cors.extract_origin_header(event.resolved_headers_field)
+        extracted_origin_header = extract_origin_header(event.resolved_headers_field)
         self.response.headers.update(cors.to_dict(extracted_origin_header))
 
     def _add_cache_control(self, cache_control: str):
@@ -2152,7 +2130,7 @@ def _not_found(self, method: str) -> ResponseBuilder:
         headers = {}
         if self._cors:
             logger.debug("CORS is enabled, updating headers.")
-            extracted_origin_header = self._cors.extract_origin_header(self.current_event.resolved_headers_field)
+            extracted_origin_header = extract_origin_header(self.current_event.resolved_headers_field)
             headers.update(self._cors.to_dict(extracted_origin_header))
 
             if method == "OPTIONS":

aws_lambda_powertools/event_handler/util.py

@@ -1,3 +1,8 @@
+from typing import Any, Dict
+
+from aws_lambda_powertools.utilities.data_classes.shared_functions import get_header_value
+
+
 class _FrozenDict(dict):
     """
     A dictionary that can be used as a key in another dictionary.
@@ -11,3 +16,24 @@ class _FrozenDict(dict):
 
     def __hash__(self):
         return hash(frozenset(self.keys()))
+
+
+def extract_origin_header(resolver_headers: Dict[str, Any]):
+    """
+    Extracts the 'origin' or 'Origin' header from the provided resolver headers.
+
+    The 'origin' or 'Origin' header can be either a single header or a multi-header.
+
+    Args:
+        resolver_headers (Dict): A dictionary containing the headers.
+
+    Returns:
+        Optional[str]: The value(s) of the origin header or None.
+    """
+    resolved_header = get_header_value(resolver_headers, "origin", None, case_sensitive=False)
+    if isinstance(resolved_header, str):
+        return resolved_header
+    if isinstance(resolved_header, list):
+        return resolved_header[0]
+
+    return resolved_header