From 474a39253cafc1f24319fb594cccadadc323b0e8 Mon Sep 17 00:00:00 2001 From: Farhaan Bukhsh Date: Wed, 12 Jul 2023 13:07:03 +0530 Subject: [PATCH] fix: Added region and signature for S3 bucket (#1928) For a region based bucket boto3 needs to know about region and signature which edx-ora2 doesn't know about. Signed-off-by: Farhaan Bukhsh --- openassessment/__init__.py | 2 +- openassessment/fileupload/backends/s3.py | 6 ++++++ package.json | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/openassessment/__init__.py b/openassessment/__init__.py index d94a70b200..a93603df93 100644 --- a/openassessment/__init__.py +++ b/openassessment/__init__.py @@ -1,4 +1,4 @@ """ Initialization Information for Open Assessment Module """ -__version__ = '5.1.0' +__version__ = '5.1.1' diff --git a/openassessment/fileupload/backends/s3.py b/openassessment/fileupload/backends/s3.py index c446b119fb..a63a434643 100644 --- a/openassessment/fileupload/backends/s3.py +++ b/openassessment/fileupload/backends/s3.py @@ -75,12 +75,18 @@ def _connect_to_s3(): aws_access_key_id = getattr(settings, "AWS_ACCESS_KEY_ID", None) aws_secret_access_key = getattr(settings, "AWS_SECRET_ACCESS_KEY", None) endpoint_url = getattr(settings, "AWS_S3_ENDPOINT_URL", None) + signature_version = getattr(settings, "AWS_S3_SIGNATURE_VERSION", None) + region_name = getattr(settings, "AWS_S3_REGION_NAME", None) return boto3.client( "s3", aws_access_key_id=aws_access_key_id, aws_secret_access_key=aws_secret_access_key, endpoint_url=endpoint_url, + config=botocore.client.Config( + signature_version=signature_version, + region_name=region_name, + ) ) diff --git a/package.json b/package.json index 986cb5ee11..866d5df0ba 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "edx-ora2", - "version": "5.1.0", + "version": "5.1.1", "repository": "https://github.com/openedx/edx-ora2.git", "dependencies": { "@edx/frontend-build": "^6.1.1",