Run ruff format

aws · Jan 13, 2025 · 9493f42 · 9493f42
1 parent 73ad1cf
commit 9493f42
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 33 deletions.
diff --git a/awscli/customizations/cloudformation/deployer.py b/awscli/customizations/cloudformation/deployer.py
@@ -69,9 +69,7 @@ def has_stack(self, stack_name):
             msg = str(e)
 
             if f"Stack with id {stack_name} does not exist" in msg:
-                LOG.debug(
-                    f"Stack with id {stack_name} does not exist"
-                )
+                LOG.debug(f"Stack with id {stack_name} does not exist")
                 return False
             else:
                 # We don't know anything about this exception. Don't handle
@@ -239,9 +237,7 @@ def wait_for_execute(self, stack_name, changeset_type):
         elif changeset_type == "UPDATE":
             waiter = self._client.get_waiter("stack_update_complete")
         else:
-            raise RuntimeError(
-                f"Invalid changeset type {changeset_type}"
-            )
+            raise RuntimeError(f"Invalid changeset type {changeset_type}")
 
         # Poll every 30 seconds. Polling too frequently risks hitting rate limits
         # on CloudFormation's DescribeStacks API

diff --git a/awscli/customizations/cloudtrail/validation.py b/awscli/customizations/cloudtrail/validation.py
@@ -78,9 +78,7 @@ def assert_cloudtrail_arn_is_valid(trail_arn):
     ARNs look like: arn:aws:cloudtrail:us-east-1:123456789012:trail/foo"""
     pattern = re.compile(r'arn:.+:cloudtrail:.+:\d{12}:trail/.+')
     if not pattern.match(trail_arn):
-        raise ParamValidationError(
-            f'Invalid trail ARN provided: {trail_arn}'
-        )
+        raise ParamValidationError(f'Invalid trail ARN provided: {trail_arn}')
 
 
 def create_digest_traverser(
@@ -589,19 +587,15 @@ def _load_and_validate_digest(self, public_keys, bucket, key):
             or digest_data['digestS3Object'] != key
         ):
             raise DigestError(
-
-                    f'Digest file\ts3://{bucket}/{key}\tINVALID: has been moved from its '
-                    'original location'
-
+                f'Digest file\ts3://{bucket}/{key}\tINVALID: has been moved from its '
+                'original location'
             )
         # Get the public keys in the given time range.
         fingerprint = digest_data['digestPublicKeyFingerprint']
         if fingerprint not in public_keys:
             raise DigestError(
-
-                    f'Digest file\ts3://{bucket}/{key}\tINVALID: public key not found in '
-                    f'region {self.digest_provider.trail_home_region} for fingerprint {fingerprint}'
-
+                f'Digest file\ts3://{bucket}/{key}\tINVALID: public key not found in '
+                f'region {self.digest_provider.trail_home_region} for fingerprint {fingerprint}'
             )
         public_key_hex = public_keys[fingerprint]['Value']
         self._digest_validator.validate(
@@ -649,7 +643,9 @@ def validate(self, bucket, key, public_key, digest_data, inflated_digest):
                 (
                     'Digest file\ts3://{}/{}\tINVALID: Unable to load PKCS #1 key'
                     ' with fingerprint {}'
-                ).format(bucket, key, digest_data['digestPublicKeyFingerprint'])
+                ).format(
+                    bucket, key, digest_data['digestPublicKeyFingerprint']
+                )
             )
 
         to_sign = self._create_string_to_sign(digest_data, inflated_digest)
@@ -889,7 +885,9 @@ def _call(self):
             self._track_found_times(digest)
             self._valid_digests += 1
             self._write_status(
-                'Digest file\ts3://{}/{}\tvalid'.format(digest['digestS3Bucket'], digest['digestS3Object'])
+                'Digest file\ts3://{}/{}\tvalid'.format(
+                    digest['digestS3Bucket'], digest['digestS3Object']
+                )
             )
             if not digest['logFiles']:
                 continue
@@ -931,9 +929,9 @@ def _download_log(self, log):
             else:
                 self._valid_logs += 1
                 self._write_status(
-
-                        'Log file\ts3://{}/{}\tvalid'.format(log['s3Bucket'], log['s3Object'])
-
+                    'Log file\ts3://{}/{}\tvalid'.format(
+                        log['s3Bucket'], log['s3Object']
+                    )
                 )
         except ClientError as e:
             if e.response['Error']['Code'] != 'NoSuchKey':
@@ -1010,21 +1008,27 @@ def _on_invalid_log_format(self, log_data):
         self._invalid_logs += 1
         self._write_status(
             (
-                'Log file\ts3://{}/{}\tINVALID: invalid format'.format(log_data['s3Bucket'], log_data['s3Object'])
+                'Log file\ts3://{}/{}\tINVALID: invalid format'.format(
+                    log_data['s3Bucket'], log_data['s3Object']
+                )
             ),
             True,
         )
 
     def _on_log_invalid(self, log_data):
         self._invalid_logs += 1
         self._write_status(
-            "Log file\ts3://{}/{}\tINVALID: hash value doesn't match".format(log_data['s3Bucket'], log_data['s3Object']),
+            "Log file\ts3://{}/{}\tINVALID: hash value doesn't match".format(
+                log_data['s3Bucket'], log_data['s3Object']
+            ),
             True,
         )
 
     def _on_missing_log(self, log_data):
         self._invalid_logs += 1
         self._write_status(
-            'Log file\ts3://{}/{}\tINVALID: not found'.format(log_data['s3Bucket'], log_data['s3Object']),
+            'Log file\ts3://{}/{}\tINVALID: not found'.format(
+                log_data['s3Bucket'], log_data['s3Object']
+            ),
             True,
         )
diff --git a/awscli/customizations/configservice/getstatus.py b/awscli/customizations/configservice/getstatus.py
@@ -100,5 +100,9 @@ def _check_last_status(self, status, status_name=''):
         last_status = status['lastStatus']
         sys.stdout.write(f'last {status_name}status: {last_status}\n')
         if last_status == "FAILURE":
-            sys.stdout.write('error code: {}\n'.format(status['lastErrorCode']))
-            sys.stdout.write('message: {}\n'.format(status['lastErrorMessage']))
+            sys.stdout.write(
+                'error code: {}\n'.format(status['lastErrorCode'])
+            )
+            sys.stdout.write(
+                'message: {}\n'.format(status['lastErrorMessage'])
+            )
diff --git a/awscli/customizations/configure/addmodel.py b/awscli/customizations/configure/addmodel.py
@@ -76,9 +76,7 @@ def get_model_location(session, service_definition, service_name=None):
     # not the one set by AWS_DATA_PATH)
     data_path = session.get_component('data_loader').CUSTOMER_DATA_PATH
     # Use the version of the model to determine the file's naming convention.
-    service_model_name = (
-        f"service-{int(float(service_definition.get('version', '2.0'))):d}.json"
-    )
+    service_model_name = f"service-{int(float(service_definition.get('version', '2.0'))):d}.json"
     return os.path.join(
         data_path, service_name, api_version, service_model_name
     )

diff --git a/awscli/customizations/configure/writer.py b/awscli/customizations/configure/writer.py
@@ -208,9 +208,7 @@ def _insert_new_values(self, line_number, contents, new_values, indent=''):
                 subindent = indent + '    '
                 new_contents.append(f'{indent}{key} =\n')
                 for subkey, subval in list(value.items()):
-                    new_contents.append(
-                        f'{subindent}{subkey} = {subval}\n'
-                    )
+                    new_contents.append(f'{subindent}{subkey} = {subval}\n')
             else:
                 new_contents.append(f'{indent}{key} = {value}\n')
             del new_values[key]