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

In case there are problems reading back the csv file from

Browse Source 
s3 bucket flash error message instead of stack trace from s3 client.
This commit is contained in:
Adam Shimali
2016-02-05 16:13:06 +00:00
parent 4338bc9aaf
commit 3bd2565129
2 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/main/uploader.py
View File

@@ -2,9 +2,12 @@ import botocore
from boto3 import resource
BUCKET_NAME = 'service-{}-notify'
def s3upload(upload_id, service_id, filedata, region):
s3 = resource('s3')
bucket_name = 'service-{}-notify'.format(service_id)
bucket_name = BUCKET_NAME.format(service_id)
contents = '\n'.join(filedata['data'])
exists = True
@@ -25,9 +28,17 @@ def s3upload(upload_id, service_id, filedata, region):
def s3download(service_id, upload_id):
s3 = resource('s3')
bucket_name = 'service-{}-notify'.format(service_id)
upload_file_name = "{}.csv".format(upload_id)
key = s3.Object(bucket_name, upload_file_name)
contents = key.get()['Body'].read().decode('utf-8')
contents = ''
try:
s3 = resource('s3')
bucket_name = BUCKET_NAME.format(service_id)
upload_file_name = "{}.csv".format(upload_id)
key = s3.Object(bucket_name, upload_file_name)
contents = key.get()['Body'].read().decode('utf-8')
except botocore.exceptions.ClientError as e:
err = e.response['Error']
if err['Code'] == 'NoSuchBucket':
err_msg = '{}:{}'.format(err['BucketName'], err['Message'])
# TODO properly log error
print(err_msg)
return contents