Admin: Enable additional Ruff rules (E, F, G, W) (#9484)

Author: bblommers

moto/batch/models.py

@@ -679,7 +679,9 @@ def run(self) -> None:
         try:
             import docker
         except ImportError as err:
-            logger.error(f"Failed to run AWS Batch container {self.name}. Error {err}")
+            logger.error(
+                "Failed to run AWS Batch container %s. Error %s", self.name, err
+            )
             self._mark_stopped(success=False)
             return
 
@@ -929,13 +931,15 @@ def run(self) -> None:
 
                 except Exception as err:
                     logger.error(
-                        f"Failed to run AWS Batch container {self.name}. Error {err}"
+                        "Failed to run AWS Batch container %s. Error %s", self.name, err
                     )
                     self._mark_stopped(success=False)
 
             self._mark_stopped(success=True)
         except Exception as err:
-            logger.error(f"Failed to run AWS Batch container {self.name}. Error {err}")
+            logger.error(
+                "Failed to run AWS Batch container %s. Error %s", self.name, err
+            )
             self._mark_stopped(success=False)
         finally:
             for container in containers:
@@ -991,7 +995,9 @@ def _wait_for_dependencies(self) -> bool:
                         successful_dependencies.add(dependent_id)
                     if dependent_job.status == JobStatus.FAILED:
                         logger.error(
-                            f"Terminating job {self.name} due to failed dependency {dependent_job.name}"
+                            "Terminating job %s due to failed dependency %s",
+                            self.name,
+                            dependent_job.name,
                         )
                         self._mark_stopped(success=False)
                         return False

moto/cloudfront/responses.py

@@ -354,7 +354,7 @@ def list_key_groups(self) -> TYPE_RESPONSE:
       <DefaultCacheBehavior>
         <TargetOriginId>{{ distribution.distribution_config.default_cache_behavior.target_origin_id }}</TargetOriginId>
         <TrustedSigners>
-          <Enabled>{{ 'true' if distribution.distribution_config.default_cache_behavior.trusted_signers.acct_nums|length > 0 else 'false' }}</Enabled>          
+          <Enabled>{{ 'true' if distribution.distribution_config.default_cache_behavior.trusted_signers.acct_nums|length > 0 else 'false' }}</Enabled>
           <Quantity>{{ distribution.distribution_config.default_cache_behavior.trusted_signers.acct_nums|length }}</Quantity>
           <Items>
             {% for aws_account_number  in distribution.distribution_config.default_cache_behavior.trusted_signers.acct_nums %}

moto/dynamodb/parsing/expressions.py

@@ -67,12 +67,14 @@ def _parse_target_clause(self, factory_class):
         pos = self.token_pos
         fc = factory_class.__class__.__name__
         logger.debug(
-            f"Move token pos {pos} to continue parsing with specific factory class {fc}"
+            "Move token pos %s to continue parsing with specific factory class %s",
+            pos,
+            fc,
         )
         # noinspection PyProtectedMember
         ast, token_pos = factory_class(**self._initializer_args())._parse_with_pos()
         self.target_clauses.append(ast)
-        logger.debug(f"Continue where previous parsing ended {token_pos}")
+        logger.debug("Continue where previous parsing ended: %s", token_pos)
         self.token_pos = token_pos
 
     @abstractmethod
@@ -353,7 +355,7 @@ def _parse_target_clause(self, factory_class):
             **self._initializer_args()
         )._parse_with_pos()
         self.target_nodes.append(ast)
-        logger.debug(f"Continue where previous parsing ended {self.token_pos}")
+        logger.debug("Continue where previous parsing ended: %s", self.token_pos)
 
     def _parse(self):
         self._parse_target_clause(self._operand_factory_class())
@@ -552,7 +554,7 @@ def _parse(self):
         if len(self.target_clauses) == 0:
             nc = self._nestable_class().__name__
             nepc = self._nested_expression_parser_class().__name__
-            logger.debug(f"Didn't encounter a single {nc} in {nepc}.")
+            logger.debug("Didn't encounter a single %s in %s.", nc, nepc)
             self.raise_unexpected_token()
 
         return self._create_node()

moto/iam/access_control.py

@@ -214,7 +214,12 @@ def __init__(
         action: str,
     ):
         log.debug(
-            f"Creating {self.__class__.__name__} with method={method}, path={path}, data={data}, headers={headers}"
+            "Creating %s with method=%s, path=%s, data=%s, headers=%s",
+            self.__class__.__name__,
+            method,
+            path,
+            data,
+            headers,
         )
         self.account_id = account_id
         self._method = method

moto/stepfunctions/parser/asl/component/state/exec/state_task/service/state_task_service_aws_sdk.py

@@ -56,7 +56,8 @@ def _normalise_service_error_name(service_name: str) -> str:
 
         # Revert to returning the resource's service name and log the missing binding.
         LOG.warning(
-            f"No normalised service error name for aws-sdk integration was found for service: '{service_name}'"
+            "No normalised service error name for aws-sdk integration was found for service: '%s'",
+            service_name,
         )
         return service_name
 

moto/utilities/id_generator.py

@@ -128,8 +128,9 @@ def find_id_from_sources(
             if found_id := id_source(id_source_context):
                 if found_id in existing_ids:
                     log.debug(
-                        f"Found id {found_id} for resource {id_source_context.get('resource_identifier')}, "
-                        "but a resource already exists with this id."
+                        "Found id %s for resource %s, but a resource already exists with this id.",
+                        found_id,
+                        id_source_context.get("resource_identifier"),
                     )
                 else:
                     return found_id

pyproject.toml

@@ -24,5 +24,5 @@ ignore = [
     "E501",  # Line length
     "UP007",  # Use X | Y for type annotations - should only be enabled when we support Python >= 3.10
 ]
-extend-select = ["B", "C4", "I", "T201", "T203", "UP"]
+extend-select = ["B", "C4", "E", "F", "G", "I", "T", "UP", "W"]
 

tests/test_athena/test_athena_integration.py

@@ -96,7 +96,7 @@ def test_athena_csv_result(bucket_name=None):
 k1 string,
 k2 string,
 k3 int
-) 
+)
 ROW FORMAT SERDE 'org.openx.data.jsonserde.JsonSerDe'
 STORED AS INPUTFORMAT 'org.apache.hadoop.mapred.TextInputFormat'
 OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat'

tests/test_dynamodb/test_dynamodb_update_expressions.py

@@ -36,7 +36,7 @@ def test_update_different_map_elements_in_single_request(table_name=None):
         Key={"pk": "example_id"},
         UpdateExpression=(
             """
-            ADD 
+            ADD
               MyTotalCount :MyCount
             """
         ),

tests/test_mediapackagev2/test_interaction_mediapackage_v1_and_v2.py

@@ -11,7 +11,7 @@
 
 These tests are here simply to verify that, for MediaPackage, there is no overlap.
 
-V1 Channels cannot be retrieved in V2, nor vice versa 
+V1 Channels cannot be retrieved in V2, nor vice versa
 """