darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-08-20 14:29:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Updated to retrieve csv upload from new bucket.

Browse Source 
Fix test errors.
This commit is contained in:
Nicholas Staples
2016-04-07 13:44:04 +01:00
parent 74700334e6
commit 143d1b0db8
9 changed files with 88 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/aws/s3.py
View File

@@ -1,16 +1,23 @@
from boto3 import resource
from flask import current_app
FILE_LOCATION_STRUCTURE = 'service-{}-notify/{}.csv'
def get_s3_job_object(bucket_name, job_id):
def get_s3_job_object(bucket_name, file_location):
s3 = resource('s3')
return s3.Object(bucket_name, '{}.csv'.format(job_id))
return s3.Object(bucket_name, file_location)
def get_job_from_s3(bucket_name, job_id):
obj = get_s3_job_object(bucket_name, job_id)
def get_job_from_s3(service_id, job_id):
bucket_name = current_app.config['CSV_UPLOAD_BUCKET_NAME']
file_location = FILE_LOCATION_STRUCTURE.format(service_id, job_id)
obj = get_s3_job_object(bucket_name, file_location)
return obj.get()['Body'].read().decode('utf-8')
def remove_job_from_s3(bucket_name, job_id):
obj = get_s3_job_object(bucket_name, job_id)
def remove_job_from_s3(service_id, job_id):
bucket_name = current_app.config['CSV_UPLOAD_BUCKET_NAME']
file_location = FILE_LOCATION_STRUCTURE.format(service_id, job_id)
obj = get_s3_job_object(bucket_name, file_location)
return obj.delete()