darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-17 04:59:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

disable cache until we can fix on cloud deployment

Browse Source
This commit is contained in:
James Moffet
2022-07-26 11:17:43 -07:00
parent e6b36becf1
commit 4c25a81004
11 changed files with 88 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/s3_client/s3_csv_client.py
View File

@@ -17,7 +17,8 @@ def get_csv_location(service_id, upload_id, bucket=None):
def get_csv_upload(service_id, upload_id, bucket=None):
return get_s3_object(*get_csv_location(service_id, upload_id, bucket))
s3_object = get_s3_object(*get_csv_location(service_id, upload_id, bucket))
return s3_object
def s3upload(service_id, filedata, region, bucket=None):
@@ -45,7 +46,9 @@ def s3download(service_id, upload_id, bucket=None):
def set_metadata_on_csv_upload(service_id, upload_id, bucket=None, **kwargs):
get_csv_upload(
current_app.logger.info('set_metadata_on_csv_upload, service_id: {} upload_id: {} bucket: {}'.format(service_id, upload_id, bucket))
current_app.logger.info('csv location to copy from is: {}/{}'.format(*get_csv_location(service_id, upload_id, bucket=bucket)))
copy_from_object_result = get_csv_upload(
service_id, upload_id, bucket=bucket
).copy_from(
CopySource='{}/{}'.format(*get_csv_location(service_id, upload_id, bucket=bucket)),
@@ -55,6 +58,7 @@ def set_metadata_on_csv_upload(service_id, upload_id, bucket=None, **kwargs):
},
MetadataDirective='REPLACE',
)
return copy_from_object_result
def get_csv_metadata(service_id, upload_id, bucket=None):

6
app/s3_client/s3_logo_client.py
View File

@@ -13,7 +13,11 @@ LETTER_TEMP_LOGO_LOCATION = 'letters/static/images/letter-template/temp-{user_id
def get_s3_object(bucket_name, filename):
s3 = resource('s3')
return s3.Object(bucket_name, filename)
current_app.logger.info('Requesting s3 object from bucket: {} with key: {}'.format(bucket_name, filename))
obj = s3.Object(bucket_name, filename)
string_body = obj.get()['Body'].read().decode('utf-8')
current_app.logger.info('s3 Object string body is: {}'.format(string_body))
return obj
def delete_s3_object(filename):