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

Service and job id were incorrectly in bucket name.

Browse Source
This commit is contained in:
Adam Shimali
2016-02-04 12:06:06 +00:00
parent 2e4e354680
commit 90a17bc0a7
5 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/main/uploader.py
View File

@@ -7,7 +7,6 @@ def s3upload(upload_id, service_id, filedata, region):
bucket_name = 'service-{}-notify'.format(service_id)
contents = '\n'.join(filedata['data'])
bucket = s3.Bucket(bucket_name)
exists = True
try:
s3.meta.client.head_bucket(Bucket=bucket_name)
@@ -20,13 +19,15 @@ def s3upload(upload_id, service_id, filedata, region):
s3.create_bucket(Bucket=bucket_name,
CreateBucketConfiguration={'LocationConstraint': region})
key = s3.Object(bucket_name, upload_id)
upload_file_name = "{}.csv".format(upload_id)
key = s3.Object(bucket_name, upload_file_name)
key.put(Body=contents, ServerSideEncryption='AES256')
def s3download(service_id, upload_id):
s3 = resource('s3')
bucket_name = 'service-{}-notify'.format(service_id)
key = s3.Object(bucket_name, upload_id)
upload_file_name = "{}.csv".format(upload_id)
key = s3.Object(bucket_name, upload_file_name)
contents = key.get()['Body'].read().decode('utf-8')
return contents

2
app/notify_client/job_api_client.py
View File

@@ -26,7 +26,7 @@ class JobApiClient(BaseAPIClient):
"service": service_id,
"template": template_id,
"original_file_name": original_file_name,
"bucket_name": "service-{}-{}-notify".format(service_id, job_id),
"bucket_name": "service-{}-notify".format(service_id),
"file_name": "{}.csv".format(job_id)
}