allow minio_kwargs to override values from settings

Author: thomasf

minio_storage/storage.py

@@ -364,26 +364,25 @@ def get_setting(name: str, default=_NoValue) -> T.Any:
 
 
 def create_minio_client_from_settings(*, minio_kwargs=None):
-    kwargs = {}
     endpoint = get_setting("MINIO_STORAGE_ENDPOINT")
-    access_key = get_setting("MINIO_STORAGE_ACCESS_KEY")
-    secret_key = get_setting("MINIO_STORAGE_SECRET_KEY")
-    secure = get_setting("MINIO_STORAGE_USE_HTTPS", True)
+    kwargs = {
+        "access_key": get_setting("MINIO_STORAGE_ACCESS_KEY"),
+        "secret_key": get_setting("MINIO_STORAGE_SECRET_KEY"),
+        "secure": get_setting("MINIO_STORAGE_USE_HTTPS", True),
+    }
     region = get_setting("MINIO_STORAGE_REGION", None)
     if region:
         kwargs["region"] = region
 
     if minio_kwargs:
         kwargs.update(minio_kwargs)
+
     # Making this client deconstructible allows it to be passed directly as
     # an argument to MinioStorage, since Django needs to be able to
     # deconstruct all Storage constructor arguments for Storages referenced in
     # migrations (e.g. when using a custom storage on a FileField).
     client = deconstructible(minio.Minio)(
         endpoint,
-        access_key=access_key,
-        secret_key=secret_key,
-        secure=secure,
         **kwargs,
     )
     return client