From 4ae81ff3c61d53e4567201da6795f7799ca718c8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 23 Feb 2024 09:05:26 +0000 Subject: [PATCH 1/2] chore(deps-dev): bump black from 24.1.1 to 24.2.0 Bumps [black](https://github.com/psf/black) from 24.1.1 to 24.2.0. - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](https://github.com/psf/black/compare/24.1.1...24.2.0) --- updated-dependencies: - dependency-name: black dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- poetry.lock | 48 ++++++++++++++++++++++++------------------------ pyproject.toml | 2 +- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/poetry.lock b/poetry.lock index d1db6d3924c..3e4fa65c503 100644 --- a/poetry.lock +++ b/poetry.lock @@ -284,33 +284,33 @@ yaml = ["PyYAML"] [[package]] name = "black" -version = "24.1.1" +version = "24.2.0" description = "The uncompromising code formatter." optional = false python-versions = ">=3.8" files = [ - {file = "black-24.1.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:2588021038bd5ada078de606f2a804cadd0a3cc6a79cb3e9bb3a8bf581325a4c"}, - {file = "black-24.1.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:1a95915c98d6e32ca43809d46d932e2abc5f1f7d582ffbe65a5b4d1588af7445"}, - {file = "black-24.1.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2fa6a0e965779c8f2afb286f9ef798df770ba2b6cee063c650b96adec22c056a"}, - {file = "black-24.1.1-cp310-cp310-win_amd64.whl", hash = "sha256:5242ecd9e990aeb995b6d03dc3b2d112d4a78f2083e5a8e86d566340ae80fec4"}, - {file = "black-24.1.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:fc1ec9aa6f4d98d022101e015261c056ddebe3da6a8ccfc2c792cbe0349d48b7"}, - {file = "black-24.1.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:0269dfdea12442022e88043d2910429bed717b2d04523867a85dacce535916b8"}, - {file = "black-24.1.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b3d64db762eae4a5ce04b6e3dd745dcca0fb9560eb931a5be97472e38652a161"}, - {file = "black-24.1.1-cp311-cp311-win_amd64.whl", hash = "sha256:5d7b06ea8816cbd4becfe5f70accae953c53c0e53aa98730ceccb0395520ee5d"}, - {file = "black-24.1.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:e2c8dfa14677f90d976f68e0c923947ae68fa3961d61ee30976c388adc0b02c8"}, - {file = "black-24.1.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:a21725862d0e855ae05da1dd25e3825ed712eaaccef6b03017fe0853a01aa45e"}, - {file = "black-24.1.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:07204d078e25327aad9ed2c64790d681238686bce254c910de640c7cc4fc3aa6"}, - {file = "black-24.1.1-cp312-cp312-win_amd64.whl", hash = "sha256:a83fe522d9698d8f9a101b860b1ee154c1d25f8a82ceb807d319f085b2627c5b"}, - {file = "black-24.1.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:08b34e85170d368c37ca7bf81cf67ac863c9d1963b2c1780c39102187ec8dd62"}, - {file = "black-24.1.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:7258c27115c1e3b5de9ac6c4f9957e3ee2c02c0b39222a24dc7aa03ba0e986f5"}, - {file = "black-24.1.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:40657e1b78212d582a0edecafef133cf1dd02e6677f539b669db4746150d38f6"}, - {file = "black-24.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:e298d588744efda02379521a19639ebcd314fba7a49be22136204d7ed1782717"}, - {file = "black-24.1.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:34afe9da5056aa123b8bfda1664bfe6fb4e9c6f311d8e4a6eb089da9a9173bf9"}, - {file = "black-24.1.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:854c06fb86fd854140f37fb24dbf10621f5dab9e3b0c29a690ba595e3d543024"}, - {file = "black-24.1.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3897ae5a21ca132efa219c029cce5e6bfc9c3d34ed7e892113d199c0b1b444a2"}, - {file = "black-24.1.1-cp39-cp39-win_amd64.whl", hash = "sha256:ecba2a15dfb2d97105be74bbfe5128bc5e9fa8477d8c46766505c1dda5883aac"}, - {file = "black-24.1.1-py3-none-any.whl", hash = "sha256:5cdc2e2195212208fbcae579b931407c1fa9997584f0a415421748aeafff1168"}, - {file = "black-24.1.1.tar.gz", hash = "sha256:48b5760dcbfe5cf97fd4fba23946681f3a81514c6ab8a45b50da67ac8fbc6c7b"}, + {file = "black-24.2.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:6981eae48b3b33399c8757036c7f5d48a535b962a7c2310d19361edeef64ce29"}, + {file = "black-24.2.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:d533d5e3259720fdbc1b37444491b024003e012c5173f7d06825a77508085430"}, + {file = "black-24.2.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:61a0391772490ddfb8a693c067df1ef5227257e72b0e4108482b8d41b5aee13f"}, + {file = "black-24.2.0-cp310-cp310-win_amd64.whl", hash = "sha256:992e451b04667116680cb88f63449267c13e1ad134f30087dec8527242e9862a"}, + {file = "black-24.2.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:163baf4ef40e6897a2a9b83890e59141cc8c2a98f2dda5080dc15c00ee1e62cd"}, + {file = "black-24.2.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:e37c99f89929af50ffaf912454b3e3b47fd64109659026b678c091a4cd450fb2"}, + {file = "black-24.2.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4f9de21bafcba9683853f6c96c2d515e364aee631b178eaa5145fc1c61a3cc92"}, + {file = "black-24.2.0-cp311-cp311-win_amd64.whl", hash = "sha256:9db528bccb9e8e20c08e716b3b09c6bdd64da0dd129b11e160bf082d4642ac23"}, + {file = "black-24.2.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:d84f29eb3ee44859052073b7636533ec995bd0f64e2fb43aeceefc70090e752b"}, + {file = "black-24.2.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:1e08fb9a15c914b81dd734ddd7fb10513016e5ce7e6704bdd5e1251ceee51ac9"}, + {file = "black-24.2.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:810d445ae6069ce64030c78ff6127cd9cd178a9ac3361435708b907d8a04c693"}, + {file = "black-24.2.0-cp312-cp312-win_amd64.whl", hash = "sha256:ba15742a13de85e9b8f3239c8f807723991fbfae24bad92d34a2b12e81904982"}, + {file = "black-24.2.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:7e53a8c630f71db01b28cd9602a1ada68c937cbf2c333e6ed041390d6968faf4"}, + {file = "black-24.2.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:93601c2deb321b4bad8f95df408e3fb3943d85012dddb6121336b8e24a0d1218"}, + {file = "black-24.2.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a0057f800de6acc4407fe75bb147b0c2b5cbb7c3ed110d3e5999cd01184d53b0"}, + {file = "black-24.2.0-cp38-cp38-win_amd64.whl", hash = "sha256:faf2ee02e6612577ba0181f4347bcbcf591eb122f7841ae5ba233d12c39dcb4d"}, + {file = "black-24.2.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:057c3dc602eaa6fdc451069bd027a1b2635028b575a6c3acfd63193ced20d9c8"}, + {file = "black-24.2.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:08654d0797e65f2423f850fc8e16a0ce50925f9337fb4a4a176a7aa4026e63f8"}, + {file = "black-24.2.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ca610d29415ee1a30a3f30fab7a8f4144e9d34c89a235d81292a1edb2b55f540"}, + {file = "black-24.2.0-cp39-cp39-win_amd64.whl", hash = "sha256:4dd76e9468d5536abd40ffbc7a247f83b2324f0c050556d9c371c2b9a9a95e31"}, + {file = "black-24.2.0-py3-none-any.whl", hash = "sha256:e8a6ae970537e67830776488bca52000eaa37fa63b9988e8c487458d9cd5ace6"}, + {file = "black-24.2.0.tar.gz", hash = "sha256:bce4f25c27c3435e4dace4815bcb2008b87e167e3bf4ee47ccdc5ce906eb4894"}, ] [package.dependencies] @@ -3441,4 +3441,4 @@ validation = ["fastjsonschema"] [metadata] lock-version = "2.0" python-versions = ">=3.8,<4.0.0" -content-hash = "b0ec65e9e8df6741a33ed6b9e1dd616d4ddc1e0e36f0a95408f3931723e93818" +content-hash = "f69f8e1341f5aafeb5819bbd5db022c1af766d2e7a7921124c67f41e851af05a" diff --git a/pyproject.toml b/pyproject.toml index e10d2d44d44..3da37b1cd91 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -52,7 +52,7 @@ jsonpath-ng = { version = "^1.6.0", optional = true } [tool.poetry.dev-dependencies] coverage = { extras = ["toml"], version = "^7.4" } pytest = "^8.0.1" -black = "^24.1" +black = "^24.2" boto3 = "^1.26.164" isort = "^5.13.2" pytest-cov = "^4.1.0" From 04b1105ff8ff9b287c8dc3843fd764e8502c2f55 Mon Sep 17 00:00:00 2001 From: Cavalcante Damascena Date: Tue, 27 Feb 2024 08:52:03 -0300 Subject: [PATCH 2/2] Avoiding files refactoring in other PRs --- aws_lambda_powertools/logging/__init__.py | 1 + aws_lambda_powertools/logging/logger.py | 6 +-- aws_lambda_powertools/metrics/__init__.py | 1 + .../middleware_factory/__init__.py | 1 + aws_lambda_powertools/shared/functions.py | 9 ++--- aws_lambda_powertools/tracing/__init__.py | 1 - aws_lambda_powertools/tracing/tracer.py | 6 +-- aws_lambda_powertools/utilities/batch/base.py | 11 ++++-- .../utilities/batch/exceptions.py | 1 + .../utilities/data_classes/common.py | 2 +- .../utilities/data_masking/base.py | 12 ++---- .../provider/kms/aws_encryption_sdk.py | 1 - .../utilities/idempotency/exceptions.py | 1 - .../utilities/idempotency/idempotency.py | 1 + .../idempotency/serialization/base.py | 1 + .../utilities/parameters/appconfig.py | 1 - .../utilities/parameters/base.py | 7 ++-- .../utilities/parameters/dynamodb.py | 1 - .../utilities/parameters/secrets.py | 1 - .../utilities/parameters/ssm.py | 37 +++++++------------ .../utilities/parser/__init__.py | 1 + .../utilities/parser/parser.py | 6 +-- .../utilities/serialization.py | 1 + .../event_handler/test_api_gateway.py | 33 ++++++----------- tests/functional/test_logger.py | 6 +-- .../test_logger_powertools_formatter.py | 1 + tests/functional/test_utilities_parameters.py | 3 +- tests/unit/parser/test_kinesis.py | 3 +- tests/unit/test_tracing.py | 3 +- 29 files changed, 62 insertions(+), 97 deletions(-) diff --git a/aws_lambda_powertools/logging/__init__.py b/aws_lambda_powertools/logging/__init__.py index 0456b202ffa..2c9532ef540 100644 --- a/aws_lambda_powertools/logging/__init__.py +++ b/aws_lambda_powertools/logging/__init__.py @@ -1,5 +1,6 @@ """Logging utility """ + from .logger import Logger __all__ = ["Logger"] diff --git a/aws_lambda_powertools/logging/logger.py b/aws_lambda_powertools/logging/logger.py index ab159061bff..1e21d6680af 100644 --- a/aws_lambda_powertools/logging/logger.py +++ b/aws_lambda_powertools/logging/logger.py @@ -345,8 +345,7 @@ def inject_lambda_context( log_event: Optional[bool] = None, correlation_id_path: Optional[str] = None, clear_state: Optional[bool] = False, - ) -> AnyCallableT: - ... + ) -> AnyCallableT: ... @overload def inject_lambda_context( @@ -355,8 +354,7 @@ def inject_lambda_context( log_event: Optional[bool] = None, correlation_id_path: Optional[str] = None, clear_state: Optional[bool] = False, - ) -> Callable[[AnyCallableT], AnyCallableT]: - ... + ) -> Callable[[AnyCallableT], AnyCallableT]: ... def inject_lambda_context( self, diff --git a/aws_lambda_powertools/metrics/__init__.py b/aws_lambda_powertools/metrics/__init__.py index b8c94478816..cafd348b8ec 100644 --- a/aws_lambda_powertools/metrics/__init__.py +++ b/aws_lambda_powertools/metrics/__init__.py @@ -1,5 +1,6 @@ """CloudWatch Embedded Metric Format utility """ + from aws_lambda_powertools.metrics.base import MetricResolution, MetricUnit, single_metric from aws_lambda_powertools.metrics.exceptions import ( MetricResolutionError, diff --git a/aws_lambda_powertools/middleware_factory/__init__.py b/aws_lambda_powertools/middleware_factory/__init__.py index 9d57d843ec2..b44d49d6987 100644 --- a/aws_lambda_powertools/middleware_factory/__init__.py +++ b/aws_lambda_powertools/middleware_factory/__init__.py @@ -1,4 +1,5 @@ """ Utilities to enhance middlewares """ + from .factory import lambda_handler_decorator __all__ = ["lambda_handler_decorator"] diff --git a/aws_lambda_powertools/shared/functions.py b/aws_lambda_powertools/shared/functions.py index 9765f55c025..ee274498260 100644 --- a/aws_lambda_powertools/shared/functions.py +++ b/aws_lambda_powertools/shared/functions.py @@ -57,18 +57,15 @@ def resolve_max_age(env: str, choice: Optional[int]) -> int: @overload -def resolve_env_var_choice(env: Optional[str], choice: float) -> float: - ... +def resolve_env_var_choice(env: Optional[str], choice: float) -> float: ... @overload -def resolve_env_var_choice(env: Optional[str], choice: str) -> str: - ... +def resolve_env_var_choice(env: Optional[str], choice: str) -> str: ... @overload -def resolve_env_var_choice(env: Optional[str], choice: Optional[str]) -> str: - ... +def resolve_env_var_choice(env: Optional[str], choice: Optional[str]) -> str: ... def resolve_env_var_choice( diff --git a/aws_lambda_powertools/tracing/__init__.py b/aws_lambda_powertools/tracing/__init__.py index f45ac1fb73e..1031ae4aec6 100644 --- a/aws_lambda_powertools/tracing/__init__.py +++ b/aws_lambda_powertools/tracing/__init__.py @@ -1,7 +1,6 @@ """Tracing utility """ - from .extensions import aiohttp_trace_config from .tracer import Tracer diff --git a/aws_lambda_powertools/tracing/tracer.py b/aws_lambda_powertools/tracing/tracer.py index 3004e5505c8..b30467188f9 100644 --- a/aws_lambda_powertools/tracing/tracer.py +++ b/aws_lambda_powertools/tracing/tracer.py @@ -345,8 +345,7 @@ def decorate(event, context, **kwargs): # see #465 @overload - def capture_method(self, method: "AnyCallableT") -> "AnyCallableT": - ... # pragma: no cover + def capture_method(self, method: "AnyCallableT") -> "AnyCallableT": ... # pragma: no cover @overload def capture_method( @@ -354,8 +353,7 @@ def capture_method( method: None = None, capture_response: Optional[bool] = None, capture_error: Optional[bool] = None, - ) -> Callable[["AnyCallableT"], "AnyCallableT"]: - ... # pragma: no cover + ) -> Callable[["AnyCallableT"], "AnyCallableT"]: ... # pragma: no cover def capture_method( self, diff --git a/aws_lambda_powertools/utilities/batch/base.py b/aws_lambda_powertools/utilities/batch/base.py index a158eafdad0..569467f2248 100644 --- a/aws_lambda_powertools/utilities/batch/base.py +++ b/aws_lambda_powertools/utilities/batch/base.py @@ -339,12 +339,15 @@ def _collect_dynamodb_failures(self): return failures @overload - def _to_batch_type(self, record: dict, event_type: EventType, model: "BatchTypeModels") -> "BatchTypeModels": - ... # pragma: no cover + def _to_batch_type( + self, + record: dict, + event_type: EventType, + model: "BatchTypeModels", + ) -> "BatchTypeModels": ... # pragma: no cover @overload - def _to_batch_type(self, record: dict, event_type: EventType) -> EventSourceDataClassTypes: - ... # pragma: no cover + def _to_batch_type(self, record: dict, event_type: EventType) -> EventSourceDataClassTypes: ... # pragma: no cover def _to_batch_type(self, record: dict, event_type: EventType, model: Optional["BatchTypeModels"] = None): if model is not None: diff --git a/aws_lambda_powertools/utilities/batch/exceptions.py b/aws_lambda_powertools/utilities/batch/exceptions.py index 89659e42bf8..a3eefbb9cea 100644 --- a/aws_lambda_powertools/utilities/batch/exceptions.py +++ b/aws_lambda_powertools/utilities/batch/exceptions.py @@ -1,6 +1,7 @@ """ Batch processing exceptions """ + from __future__ import annotations import traceback diff --git a/aws_lambda_powertools/utilities/data_classes/common.py b/aws_lambda_powertools/utilities/data_classes/common.py index 41fbe5cd0de..104993deae8 100644 --- a/aws_lambda_powertools/utilities/data_classes/common.py +++ b/aws_lambda_powertools/utilities/data_classes/common.py @@ -193,7 +193,7 @@ def get_multi_value_query_string_values( self, name: str, default_values: Optional[List[str]] = None, - ) ->List[str]: + ) -> List[str]: """Get multi-value query string parameter values by name Parameters diff --git a/aws_lambda_powertools/utilities/data_masking/base.py b/aws_lambda_powertools/utilities/data_masking/base.py index c2557dcef24..5274aac3b8a 100644 --- a/aws_lambda_powertools/utilities/data_masking/base.py +++ b/aws_lambda_powertools/utilities/data_masking/base.py @@ -85,20 +85,16 @@ def decrypt( ) @overload - def erase(self, data, fields: None) -> str: - ... + def erase(self, data, fields: None) -> str: ... @overload - def erase(self, data: list, fields: list[str]) -> list[str]: - ... + def erase(self, data: list, fields: list[str]) -> list[str]: ... @overload - def erase(self, data: tuple, fields: list[str]) -> tuple[str]: - ... + def erase(self, data: tuple, fields: list[str]) -> tuple[str]: ... @overload - def erase(self, data: dict, fields: list[str]) -> dict: - ... + def erase(self, data: dict, fields: list[str]) -> dict: ... def erase(self, data: Sequence | Mapping, fields: list[str] | None = None) -> str | list[str] | tuple[str] | dict: return self._apply_action(data=data, fields=fields, action=self.provider.erase) diff --git a/aws_lambda_powertools/utilities/data_masking/provider/kms/aws_encryption_sdk.py b/aws_lambda_powertools/utilities/data_masking/provider/kms/aws_encryption_sdk.py index bbdbb0bad6f..657a812337f 100644 --- a/aws_lambda_powertools/utilities/data_masking/provider/kms/aws_encryption_sdk.py +++ b/aws_lambda_powertools/utilities/data_masking/provider/kms/aws_encryption_sdk.py @@ -105,7 +105,6 @@ def decrypt(self, data: str, provider_options: dict | None = None, **encryption_ class KMSKeyProvider: - """ The KMSKeyProvider is responsible for assembling an AWS Key Management Service (KMS) client, a caching mechanism, and a keyring for secure key management and data encryption. diff --git a/aws_lambda_powertools/utilities/idempotency/exceptions.py b/aws_lambda_powertools/utilities/idempotency/exceptions.py index 55ec662799e..27f319a5266 100644 --- a/aws_lambda_powertools/utilities/idempotency/exceptions.py +++ b/aws_lambda_powertools/utilities/idempotency/exceptions.py @@ -2,7 +2,6 @@ Idempotency errors """ - from typing import Optional, Union from aws_lambda_powertools.utilities.idempotency.persistence.datarecord import DataRecord diff --git a/aws_lambda_powertools/utilities/idempotency/idempotency.py b/aws_lambda_powertools/utilities/idempotency/idempotency.py index 94306dfa2c5..9593655b3cd 100644 --- a/aws_lambda_powertools/utilities/idempotency/idempotency.py +++ b/aws_lambda_powertools/utilities/idempotency/idempotency.py @@ -1,6 +1,7 @@ """ Primary interface for idempotent Lambda functions utility """ + import functools import logging import os diff --git a/aws_lambda_powertools/utilities/idempotency/serialization/base.py b/aws_lambda_powertools/utilities/idempotency/serialization/base.py index 45317bd0315..ba41b23dbe4 100644 --- a/aws_lambda_powertools/utilities/idempotency/serialization/base.py +++ b/aws_lambda_powertools/utilities/idempotency/serialization/base.py @@ -1,6 +1,7 @@ """ Serialization for supporting idempotency """ + from abc import ABC, abstractmethod from typing import Any, Dict diff --git a/aws_lambda_powertools/utilities/parameters/appconfig.py b/aws_lambda_powertools/utilities/parameters/appconfig.py index d5a9b7856e4..b29d256a0a0 100644 --- a/aws_lambda_powertools/utilities/parameters/appconfig.py +++ b/aws_lambda_powertools/utilities/parameters/appconfig.py @@ -2,7 +2,6 @@ AWS App Config configuration retrieval and caching utility """ - import os from typing import TYPE_CHECKING, Any, Dict, Optional, Union diff --git a/aws_lambda_powertools/utilities/parameters/base.py b/aws_lambda_powertools/utilities/parameters/base.py index 710634636d0..5ce06589613 100644 --- a/aws_lambda_powertools/utilities/parameters/base.py +++ b/aws_lambda_powertools/utilities/parameters/base.py @@ -1,6 +1,7 @@ """ Base for Parameter providers """ + from __future__ import annotations import base64 @@ -372,8 +373,7 @@ def transform_value( transform: TransformOptions, raise_on_transform_error: bool = False, key: str = "", -) -> Dict[str, Any]: - ... +) -> Dict[str, Any]: ... @overload @@ -382,8 +382,7 @@ def transform_value( transform: TransformOptions, raise_on_transform_error: bool = False, key: str = "", -) -> Optional[Union[str, bytes, Dict[str, Any]]]: - ... +) -> Optional[Union[str, bytes, Dict[str, Any]]]: ... def transform_value( diff --git a/aws_lambda_powertools/utilities/parameters/dynamodb.py b/aws_lambda_powertools/utilities/parameters/dynamodb.py index d6c82fd3293..e008e3b62db 100644 --- a/aws_lambda_powertools/utilities/parameters/dynamodb.py +++ b/aws_lambda_powertools/utilities/parameters/dynamodb.py @@ -2,7 +2,6 @@ Amazon DynamoDB parameter retrieval and caching utility """ - from typing import TYPE_CHECKING, Dict, Optional import boto3 diff --git a/aws_lambda_powertools/utilities/parameters/secrets.py b/aws_lambda_powertools/utilities/parameters/secrets.py index dc7bc2b0053..beb4bb80846 100644 --- a/aws_lambda_powertools/utilities/parameters/secrets.py +++ b/aws_lambda_powertools/utilities/parameters/secrets.py @@ -2,7 +2,6 @@ AWS Secrets Manager parameter retrieval and caching utility """ - import os from typing import TYPE_CHECKING, Any, Dict, Optional, Union diff --git a/aws_lambda_powertools/utilities/parameters/ssm.py b/aws_lambda_powertools/utilities/parameters/ssm.py index 7df0e66c027..1be07e7c9f0 100644 --- a/aws_lambda_powertools/utilities/parameters/ssm.py +++ b/aws_lambda_powertools/utilities/parameters/ssm.py @@ -1,6 +1,7 @@ """ AWS SSM Parameter retrieval and caching utility """ + from __future__ import annotations import os @@ -553,8 +554,7 @@ def get_parameter( force_fetch: bool = False, max_age: Optional[int] = None, **sdk_options, -) -> str: - ... +) -> str: ... @overload @@ -565,8 +565,7 @@ def get_parameter( force_fetch: bool = False, max_age: Optional[int] = None, **sdk_options, -) -> dict: - ... +) -> dict: ... @overload @@ -577,8 +576,7 @@ def get_parameter( force_fetch: bool = False, max_age: Optional[int] = None, **sdk_options, -) -> Union[str, dict, bytes]: - ... +) -> Union[str, dict, bytes]: ... @overload @@ -589,8 +587,7 @@ def get_parameter( force_fetch: bool = False, max_age: Optional[int] = None, **sdk_options, -) -> bytes: - ... +) -> bytes: ... def get_parameter( @@ -683,8 +680,7 @@ def get_parameters( max_age: Optional[int] = None, raise_on_transform_error: bool = False, **sdk_options, -) -> Dict[str, str]: - ... +) -> Dict[str, str]: ... @overload @@ -697,8 +693,7 @@ def get_parameters( max_age: Optional[int] = None, raise_on_transform_error: bool = False, **sdk_options, -) -> Dict[str, dict]: - ... +) -> Dict[str, dict]: ... @overload @@ -711,8 +706,7 @@ def get_parameters( max_age: Optional[int] = None, raise_on_transform_error: bool = False, **sdk_options, -) -> Dict[str, bytes]: - ... +) -> Dict[str, bytes]: ... @overload @@ -725,8 +719,7 @@ def get_parameters( max_age: Optional[int] = None, raise_on_transform_error: bool = False, **sdk_options, -) -> Union[Dict[str, bytes], Dict[str, dict], Dict[str, str]]: - ... +) -> Union[Dict[str, bytes], Dict[str, dict], Dict[str, str]]: ... def get_parameters( @@ -825,8 +818,7 @@ def get_parameters_by_name( decrypt: Optional[bool] = None, max_age: Optional[int] = None, raise_on_error: bool = True, -) -> Dict[str, str]: - ... +) -> Dict[str, str]: ... @overload @@ -836,8 +828,7 @@ def get_parameters_by_name( decrypt: Optional[bool] = None, max_age: Optional[int] = None, raise_on_error: bool = True, -) -> Dict[str, bytes]: - ... +) -> Dict[str, bytes]: ... @overload @@ -847,8 +838,7 @@ def get_parameters_by_name( decrypt: Optional[bool] = None, max_age: Optional[int] = None, raise_on_error: bool = True, -) -> Dict[str, Dict[str, Any]]: - ... +) -> Dict[str, Dict[str, Any]]: ... @overload @@ -858,8 +848,7 @@ def get_parameters_by_name( decrypt: Optional[bool] = None, max_age: Optional[int] = None, raise_on_error: bool = True, -) -> Union[Dict[str, str], Dict[str, dict]]: - ... +) -> Union[Dict[str, str], Dict[str, dict]]: ... def get_parameters_by_name( diff --git a/aws_lambda_powertools/utilities/parser/__init__.py b/aws_lambda_powertools/utilities/parser/__init__.py index 1bc67934b13..ad19168bb29 100644 --- a/aws_lambda_powertools/utilities/parser/__init__.py +++ b/aws_lambda_powertools/utilities/parser/__init__.py @@ -1,5 +1,6 @@ """Advanced event_parser utility """ + from . import envelopes from .envelopes import BaseEnvelope from .parser import event_parser, parse diff --git a/aws_lambda_powertools/utilities/parser/parser.py b/aws_lambda_powertools/utilities/parser/parser.py index 91d2763f4ec..a9a89db8a6a 100644 --- a/aws_lambda_powertools/utilities/parser/parser.py +++ b/aws_lambda_powertools/utilities/parser/parser.py @@ -104,13 +104,11 @@ def handler(event: Order, context: LambdaContext): @overload -def parse(event: Dict[str, Any], model: Type[Model]) -> Model: - ... # pragma: no cover +def parse(event: Dict[str, Any], model: Type[Model]) -> Model: ... # pragma: no cover @overload -def parse(event: Dict[str, Any], model: Type[Model], envelope: Type[Envelope]) -> Model: - ... # pragma: no cover +def parse(event: Dict[str, Any], model: Type[Model], envelope: Type[Envelope]) -> Model: ... # pragma: no cover def parse(event: Dict[str, Any], model: Type[Model], envelope: Optional[Type[Envelope]] = None): diff --git a/aws_lambda_powertools/utilities/serialization.py b/aws_lambda_powertools/utilities/serialization.py index ef76eec70e2..cb5289ae4af 100644 --- a/aws_lambda_powertools/utilities/serialization.py +++ b/aws_lambda_powertools/utilities/serialization.py @@ -1,4 +1,5 @@ """Standalone functions to serialize/deserialize common data structures""" + import base64 import json from typing import Any, Callable diff --git a/tests/functional/event_handler/test_api_gateway.py b/tests/functional/event_handler/test_api_gateway.py index 9c98faff062..fa166bac77e 100644 --- a/tests/functional/event_handler/test_api_gateway.py +++ b/tests/functional/event_handler/test_api_gateway.py @@ -716,16 +716,13 @@ def test_cors_preflight(): app = ApiGatewayResolver(cors=CORSConfig()) @app.get("/foo") - def foo_cors(): - ... + def foo_cors(): ... @app.route(method="delete", rule="/foo") - def foo_delete_cors(): - ... + def foo_delete_cors(): ... @app.post("/foo", cors=False) - def post_no_cors(): - ... + def post_no_cors(): ... # WHEN calling the handler result = app({"path": "/foo", "httpMethod": "OPTIONS", "headers": {"Origin": "http://example.org"}}, None) @@ -756,8 +753,7 @@ def custom_preflight(): ) @app.route(method="CUSTOM", rule="/some-call", cors=True) - def custom_method(): - ... + def custom_method(): ... # AND the request includes an origin headers = {"Origin": "https://example.org"} @@ -1094,8 +1090,7 @@ def pay_foo(): raise ValueError("should not be matching") @app.get("/foo") - def foo(): - ... + def foo(): ... # WHEN calling handler response = app({"httpMethod": "GET", "path": path}, None) @@ -1116,8 +1111,7 @@ def test_remove_prefix_by_regex(path: str): app = ApiGatewayResolver(strip_prefixes=[re.compile(r"/(dev|stg)")]) @app.get("/foo") - def foo(): - ... + def foo(): ... response = app({"httpMethod": "GET", "path": path}, None) @@ -1128,8 +1122,7 @@ def test_empty_path_when_using_regexes(): app = ApiGatewayResolver(strip_prefixes=[re.compile(r"/(dev|stg)")]) @app.get("/") - def foo(): - ... + def foo(): ... response = app({"httpMethod": "GET", "path": "/dev"}, None) @@ -1151,8 +1144,7 @@ def test_ignore_invalid(prefix): app = ApiGatewayResolver(strip_prefixes=prefix) @app.get("/foo/status") - def foo(): - ... + def foo(): ... # WHEN calling handler response = app({"httpMethod": "GET", "path": "/foo/status"}, None) @@ -1473,8 +1465,7 @@ def handle_validation_error(ex: RequestValidationError): ) @app.get("/my/path") - def get_lambda(param: int): - ... + def get_lambda(param: int): ... # WHEN calling the event handler # AND a RequestValidationError is raised @@ -1502,8 +1493,7 @@ def handle_validation_error(ex: RequestValidationError): ) @app.get("/my/path") - def get_lambda(param: int): - ... + def get_lambda(param: int): ... # WHEN calling the event handler # AND a RequestValidationError is raised @@ -1519,8 +1509,7 @@ def test_data_validation_error(): app = ApiGatewayResolver(enable_validation=True) @app.get("/my/path") - def get_lambda(param: int): - ... + def get_lambda(param: int): ... # WHEN calling the event handler # AND a RequestValidationError is raised diff --git a/tests/functional/test_logger.py b/tests/functional/test_logger.py index fc6e5b98ee8..d9e3b8d4e37 100644 --- a/tests/functional/test_logger.py +++ b/tests/functional/test_logger.py @@ -575,8 +575,7 @@ def test_logger_set_correlation_id_path_custom_functions(lambda_context, stdout, logger = Logger(service=service_name, stream=stdout) @logger.inject_lambda_context(correlation_id_path="Records[*].powertools_json(body).id") - def handler(event, context): - ... + def handler(event, context): ... # WHEN handler is called request_id = "xxx-111-222" @@ -719,8 +718,7 @@ def handler(event, context): def test_logger_custom_formatter_has_standard_and_custom_keys(stdout, service_name, lambda_context): - class CustomFormatter(LambdaPowertoolsFormatter): - ... + class CustomFormatter(LambdaPowertoolsFormatter): ... # GIVEN a Logger is initialized with a custom formatter logger = Logger(service=service_name, stream=stdout, logger_formatter=CustomFormatter(), my_key="value") diff --git a/tests/functional/test_logger_powertools_formatter.py b/tests/functional/test_logger_powertools_formatter.py index 62f3f36c025..b9113485a47 100644 --- a/tests/functional/test_logger_powertools_formatter.py +++ b/tests/functional/test_logger_powertools_formatter.py @@ -1,4 +1,5 @@ """aws_lambda_logging tests.""" + import io import json import os diff --git a/tests/functional/test_utilities_parameters.py b/tests/functional/test_utilities_parameters.py index 2ee544f87c8..5ff043f7ed3 100644 --- a/tests/functional/test_utilities_parameters.py +++ b/tests/functional/test_utilities_parameters.py @@ -655,8 +655,7 @@ class TestProvider(BaseProvider): def _get(self, name: str, **kwargs) -> str: return mock_value - def _get_multiple(self, path: str, **kwargs) -> Dict[str, str]: - ... + def _get_multiple(self, path: str, **kwargs) -> Dict[str, str]: ... monkeypatch.setitem(parameters.base.DEFAULT_PROVIDERS, "ssm", TestProvider()) monkeypatch.setitem(parameters.base.DEFAULT_PROVIDERS, "secrets", TestProvider()) diff --git a/tests/unit/parser/test_kinesis.py b/tests/unit/parser/test_kinesis.py index e8b1ae87378..730759f1230 100644 --- a/tests/unit/parser/test_kinesis.py +++ b/tests/unit/parser/test_kinesis.py @@ -94,8 +94,7 @@ def test_kinesis_stream_event_cloudwatch_logs_data_extraction(): def test_kinesis_stream_event_cloudwatch_logs_data_extraction_fails_with_custom_model(): # GIVEN a custom model replaces Kinesis Record Data bytes - class DummyModel(BaseModel): - ... + class DummyModel(BaseModel): ... raw_event = load_event("kinesisStreamCloudWatchLogsEvent.json") stream_data = KinesisDataStreamModel(**raw_event) diff --git a/tests/unit/test_tracing.py b/tests/unit/test_tracing.py index fdb7310495b..7b09bcde885 100644 --- a/tests/unit/test_tracing.py +++ b/tests/unit/test_tracing.py @@ -48,8 +48,7 @@ def in_subsegment(self, *args, **kwargs): def patch(self, *args, **kwargs): return self.patch_mock(*args, **kwargs) - def patch_all(self): - ... + def patch_all(self): ... return CustomProvider