Merge branch 'develop' into feat-correlation-id-remove

Author: Michael Brewer

Makefile

@@ -83,3 +83,6 @@ release: pr
 changelog:
 	@echo "[+] Pre-generating CHANGELOG for tag: $$(git describe --abbrev=0 --tag)"
 	docker run -v "${PWD}":/workdir quay.io/git-chglog/git-chglog $$(git describe --abbrev=0 --tag).. > TMP_CHANGELOG.md
+
+mypy:
+	poetry run mypy aws_lambda_powertools

aws_lambda_powertools/logging/logger.py

@@ -4,7 +4,7 @@
 import os
 import random
 import sys
-from typing import Any, Callable, Dict, Iterable, Optional, TypeVar, Union
+from typing import IO, Any, Callable, Dict, Iterable, Optional, TypeVar, Union
 
 import jmespath
 
@@ -171,7 +171,7 @@ def __init__(
         level: Union[str, int] = None,
         child: bool = False,
         sampling_rate: float = None,
-        stream: sys.stdout = None,
+        stream: IO[str] = None,
         logger_formatter: Optional[PowertoolsFormatter] = None,
         logger_handler: Optional[logging.Handler] = None,
         **kwargs,
@@ -363,7 +363,7 @@ def registered_handler(self) -> logging.Handler:
     @property
     def registered_formatter(self) -> Optional[PowertoolsFormatter]:
         """Convenience property to access logger formatter"""
-        return self.registered_handler.formatter
+        return self.registered_handler.formatter  # type: ignore
 
     def structure_logs(self, append: bool = False, **keys):
         """Sets logging formatting to JSON.
@@ -384,7 +384,7 @@ def structure_logs(self, append: bool = False, **keys):
             self.append_keys(**keys)
         else:
             log_keys = {**self._default_log_keys, **keys}
-            formatter = self.logger_formatter or LambdaPowertoolsFormatter(**log_keys)
+            formatter = self.logger_formatter or LambdaPowertoolsFormatter(**log_keys)  # type: ignore
             self.registered_handler.setFormatter(formatter)
 
     def set_correlation_id(self, value: Optional[str]):
@@ -434,7 +434,7 @@ def _get_caller_filename():
 
 
 def set_package_logger(
-    level: Union[str, int] = logging.DEBUG, stream: sys.stdout = None, formatter: logging.Formatter = None
+    level: Union[str, int] = logging.DEBUG, stream: IO[str] = None, formatter: logging.Formatter = None
 ):
     """Set an additional stream handler, formatter, and log level for aws_lambda_powertools package logger.
 

aws_lambda_powertools/utilities/validation/base.py

@@ -1,5 +1,5 @@
 import logging
-from typing import Any, Dict, Optional
+from typing import Any, Dict, Optional, Union
 
 import fastjsonschema
 import jmespath
@@ -12,7 +12,7 @@
 logger = logging.getLogger(__name__)
 
 
-def validate_data_against_schema(data: Dict, schema: Dict, formats: Optional[Dict] = None):
+def validate_data_against_schema(data: Union[Dict, str], schema: Dict, formats: Optional[Dict] = None):
     """Validate dict data against given JSON Schema
 
     Parameters
@@ -41,7 +41,7 @@ def validate_data_against_schema(data: Dict, schema: Dict, formats: Optional[Dic
         raise SchemaValidationError(message)
 
 
-def unwrap_event_from_envelope(data: Dict, envelope: str, jmespath_options: Optional[Dict]) -> Any:
+def unwrap_event_from_envelope(data: Union[Dict, str], envelope: str, jmespath_options: Optional[Dict]) -> Any:
     """Searches data using JMESPath expression
 
     Parameters

mypy.ini

@@ -0,0 +1,13 @@
+[mypy]
+warn_return_any=False
+warn_unused_configs=True
+no_implicit_optional=True
+warn_redundant_casts=True
+warn_unused_ignores=True
+pretty = True
+show_column_numbers = True
+show_error_codes = True
+show_error_context = True
+
+[mypy-jmespath]
+ignore_missing_imports=True

poetry.lock

@@ -39,7 +39,7 @@ flake8-debugger = "^4.0.0"
 flake8-fixme = "^1.1.1"
 flake8-isort = "^4.0.0"
 flake8-variables-names = "^0.0.4"
-isort = "^5.9.1"
+isort = "^5.9.2"
 pytest-cov = "^2.12.1"
 pytest-mock = "^3.5.1"
 pdoc3 = "^0.9.2"
@@ -52,6 +52,7 @@ flake8-bugbear = "^21.3.2"
 mkdocs-material = "^7.1.9"
 mkdocs-git-revision-date-plugin = "^0.3.1"
 mike = "^0.6.0"
+mypy = "^0.910"
 
 
 [tool.poetry.extras]