From 2333aed20c4bf030a956e0ea8c44457219c9d84c Mon Sep 17 00:00:00 2001 From: Davis Raymond Muro Date: Mon, 22 Aug 2022 12:17:10 +0300 Subject: [PATCH 1/2] Ensure that S3 client has correct configuration --- onadata/libs/utils/image_tools.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/onadata/libs/utils/image_tools.py b/onadata/libs/utils/image_tools.py index fbeb6c1131..d3c527573f 100644 --- a/onadata/libs/utils/image_tools.py +++ b/onadata/libs/utils/image_tools.py @@ -10,6 +10,7 @@ from django.core.files.storage import get_storage_class from django.http import HttpResponse, HttpResponseRedirect from botocore.exceptions import ClientError +from botocore.client import Config from wsgiref.util import FileWrapper from onadata.libs.utils.viewer_tools import get_path @@ -67,7 +68,11 @@ def generate_aws_media_url( ): s3 = get_storage_class("storages.backends.s3boto3.S3Boto3Storage")() bucket_name = s3.bucket.name - s3_client = boto3.client("s3") + s3_config = Config( + signature_version=getattr("AWS_S3_SIGNATURE_VERSION", "s3v4"), + region_name=getattr("AWS_S3_REGION_NAME", ""), + ) + s3_client = boto3.client("s3", config=s3_config) # Generate a presigned URL for the S3 object return s3_client.generate_presigned_url( From 5a041439f2541d7165872b6c2a73ec6c73689b92 Mon Sep 17 00:00:00 2001 From: Davis Raymond Muro Date: Mon, 22 Aug 2022 12:57:45 +0300 Subject: [PATCH 2/2] Ensure Flake8 configuration is valid --- .flake8 | 1 - 1 file changed, 1 deletion(-) diff --git a/.flake8 b/.flake8 index 44033a966d..45555e7a0d 100644 --- a/.flake8 +++ b/.flake8 @@ -1,6 +1,5 @@ [flake8] max-line-length = 88 -... select = C,E,F,W,B,B950 extend-ignore = E203, E501 per-file-ignores = __init__.py:F401