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

Proactively specify aws region for s3 operations

Browse Source
This commit is contained in:
Ryan Ahearn
2022-09-26 10:25:03 -04:00
parent d9823de61d
commit 5f1a1f083a
13 changed files with 47 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/s3_client/s3_csv_client.py
View File

@@ -19,6 +19,7 @@ def get_csv_location(service_id, upload_id):
FILE_LOCATION_STRUCTURE.format(service_id, upload_id),
current_app.config['CSV_UPLOAD_ACCESS_KEY'],
current_app.config['CSV_UPLOAD_SECRET_KEY'],
current_app.config['CSV_UPLOAD_REGION'],
)
@@ -26,9 +27,9 @@ def get_csv_upload(service_id, upload_id):
return get_s3_object(*get_csv_location(service_id, upload_id))
def s3upload(service_id, filedata, region):
def s3upload(service_id, filedata):
upload_id = str(uuid.uuid4())
bucket_name, file_location, access_key, secret_key = get_csv_location(service_id, upload_id)
bucket_name, file_location, access_key, secret_key, region = get_csv_location(service_id, upload_id)
utils_s3upload(
filedata=filedata['data'],
region=region,