chore: Upgrade black to 23.1.0 (depending on click 8) and format files (#2892)

Author: aahung

integration/helpers/deployer/deployer.py

@@ -265,7 +265,6 @@ def wait_for_changeset(self, changeset_id, stack_name):
         try:
             waiter.wait(ChangeSetName=changeset_id, StackName=stack_name, WaiterConfig=waiter_config)
         except botocore.exceptions.WaiterError as ex:
-
             LOG.error("Waiter exception waiting for changeset", exc_info=ex)
 
             resp = ex.last_response

integration/helpers/deployer/utils/artifact_exporter.py

@@ -30,9 +30,7 @@
 
 
 def parse_s3_url(url, bucket_name_property="Bucket", object_key_property="Key", version_property=None):
-
     if isinstance(url, str) and url.startswith("s3://"):
-
         parsed = urlparse(url)
         query = parse_qs(parsed.query)
 

requirements/dev.txt

@@ -11,7 +11,7 @@ pytest~=6.2.5
 parameterized~=0.7.4
 
 # Integration tests
-click~=7.1
+click~=8.0
 dateparser~=0.7
 boto3>=1.23,<2
 tenacity~=7.0.0
@@ -20,7 +20,7 @@ tenacity~=7.0.0
 requests~=2.25.0
 
 # formatter
-black==20.8b1
+black==23.1.0
 ruamel.yaml==0.17.21  # It can parse yaml while perserving comments
 
 # type check

samtranslator/intrinsics/resource_refs.py

@@ -9,7 +9,6 @@ class SupportedResourceReferences:
     """
 
     def __init__(self) -> None:
-
         # This is a two level map like:
         # { "LogicalId": {"Property": "Value"} }
         self._refs: Dict[str, Dict[str, Any]] = {}

samtranslator/model/api/api_generator.py

@@ -140,7 +140,6 @@ def _set_condition(self, condition, template_conditions):  # type: ignore[no-unt
             return
 
         if condition and condition not in self.conditions:
-
             if template_conditions is None:
                 raise InvalidTemplateException(
                     "Can't have condition without having 'Conditions' section in the template"
@@ -641,7 +640,6 @@ def _add_cors(self) -> None:
             # Just set Origin property. Others will be defaults
             properties = CorsProperties(AllowOrigin=self.cors)  # type: ignore[call-arg]
         elif isinstance(self.cors, dict):
-
             # Make sure keys in the dict are recognized
             if not all(key in CorsProperties._fields for key in self.cors):
                 raise InvalidResourceException(self.logical_id, INVALID_ERROR)

samtranslator/model/eventsources/push.py

@@ -439,7 +439,6 @@ def _inject_notification_configuration(self, function, bucket, bucket_id):  # ty
 
         event_mappings = []
         for event_type in event_types:
-
             lambda_event = copy.deepcopy(base_event_mapping)
             lambda_event["Event"] = event_type
             if CONDITION in function.resource_attributes:
@@ -652,13 +651,11 @@ def resources_to_link(self, resources):  # type: ignore[no-untyped-def]
         explicit_api = None
         rest_api_id = self.get_rest_api_id_string(self.RestApiId)
         if isinstance(rest_api_id, str):
-
             if (
                 rest_api_id in resources
                 and "Properties" in resources[rest_api_id]
                 and "StageName" in resources[rest_api_id]["Properties"]
             ):
-
                 explicit_api = resources[rest_api_id]["Properties"]
                 permitted_stage = explicit_api["StageName"]
 
@@ -844,7 +841,6 @@ def _add_swagger_integration(  # type: ignore[no-untyped-def] # noqa: too-many-s
 
                 # Checking if any of the fields are defined as it can be false we are checking if the field are not None
                 if validate_body is not None or validate_parameters is not None:
-
                     # as we are setting two different fields we are here setting as default False
                     # In case one of them are not defined
                     validate_body = False if validate_body is None else validate_body
@@ -869,14 +865,11 @@ def _add_swagger_integration(  # type: ignore[no-untyped-def] # noqa: too-many-s
                     )
 
         if self.RequestParameters:
-
             default_value = {"Required": False, "Caching": False}
 
             parameters = []
             for parameter in self.RequestParameters:
-
                 if isinstance(parameter, dict):
-
                     parameter_name, parameter_value = next(iter(parameter.items()))
 
                     if not re.match(r"method\.request\.(querystring|path|header)\.", parameter_name):

samtranslator/model/intrinsics.py

@@ -146,7 +146,6 @@ def is_intrinsic(_input: Any) -> bool:
     """
 
     if _input is not None and isinstance(_input, dict) and len(_input) == 1:
-
         key: str = list(_input.keys())[0]
         return key == "Ref" or key == "Condition" or key.startswith("Fn::")
 

samtranslator/model/preferences/deployment_preference_collection.py

@@ -278,7 +278,7 @@ def _replace_deployment_types(self, value, key=None):  # type: ignore[no-untyped
                 value[i] = self._replace_deployment_types(v)  # type: ignore[no-untyped-call]
             return value
         if is_intrinsic(value):
-            for (k, v) in value.items():
+            for k, v in value.items():
                 value[k] = self._replace_deployment_types(v, k)  # type: ignore[no-untyped-call]
             return value
         if value in CODEDEPLOY_PREDEFINED_CONFIGURATIONS_LIST:

samtranslator/model/role_utils/role_constructor.py

@@ -44,9 +44,7 @@ def construct_role_for_resource(  # type: ignore[no-untyped-def] # noqa: too-man
 
     for index, policy_entry in enumerate(resource_policies.get()):
         if policy_entry.type is PolicyTypes.POLICY_STATEMENT:
-
             if is_intrinsic_if(policy_entry.data):
-
                 intrinsic_if = policy_entry.data
                 then_statement = intrinsic_if["Fn::If"][1]
                 else_statement = intrinsic_if["Fn::If"][2]
@@ -76,7 +74,6 @@ def construct_role_for_resource(  # type: ignore[no-untyped-def] # noqa: too-man
                 )
 
         elif policy_entry.type is PolicyTypes.MANAGED_POLICY:
-
             # There are three options:
             #   Managed Policy Name (string): Try to convert to Managed Policy ARN
             #   Managed Policy Arn (string): Insert it directly into the list

samtranslator/model/stepfunctions/events.py

@@ -316,13 +316,11 @@ def resources_to_link(self, resources):  # type: ignore[no-untyped-def]
         explicit_api = None
         rest_api_id = PushApi.get_rest_api_id_string(self.RestApiId)
         if isinstance(rest_api_id, str):
-
             if (
                 rest_api_id in resources
                 and "Properties" in resources[rest_api_id]
                 and "StageName" in resources[rest_api_id]["Properties"]
             ):
-
                 explicit_api = resources[rest_api_id]["Properties"]
                 permitted_stage = explicit_api["StageName"]