From d7738788afd06c566baca6cf8b15f217023170e3 Mon Sep 17 00:00:00 2001
From: Gerrod Ubben <gerrodubben@gmail.com>
Date: Fri, 10 May 2024 11:20:21 -0400
Subject: [PATCH] Pin django-storages to 1.14.3

[noissue]
---
 pulpcore/app/serializers/domain.py | 4 ++++
 setup.py                           | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pulpcore/app/serializers/domain.py b/pulpcore/app/serializers/domain.py
index b0f816e509..0ccd7f9e95 100644
--- a/pulpcore/app/serializers/domain.py
+++ b/pulpcore/app/serializers/domain.py
@@ -112,6 +112,7 @@ class SFTPSettingsSerializer(BaseSettingsClass):
         # 'sftp_known_host_file': 'known_host_file',  # This is dangerous to allow to be set
         "sftp_storage_root": "root_path",
         "media_url": "base_url",
+        "sftp_base_url": "base_url",
     }
 
     host = serializers.CharField(required=True)
@@ -180,6 +181,7 @@ class AmazonS3SettingsSerializer(BaseSettingsClass):
         "aws_default_acl": "default_acl",
         "aws_s3_use_threads": "use_threads",
         "aws_s3_transfer_config": "transfer_config",
+        "aws_s3_client_config": "client_config",
     }
 
     access_key = serializers.CharField(required=True, write_only=True)
@@ -213,6 +215,8 @@ class AmazonS3SettingsSerializer(BaseSettingsClass):
     default_acl = serializers.CharField(allow_null=True, default=None)
     use_threads = serializers.BooleanField(default=True)
     transfer_config = TransferConfigSerializer(allow_null=True, default=None)
+    # TODO: Add a botocore.Config serializer to allow specifying this field from json
+    client_config = serializers.HiddenField(default=None)
 
     def validate_verify(self, value):
         """Verify can **only** be None or False. None=verify ssl."""
diff --git a/setup.py b/setup.py
index b16eb39ac7..2d64a89888 100644
--- a/setup.py
+++ b/setup.py
@@ -20,10 +20,10 @@
     python_requires=">=3.9",
     install_requires=requirements,
     extras_require={
-        "sftp": ["django-storages[sftp]<=1.14.2"],
-        "s3": ["django-storages[boto3]~=1.14.2"],
-        "google": ["django-storages[google]>=1.13.2,<=1.14.2"],
-        "azure": ["django-storages[azure]>=1.12.2,<=1.14.2"],
+        "sftp": ["django-storages[sftp]==1.14.3"],
+        "s3": ["django-storages[boto3]==1.14.3"],
+        "google": ["django-storages[google]==1.14.3"],
+        "azure": ["django-storages[azure]==1.14.3"],
         "prometheus": ["django-prometheus"],
     },
     include_package_data=True,