mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-09-09 03:03:13 -04:00
notify-api-412 use black to enforce python coding style
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user