chore: Upgrade ruff to 0.0.259 and enable C4 rules (#3066)

Author: aahung

bin/sam-translate.py

@@ -116,7 +116,7 @@ def transform_template(input_file_path, output_file_path):  # type: ignore[no-un
     except InvalidDocumentException as e:
         error_message = reduce(lambda message, error: message + " " + error.message, e.causes, e.message)
         LOG.error(error_message)
-        errors = map(lambda cause: cause.message, e.causes)
+        errors = (cause.message for cause in e.causes)
         LOG.error(errors)
 
 

requirements/dev.txt

@@ -4,7 +4,7 @@ pytest-xdist>=2.5,<4
 pytest-env>=0.6,<1
 pytest-rerunfailures>=9.1,<12
 pyyaml~=6.0
-ruff==0.0.254  # loose the requirement once it is more stable
+ruff==0.0.259  # loose the requirement once it is more stable
 
 # Test requirements
 pytest>=6.2,<8

ruff.toml

@@ -20,6 +20,7 @@ select = [
     "RUF", # Ruff-specific rules
     "YTT", # flake8-2020
     "UP", # pyupgrade
+    "C4", # flake8-comprehensions
 ]
 
 # Mininal python version we support is 3.7

samtranslator/metrics/metrics.py

@@ -59,7 +59,7 @@ def _flush_metrics(self, namespace, metrics):  # type: ignore[no-untyped-def]
         """
         Internal method to publish all provided metrics to cloudwatch, please make sure that array size of metrics is <= 20.
         """
-        metric_data = list(map(lambda m: m.get_metric_data(), metrics))  # type: ignore[no-any-return]
+        metric_data = [m.get_metric_data() for m in metrics]
         try:
             if metric_data:
                 self.cloudwatch_client.put_metric_data(Namespace=namespace, MetricData=metric_data)

samtranslator/model/update_policy.py

@@ -27,10 +27,10 @@ def to_dict(self) -> Dict[str, Dict[str, Any]]:
         :return: a dict that can be used as part of a cloudformation template
         """
         dict_with_nones = self._asdict()
-        codedeploy_lambda_alias_update_dict = dict(
+        codedeploy_lambda_alias_update_dict = {
             # Type ignore next line. `ref(None)` is not a typical usage of `ref()`.
-            (k, v)
+            k: v
             for k, v in dict_with_nones.items()
             if v != ref(None) and v is not None  # type: ignore
-        )
+        }
         return {"CodeDeployLambdaAliasUpdate": codedeploy_lambda_alias_update_dict}

samtranslator/plugins/api/implicit_api_plugin.py

@@ -371,7 +371,7 @@ def _add_combined_condition_to_template(self, template_dict, condition_name, con
             raise ValueError("conditions_to_combine must have at least 2 conditions")
 
         template_conditions = template_dict.setdefault("Conditions", {})
-        new_template_conditions = make_combined_condition(sorted(list(conditions_to_combine)), condition_name)
+        new_template_conditions = make_combined_condition(sorted(conditions_to_combine), condition_name)
         # make_combined_condition() won't return None if `conditions_to_combine` has at least 2 elements,
         # which is checked above.
         # TODO: refactor the code to make the length check in one place only.

samtranslator/swagger/swagger.py

@@ -622,7 +622,7 @@ def set_path_default_apikey_required(self, path: str, required_options_api_key:
         """
 
         for method_name, method_definition in self.iter_on_all_methods_for_path(path):  # type: ignore[no-untyped-call]
-            apikey_security_names = set(["api_key", "api_key_false"])
+            apikey_security_names = {"api_key", "api_key_false"}
             existing_non_apikey_security = []
             existing_apikey_security = []
             apikey_security = []

samtranslator/translator/managed_policy_translator.py

@@ -28,7 +28,7 @@ def _load_policies_from_iam(self) -> None:
         name_to_arn_map: Dict[str, str] = {}
 
         for page in page_iterator:
-            name_to_arn_map.update(map(lambda x: (x["PolicyName"], x["Arn"]), page["Policies"]))
+            name_to_arn_map.update((x["PolicyName"], x["Arn"]) for x in page["Policies"])
 
         LOG.info("Finished loading policies from IAM.")
         self._policy_map = name_to_arn_map