From 45bb26420bdec2fdd9588d2e82c6254090de1a8c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Mar 2024 17:32:17 +0000 Subject: [PATCH 1/2] chore(deps-dev): bump black from 23.10.1 to 24.3.0 in /requirements Bumps [black](https://github.com/psf/black) from 23.10.1 to 24.3.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/23.10.1...24.3.0) --- updated-dependencies: - dependency-name: black dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- requirements/dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index de81b0cf7..79952c65e 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -19,7 +19,7 @@ tenacity~=8.0 requests~=2.28 # formatter -black==23.10.1 +black==24.3.0 ruamel.yaml==0.17.21 # It can parse yaml while perserving comments # type check From 96a88ad51daff41e7e870f67bf865ccaaf42bebb Mon Sep 17 00:00:00 2001 From: Jacob Fuss Date: Mon, 25 Mar 2024 15:04:54 -0500 Subject: [PATCH 2/2] chore(format): Run make format with updated black version --- bin/_file_formatter.py | 1 + bin/public_interface.py | 16 +++++++++------- integration/helpers/deployer/deployer.py | 6 +++--- integration/helpers/deployer/utils/colors.py | 1 + integration/helpers/deployer/utils/retry.py | 1 + .../helpers/deployer/utils/table_print.py | 1 + integration/helpers/s3_uploader.py | 1 + samtranslator/internal/deprecation_control.py | 1 + samtranslator/metrics/method_decorator.py | 9 +++++---- samtranslator/model/__init__.py | 1 + samtranslator/model/api/http_api_generator.py | 4 +--- samtranslator/model/architecture.py | 1 + samtranslator/model/sam_resources.py | 1 + samtranslator/model/types.py | 1 + samtranslator/open_api/base_editor.py | 1 + samtranslator/utils/types.py | 1 + samtranslator/validator/value_validator.py | 1 + tests/openapi/test_openapi.py | 2 +- tests/translator/test_translator.py | 12 ++++++------ 19 files changed, 38 insertions(+), 24 deletions(-) diff --git a/bin/_file_formatter.py b/bin/_file_formatter.py index 33bdea4d7..7e092b234 100644 --- a/bin/_file_formatter.py +++ b/bin/_file_formatter.py @@ -1,4 +1,5 @@ """Formatter base class for JSONFormatter and YamlFormatter.""" + import argparse import os import sys diff --git a/bin/public_interface.py b/bin/public_interface.py index 8fd6c9928..7c4788939 100755 --- a/bin/public_interface.py +++ b/bin/public_interface.py @@ -101,13 +101,15 @@ def _print(signature: Dict[str, inspect.Signature], variables: Set[str]) -> None result: Dict[str, Any] = {"routines": {}, "variables": sorted(variables)} for key, value in signature.items(): result["routines"][key] = [ - { - "name": parameter.name, - "kind": parameter.kind.name, - "default": parameter.default, - } - if parameter.default != inspect.Parameter.empty - else {"name": parameter.name, "kind": parameter.kind.name} + ( + { + "name": parameter.name, + "kind": parameter.kind.name, + "default": parameter.default, + } + if parameter.default != inspect.Parameter.empty + else {"name": parameter.name, "kind": parameter.kind.name} + ) for parameter in value.parameters.values() ] print(json.dumps(result, indent=2, sort_keys=True)) diff --git a/integration/helpers/deployer/deployer.py b/integration/helpers/deployer/deployer.py index 7e7c60ec9..c8073f512 100644 --- a/integration/helpers/deployer/deployer.py +++ b/integration/helpers/deployer/deployer.py @@ -208,9 +208,9 @@ def describe_changeset(self, change_set_id, stack_name, **kwargs): { "LogicalResourceId": resource_props.get("LogicalResourceId"), "ResourceType": resource_props.get("ResourceType"), - "Replacement": "N/A" - if resource_props.get("Replacement") is None - else resource_props.get("Replacement"), + "Replacement": ( + "N/A" if resource_props.get("Replacement") is None else resource_props.get("Replacement") + ), } ) diff --git a/integration/helpers/deployer/utils/colors.py b/integration/helpers/deployer/utils/colors.py index 3e1f90d0e..e97e395b3 100644 --- a/integration/helpers/deployer/utils/colors.py +++ b/integration/helpers/deployer/utils/colors.py @@ -2,6 +2,7 @@ Wrapper to generated colored messages for printing in Terminal This was ported over from the sam-cli repo """ + from typing import Dict, Literal SupportedColor = Literal["red", "green", "yellow"] diff --git a/integration/helpers/deployer/utils/retry.py b/integration/helpers/deployer/utils/retry.py index 6e3fe357c..d0cd85bdf 100644 --- a/integration/helpers/deployer/utils/retry.py +++ b/integration/helpers/deployer/utils/retry.py @@ -1,6 +1,7 @@ """ Retry decorator to retry decorated function based on Exception with exponential backoff and number of attempts built-in. """ + import math import random import time diff --git a/integration/helpers/deployer/utils/table_print.py b/integration/helpers/deployer/utils/table_print.py index 8c6b23110..7fc20b33c 100644 --- a/integration/helpers/deployer/utils/table_print.py +++ b/integration/helpers/deployer/utils/table_print.py @@ -2,6 +2,7 @@ Utilities for table pretty printing This was ported over from the sam-cli repo """ + import shutil import textwrap from functools import wraps diff --git a/integration/helpers/s3_uploader.py b/integration/helpers/s3_uploader.py index 125d1fc75..4b5de217b 100644 --- a/integration/helpers/s3_uploader.py +++ b/integration/helpers/s3_uploader.py @@ -1,6 +1,7 @@ """ Client for uploading files to s3 """ + import logging from typing import Any diff --git a/samtranslator/internal/deprecation_control.py b/samtranslator/internal/deprecation_control.py index b75522ad9..dfb7702f7 100644 --- a/samtranslator/internal/deprecation_control.py +++ b/samtranslator/internal/deprecation_control.py @@ -9,6 +9,7 @@ If external packages import deprecated interfaces, it is their responsibility to detect and remove them. """ + import warnings from functools import wraps from typing import Callable, Optional, TypeVar diff --git a/samtranslator/metrics/method_decorator.py b/samtranslator/metrics/method_decorator.py index 6ce388fa8..fa152b1b7 100644 --- a/samtranslator/metrics/method_decorator.py +++ b/samtranslator/metrics/method_decorator.py @@ -1,6 +1,7 @@ """ Method decorator for execution latency collection """ + import functools import logging from datetime import datetime @@ -84,13 +85,13 @@ def _send_cw_metric(prefix, name, execution_time_ms, func, args): # type: ignor @overload def cw_timer( *, name: Optional[str] = None, prefix: Optional[str] = None -) -> Callable[[Callable[_PT, _RT]], Callable[_PT, _RT]]: - ... +) -> Callable[[Callable[_PT, _RT]], Callable[_PT, _RT]]: ... @overload -def cw_timer(_func: Callable[_PT, _RT], name: Optional[str] = None, prefix: Optional[str] = None) -> Callable[_PT, _RT]: - ... +def cw_timer( + _func: Callable[_PT, _RT], name: Optional[str] = None, prefix: Optional[str] = None +) -> Callable[_PT, _RT]: ... def cw_timer( diff --git a/samtranslator/model/__init__.py b/samtranslator/model/__init__.py index 179f6c72b..e47131793 100644 --- a/samtranslator/model/__init__.py +++ b/samtranslator/model/__init__.py @@ -1,4 +1,5 @@ """ CloudFormation Resource serialization, deserialization, and validation """ + import inspect import re from abc import ABC, ABCMeta, abstractmethod diff --git a/samtranslator/model/api/http_api_generator.py b/samtranslator/model/api/http_api_generator.py index b2e9f2ec5..f97199037 100644 --- a/samtranslator/model/api/http_api_generator.py +++ b/samtranslator/model/api/http_api_generator.py @@ -777,9 +777,7 @@ def _add_title(self) -> None: self.definition_body = open_api_editor.openapi @cw_timer(prefix="Generator", name="HttpApi") - def to_cloudformation( - self, route53_record_set_groups: Dict[str, Route53RecordSetGroup] - ) -> Tuple[ + def to_cloudformation(self, route53_record_set_groups: Dict[str, Route53RecordSetGroup]) -> Tuple[ ApiGatewayV2HttpApi, Optional[ApiGatewayV2Stage], Optional[ApiGatewayV2DomainName], diff --git a/samtranslator/model/architecture.py b/samtranslator/model/architecture.py index 12a4c4be9..1a4946ddc 100644 --- a/samtranslator/model/architecture.py +++ b/samtranslator/model/architecture.py @@ -1,5 +1,6 @@ """ Enum for determining type of architectures for Lambda Function. """ + ARM64 = "arm64" X86_64 = "x86_64" diff --git a/samtranslator/model/sam_resources.py b/samtranslator/model/sam_resources.py index 4aeed875c..e7b32a88b 100644 --- a/samtranslator/model/sam_resources.py +++ b/samtranslator/model/sam_resources.py @@ -1,4 +1,5 @@ """ SAM macro definitions """ + import copy from contextlib import suppress from typing import Any, Callable, Dict, List, Literal, Optional, Tuple, Union, cast diff --git a/samtranslator/model/types.py b/samtranslator/model/types.py index 32b3c7c4a..5c86b8b15 100644 --- a/samtranslator/model/types.py +++ b/samtranslator/model/types.py @@ -8,6 +8,7 @@ the Permissions property is an ARN or list of ARNs. In this situation, we validate that the Permissions property is either a string or a list of strings, but do not validate whether the string(s) are valid IAM policy ARNs. """ + from typing import Any, Callable, Type, Union import samtranslator.model.exceptions diff --git a/samtranslator/open_api/base_editor.py b/samtranslator/open_api/base_editor.py index 70d523d00..e5a9ef26e 100644 --- a/samtranslator/open_api/base_editor.py +++ b/samtranslator/open_api/base_editor.py @@ -1,4 +1,5 @@ """Base class for OpenApiEditor and SwaggerEditor.""" + import re from typing import Any, Dict, Iterator, List, Optional, Union diff --git a/samtranslator/utils/types.py b/samtranslator/utils/types.py index 5fd723d6f..88d9db614 100644 --- a/samtranslator/utils/types.py +++ b/samtranslator/utils/types.py @@ -1,4 +1,5 @@ """Type related utils.""" + from typing import Any, Dict, TypeVar, Union T = TypeVar("T") diff --git a/samtranslator/validator/value_validator.py b/samtranslator/validator/value_validator.py index ae1b62665..699c86527 100644 --- a/samtranslator/validator/value_validator.py +++ b/samtranslator/validator/value_validator.py @@ -1,4 +1,5 @@ """A plug-able validator to help raise exception when some value is unexpected.""" + from typing import Any, Dict, Generic, Optional, TypeVar, cast from samtranslator.model.exceptions import ( diff --git a/tests/openapi/test_openapi.py b/tests/openapi/test_openapi.py index 02a02fba9..0ee3f362d 100644 --- a/tests/openapi/test_openapi.py +++ b/tests/openapi/test_openapi.py @@ -342,7 +342,7 @@ class TestOpenApiEditor_is_valid(TestCase): [ param(OpenApiEditor.gen_skeleton()), # Dict can contain any other unrecognized properties - param({"openapi": "3.1.1", "paths": {}, "foo": "bar", "baz": "bar"}) + param({"openapi": "3.1.1", "paths": {}, "foo": "bar", "baz": "bar"}), # TODO check and update the regex accordingly # Fails for this: param({"openapi": "3.1.10", "paths": {}, "foo": "bar", "baz": "bar"}) ] diff --git a/tests/translator/test_translator.py b/tests/translator/test_translator.py index 326086aa8..8e7e95b01 100644 --- a/tests/translator/test_translator.py +++ b/tests/translator/test_translator.py @@ -165,13 +165,13 @@ def _compare_transform(self, manifest, expected, partition, region): "AWSLambdaRole": f"arn:{partition}:iam::aws:policy/service-role/AWSLambdaRole", } if partition == "aws": - mock_policy_loader.load.return_value[ - "AWSXrayWriteOnlyAccess" - ] = "arn:aws:iam::aws:policy/AWSXrayWriteOnlyAccess" + mock_policy_loader.load.return_value["AWSXrayWriteOnlyAccess"] = ( + "arn:aws:iam::aws:policy/AWSXrayWriteOnlyAccess" + ) else: - mock_policy_loader.load.return_value[ - "AWSXRayDaemonWriteAccess" - ] = f"arn:{partition}:iam::aws:policy/AWSXRayDaemonWriteAccess" + mock_policy_loader.load.return_value["AWSXRayDaemonWriteAccess"] = ( + f"arn:{partition}:iam::aws:policy/AWSXRayDaemonWriteAccess" + ) output_fragment = transform(manifest, parameter_values, mock_policy_loader)