notify-api-412 use black to enforce python coding style

app/s3_client/__init__.py

@@ -8,9 +8,9 @@ AWS_CLIENT_CONFIG = Config(
     # endpoints.  See https://aws.amazon.com/compliance/fips/ for more
     # information.
     s3={
-        'addressing_style': 'virtual',
+        "addressing_style": "virtual",
     },
-    use_fips_endpoint=True
+    use_fips_endpoint=True,
 )
 
 
@@ -25,38 +25,40 @@ def get_s3_object(
     session = Session(
         aws_access_key_id=access_key,
         aws_secret_access_key=secret_key,
-        region_name=region
+        region_name=region,
     )
-    s3 = session.resource('s3', config=AWS_CLIENT_CONFIG)
+    s3 = session.resource("s3", config=AWS_CLIENT_CONFIG)
     obj = s3.Object(bucket_name, filename)
     return obj
 
 
 def get_s3_metadata(obj):
     try:
-        return obj.get()['Metadata']
+        return obj.get()["Metadata"]
     except botocore.exceptions.ClientError as client_error:
-        current_app.logger.error(f"Unable to download s3 file {obj.bucket_name}/{obj.key}")
+        current_app.logger.error(
+            f"Unable to download s3 file {obj.bucket_name}/{obj.key}"
+        )
         raise client_error
 
 
 def set_s3_metadata(obj, **kwargs):
     copy_from_object_result = obj.copy_from(
         CopySource=f"{obj.bucket_name}/{obj.key}",
-        ServerSideEncryption='AES256',
-        Metadata={
-            key: str(value) for key, value in kwargs.items()
-        },
-        MetadataDirective='REPLACE',
+        ServerSideEncryption="AES256",
+        Metadata={key: str(value) for key, value in kwargs.items()},
+        MetadataDirective="REPLACE",
     )
     return copy_from_object_result
 
 
 def get_s3_contents(obj):
-    contents = ''
+    contents = ""
     try:
-        contents = obj.get()['Body'].read().decode('utf-8')
+        contents = obj.get()["Body"].read().decode("utf-8")
     except botocore.exceptions.ClientError as client_error:
-        current_app.logger.error(f"Unable to download s3 file {obj.bucket_name}/{obj.key}")
+        current_app.logger.error(
+            f"Unable to download s3 file {obj.bucket_name}/{obj.key}"
+        )
         raise client_error
     return contents

app/s3_client/s3_csv_client.py

@@ -10,16 +10,16 @@ from app.s3_client import (
     set_s3_metadata,
 )
 
-FILE_LOCATION_STRUCTURE = 'service-{}-notify/{}.csv'
+FILE_LOCATION_STRUCTURE = "service-{}-notify/{}.csv"
 
 
 def get_csv_location(service_id, upload_id):
     return (
-        current_app.config['CSV_UPLOAD_BUCKET']['bucket'],
+        current_app.config["CSV_UPLOAD_BUCKET"]["bucket"],
         FILE_LOCATION_STRUCTURE.format(service_id, upload_id),
-        current_app.config['CSV_UPLOAD_BUCKET']['access_key_id'],
-        current_app.config['CSV_UPLOAD_BUCKET']['secret_access_key'],
-        current_app.config['CSV_UPLOAD_BUCKET']['region'],
+        current_app.config["CSV_UPLOAD_BUCKET"]["access_key_id"],
+        current_app.config["CSV_UPLOAD_BUCKET"]["secret_access_key"],
+        current_app.config["CSV_UPLOAD_BUCKET"]["region"],
     )
 
 
@@ -29,9 +29,11 @@ def get_csv_upload(service_id, upload_id):
 
 def s3upload(service_id, filedata):
     upload_id = str(uuid.uuid4())
-    bucket_name, file_location, access_key, secret_key, region = get_csv_location(service_id, upload_id)
+    bucket_name, file_location, access_key, secret_key, region = get_csv_location(
+        service_id, upload_id
+    )
     utils_s3upload(
-        filedata=filedata['data'],
+        filedata=filedata["data"],
         region=region,
         bucket_name=bucket_name,
         file_location=file_location,

app/s3_client/s3_logo_client.py

@@ -6,22 +6,22 @@ from notifications_utils.s3 import s3upload as utils_s3upload
 
 from app.s3_client import get_s3_object
 
-TEMP_TAG = 'temp-{user_id}_'
-EMAIL_LOGO_LOCATION_STRUCTURE = '{temp}{unique_id}-{filename}'
+TEMP_TAG = "temp-{user_id}_"
+EMAIL_LOGO_LOCATION_STRUCTURE = "{temp}{unique_id}-{filename}"
 
 
 def get_logo_location(filename=None):
     return (
-        bucket_creds('bucket'),
+        bucket_creds("bucket"),
         filename,
-        bucket_creds('access_key_id'),
-        bucket_creds('secret_access_key'),
-        bucket_creds('region'),
+        bucket_creds("access_key_id"),
+        bucket_creds("secret_access_key"),
+        bucket_creds("region"),
     )
 
 
 def bucket_creds(key):
-    return current_app.config['LOGO_UPLOAD_BUCKET'][key]
+    return current_app.config["LOGO_UPLOAD_BUCKET"][key]
 
 
 def delete_s3_object(filename):
@@ -33,38 +33,42 @@ def persist_logo(old_name, new_name):
         return
     bucket_name, filename, access_key, secret_key, region = get_logo_location(new_name)
     get_s3_object(bucket_name, filename, access_key, secret_key, region).copy_from(
-        CopySource='{}/{}'.format(bucket_name, old_name))
+        CopySource="{}/{}".format(bucket_name, old_name)
+    )
     delete_s3_object(old_name)
 
 
 def get_s3_objects_filter_by_prefix(prefix):
-    bucket_name = bucket_creds('bucket')
-    session = Session(aws_access_key_id=bucket_creds('access_key_id'),
-                      aws_secret_access_key=bucket_creds('secret_access_key'),
-                      region_name=bucket_creds('region'))
-    s3 = session.resource('s3')
+    bucket_name = bucket_creds("bucket")
+    session = Session(
+        aws_access_key_id=bucket_creds("access_key_id"),
+        aws_secret_access_key=bucket_creds("secret_access_key"),
+        region_name=bucket_creds("region"),
+    )
+    s3 = session.resource("s3")
     return s3.Bucket(bucket_name).objects.filter(Prefix=prefix)
 
 
 def get_temp_truncated_filename(filename, user_id):
-    return filename[len(TEMP_TAG.format(user_id=user_id)):]
+    start = len(TEMP_TAG.format(user_id=user_id))
+    return filename[start:]
 
 
 def upload_email_logo(filename, filedata, user_id):
     upload_file_name = EMAIL_LOGO_LOCATION_STRUCTURE.format(
         temp=TEMP_TAG.format(user_id=user_id),
         unique_id=str(uuid.uuid4()),
-        filename=filename
+        filename=filename,
     )
-    bucket_name = bucket_creds('bucket')
+    bucket_name = bucket_creds("bucket")
     utils_s3upload(
         filedata=filedata,
-        region=bucket_creds('region'),
+        region=bucket_creds("region"),
         bucket_name=bucket_name,
         file_location=upload_file_name,
-        content_type='image/png',
-        access_key=bucket_creds('access_key_id'),
-        secret_key=bucket_creds('secret_access_key'),
+        content_type="image/png",
+        access_key=bucket_creds("access_key_id"),
+        secret_key=bucket_creds("secret_access_key"),
     )
 
     return upload_file_name
@@ -84,6 +88,6 @@ def delete_email_temp_files_created_by(user_id):
 
 def delete_email_temp_file(filename):
     if not filename.startswith(TEMP_TAG[:5]):
-        raise ValueError('Not a temp file: {}'.format(filename))
+        raise ValueError("Not a temp file: {}".format(filename))
 
     delete_s3_object(filename)