test new design 02

This commit is contained in:
TronoSfera 2026-03-29 22:01:40 +03:00
parent bf09e4a29f
commit 48e25dd55c
4 changed files with 5 additions and 3 deletions

View file

@ -77,7 +77,7 @@ class S3Storage:
self.ensure_bucket() self.ensure_bucket()
url = self.client.generate_presigned_url( url = self.client.generate_presigned_url(
"put_object", "put_object",
Params={"Bucket": self.bucket, "Key": key, "ContentType": mime_type}, Params={"Bucket": self.bucket, "Key": key},
ExpiresIn=expires_sec, ExpiresIn=expires_sec,
HttpMethod="PUT", HttpMethod="PUT",
) )

View file

@ -97,7 +97,6 @@ server {
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Proto $scheme;
proxy_request_buffering off;
proxy_buffering off; proxy_buffering off;
} }

View file

@ -97,7 +97,6 @@ server {
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Proto $scheme;
proxy_request_buffering off;
proxy_buffering off; proxy_buffering off;
proxy_ssl_server_name on; proxy_ssl_server_name on;
proxy_ssl_name minio; proxy_ssl_name minio;

View file

@ -954,6 +954,7 @@ class UploadsS3Tests(unittest.TestCase):
def __init__(self): def __init__(self):
self.head_bucket_calls = 0 self.head_bucket_calls = 0
self.create_bucket_calls = 0 self.create_bucket_calls = 0
self.presign_params = []
def head_bucket(self, **kwargs): def head_bucket(self, **kwargs):
self.head_bucket_calls += 1 self.head_bucket_calls += 1
@ -964,6 +965,7 @@ class UploadsS3Tests(unittest.TestCase):
return {} return {}
def generate_presigned_url(self, operation_name, Params=None, ExpiresIn=900, HttpMethod="PUT"): def generate_presigned_url(self, operation_name, Params=None, ExpiresIn=900, HttpMethod="PUT"):
self.presign_params.append(dict(Params or {}))
key = str((Params or {}).get("Key") or "file.bin") key = str((Params or {}).get("Key") or "file.bin")
return f"https://s3.local/{settings.S3_BUCKET}/{key}?expires={ExpiresIn}" return f"https://s3.local/{settings.S3_BUCKET}/{key}?expires={ExpiresIn}"
@ -977,3 +979,5 @@ class UploadsS3Tests(unittest.TestCase):
self.assertTrue(second.startswith("/s3/")) self.assertTrue(second.startswith("/s3/"))
self.assertEqual(fake_client.head_bucket_calls, 1) self.assertEqual(fake_client.head_bucket_calls, 1)
self.assertEqual(fake_client.create_bucket_calls, 0) self.assertEqual(fake_client.create_bucket_calls, 0)
self.assertEqual(fake_client.presign_params[0], {"Bucket": settings.S3_BUCKET, "Key": "avatars/test-user/photo.png"})
self.assertEqual(fake_client.presign_params[1], {"Bucket": settings.S3_BUCKET, "Key": "avatars/test-user/photo-2.png"})