Merge branch 'awslabs:develop' into feat(event-source)-1656-s3-event-eventbridge-dataclass

Author: ivica-k

.github/workflows/publish_v2_layer.yml

@@ -65,7 +65,7 @@ jobs:
         # NOTE: we need QEMU to build Layer against a different architecture (e.g., ARM)
       - name: Set up Docker Buildx
         id: builder
-        uses: docker/setup-buildx-action@f03ac48505955848960e80bbb68046aa35c7b9e7 # v2.4.1
+        uses: docker/setup-buildx-action@4b4e9c3e2d4531116a6f8ba8e71fc6e2cb6e6c8c # v2.5.0
         with:
           install: true
           driver: docker

aws_lambda_powertools/logging/formatter.py

@@ -137,7 +137,7 @@ def __init__(
         self.use_rfc3339_iso8601 = use_rfc3339
 
         if self.utc:
-            self.converter = time.gmtime  # type: ignore
+            self.converter = time.gmtime
 
         super(LambdaPowertoolsFormatter, self).__init__(datefmt=self.datefmt)
 
@@ -176,7 +176,7 @@ def formatTime(self, record: logging.LogRecord, datefmt: Optional[str] = None) -
             return ts_as_datetime.isoformat(timespec="milliseconds")  # 2022-10-27T17:42:26.841+0200
 
         # converts to local/UTC TZ as struct time
-        record_ts = self.converter(record.created)  # type: ignore
+        record_ts = self.converter(record.created)
 
         if datefmt is None:  # pragma: no cover, it'll always be None in std logging, but mypy
             datefmt = self.datefmt

aws_lambda_powertools/tracing/base.py

@@ -2,7 +2,7 @@
 import numbers
 import traceback
 from contextlib import contextmanager
-from typing import Any, Generator, List, NoReturn, Optional, Sequence, Union
+from typing import Any, Generator, List, Optional, Sequence, Union
 
 
 class BaseSegment(abc.ABC):
@@ -28,7 +28,7 @@ def remove_subsegment(self, subsegment: Any):
         """Remove input subsegment from child subsegments."""
 
     @abc.abstractmethod
-    def put_annotation(self, key: str, value: Union[str, numbers.Number, bool]) -> NoReturn:
+    def put_annotation(self, key: str, value: Union[str, numbers.Number, bool]) -> None:
         """Annotate segment or subsegment with a key-value pair.
 
         Note: Annotations will be indexed for later search query.
@@ -42,7 +42,7 @@ def put_annotation(self, key: str, value: Union[str, numbers.Number, bool]) -> N
         """
 
     @abc.abstractmethod
-    def put_metadata(self, key: str, value: Any, namespace: str = "default") -> NoReturn:
+    def put_metadata(self, key: str, value: Any, namespace: str = "default") -> None:
         """Add metadata to segment or subsegment. Metadata is not indexed
         but can be later retrieved by BatchGetTraces API.
 
@@ -101,7 +101,7 @@ def in_subsegment_async(self, name=None, **kwargs) -> Generator[BaseSegment, Non
         """
 
     @abc.abstractmethod
-    def put_annotation(self, key: str, value: Union[str, numbers.Number, bool]) -> NoReturn:
+    def put_annotation(self, key: str, value: Union[str, numbers.Number, bool]) -> None:
         """Annotate current active trace entity with a key-value pair.
 
         Note: Annotations will be indexed for later search query.
@@ -115,7 +115,7 @@ def put_annotation(self, key: str, value: Union[str, numbers.Number, bool]) -> N
         """
 
     @abc.abstractmethod
-    def put_metadata(self, key: str, value: Any, namespace: str = "default") -> NoReturn:
+    def put_metadata(self, key: str, value: Any, namespace: str = "default") -> None:
         """Add metadata to the current active trace entity.
 
         Note: Metadata is not indexed but can be later retrieved by BatchGetTraces API.
@@ -131,7 +131,7 @@ def put_metadata(self, key: str, value: Any, namespace: str = "default") -> NoRe
         """
 
     @abc.abstractmethod
-    def patch(self, modules: Sequence[str]) -> NoReturn:
+    def patch(self, modules: Sequence[str]) -> None:
         """Instrument a set of supported libraries
 
         Parameters
@@ -141,5 +141,5 @@ def patch(self, modules: Sequence[str]) -> NoReturn:
         """
 
     @abc.abstractmethod
-    def patch_all(self) -> NoReturn:
+    def patch_all(self) -> None:
         """Instrument all supported libraries"""

aws_lambda_powertools/tracing/tracer.py

@@ -529,7 +529,7 @@ async def async_tasks():
             return self._decorate_generator_function(
                 method=method, capture_response=capture_response, capture_error=capture_error, method_name=method_name
             )
-        elif hasattr(method, "__wrapped__") and inspect.isgeneratorfunction(method.__wrapped__):  # type: ignore
+        elif hasattr(method, "__wrapped__") and inspect.isgeneratorfunction(method.__wrapped__):
             return self._decorate_generator_function_with_context_manager(
                 method=method, capture_response=capture_response, capture_error=capture_error, method_name=method_name
             )

aws_lambda_powertools/utilities/parameters/dynamodb.py

@@ -222,4 +222,4 @@ def _get_multiple(self, path: str, **sdk_options) -> Dict[str, str]:
 
         # maintenance: look for better ways to correctly type DynamoDB multiple return types
         # without a breaking change within ABC return type
-        return {item[self.sort_attr]: item[self.value_attr] for item in items}  # type: ignore[misc]
+        return {item[self.sort_attr]: item[self.value_attr] for item in items}

aws_lambda_powertools/utilities/parser/envelopes/kafka.py

@@ -33,7 +33,9 @@ def parse(self, data: Optional[Union[Dict[str, Any], Any]], model: Type[Model])
             List of records parsed with model provided
         """
         event_source = cast(dict, data).get("eventSource")
-        model_parse_event = KafkaMskEventModel if event_source == "aws:kafka" else KafkaSelfManagedEventModel
+        model_parse_event: Union[Type[KafkaMskEventModel], Type[KafkaSelfManagedEventModel]] = (
+            KafkaMskEventModel if event_source == "aws:kafka" else KafkaSelfManagedEventModel
+        )
 
         logger.debug(f"Parsing incoming data with Kafka event model {model_parse_event}")
         parsed_envelope = model_parse_event.parse_obj(data)

aws_lambda_powertools/utilities/streaming/_s3_seekable_io.py

@@ -1,6 +1,6 @@
 import io
 import logging
-from typing import IO, TYPE_CHECKING, AnyStr, Iterable, List, Optional
+from typing import IO, TYPE_CHECKING, AnyStr, Iterable, List, Optional, cast
 
 import boto3
 
@@ -85,7 +85,7 @@ def raw_stream(self) -> PowertoolsStreamingBody:
             self._raw_stream = self.s3_client.get_object(Range=range_header, **self._sdk_options).get("Body")
             self._closed = False
 
-        return self._raw_stream
+        return cast(PowertoolsStreamingBody, self._raw_stream)
 
     def seek(self, offset: int, whence: int = io.SEEK_SET) -> int:
         """

mypy.ini

@@ -7,6 +7,7 @@ warn_unused_ignores=True
 show_column_numbers = True
 show_error_codes = True
 show_error_context = True
+disable_error_code = annotation-unchecked
 
 [mypy-jmespath]
 ignore_missing_imports=True