From 631aefee0848ea37343f72c384c5ab8e29228276 Mon Sep 17 00:00:00 2001
From: John Tordoff <>
Date: Fri, 4 Aug 2023 10:24:54 -0400
Subject: [PATCH] use boto3 to access bucket regions using V4 s3 auth

---
 addons/s3/requirements.txt |  1 +
 addons/s3/utils.py         | 28 ++++++++++++++--------------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/addons/s3/requirements.txt b/addons/s3/requirements.txt
index 8e6ed87adf9..ed12f60676c 100644
--- a/addons/s3/requirements.txt
+++ b/addons/s3/requirements.txt
@@ -1 +1,2 @@
 boto==2.38.0
+boto3==1.4.7
diff --git a/addons/s3/utils.py b/addons/s3/utils.py
index b2660a54f68..8f3f53cd738 100644
--- a/addons/s3/utils.py
+++ b/addons/s3/utils.py
@@ -2,6 +2,7 @@
 import logging
 from rest_framework import status as http_status
 
+import boto3
 from boto import exception
 from boto.s3.connection import S3Connection
 from boto.s3.connection import OrdinaryCallingFormat
@@ -131,26 +132,25 @@ def get_bucket_location_or_error(access_key, secret_key, bucket_name):
 
 
 def get_bucket_prefixes(access_key, secret_key, prefix, bucket_name):
-    connection = S3Connection(access_key, secret_key)
-
-    if bucket_name != bucket_name.lower() or '.' in bucket_name:
-        # Must use ordinary calling format for mIxEdCaSe or `.` containing bucket names
-        # otherwise use the default as it handles bucket outside of the US
-        connection.calling_format = OrdinaryCallingFormat()
-
-    bucket = connection.get_bucket(bucket_name)
+    s3 = boto3.client(
+        's3',
+        aws_access_key_id=access_key,
+        aws_secret_access_key=secret_key
+    )
 
+    result = s3.list_objects(Bucket=bucket_name, Prefix=prefix, Delimiter='/')
     folders = []
-    for key in bucket.list(delimiter='/', prefix=prefix):
-        if key.name.endswith('/') and key.name != prefix:
+    for common_prefixes in result.get('CommonPrefixes', []):
+        key_name = common_prefixes.get('Prefix')
+        if key_name != prefix:
             folders.append(
                 {
-                    'path': key.name,
-                    'id': f'{bucket_name}:/{key.name}',
-                    'folder_id': key.name,
+                    'path': key_name,
+                    'id': f'{bucket_name}:/{key_name}',
+                    'folder_id': key_name,
                     'kind': 'folder',
                     'bucket_name': bucket_name,
-                    'name': key.name.split('/')[-2],
+                    'name': key_name.split('/')[-2],
                     'addon': 's3',
                 }
             )