merging with upstream

2017-12-27 16:24:50 +01:00
parent db7453f438
commit f4c19dec04
7 changed files with 103 additions and 56 deletions
--- a/helix/Services/s3_helper.py
+++ b/helix/Services/s3_helper.py
@@ -21,6 +21,7 @@ def s3_upload(bytes_or_file_like, filename=None, file_extension=None):

    # Assuming bucket already exists
    s3.Bucket(bucket_name).put_object(Key=filename, Body=bytes_or_file_like.read(), ACL='public-read')
-    file_url = 'https://s3.amazonaws.com/{}/{}'.format(bucket_name, filename)
+    # file_url = 'https://s3.amazonaws.com/{}/{}'.format(bucket_name, filename) # PermanentRedirect error
+    file_url = 'https://{}.s3.amazonaws.com/{}'.format(bucket_name, filename)
    print('Uploaded filename {} to S3: {}'.format(filename, file_url))
    return file_url