paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-02 13:03:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

tusd: Use GCS upload backend when the endpoint matches.

Browse Source 
This works around tus/tusd#322, which in turn is caused by
aws/aws-sdk-go-v2#1816.  This requires separate authentication via
service account key.

Fixes: #34186.
This commit is contained in:
Alex Vandiver
2025-04-11 18:16:51 +00:00
committed by Tim Abbott
parent cf51013bb7
commit e1aa8b1cb0
2 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
zerver/management/commands/runtusd.py
View File

@@ -63,6 +63,12 @@ class Command(BaseCommand):
if settings.LOCAL_UPLOADS_DIR is not None:
assert settings.LOCAL_FILES_DIR is not None
tusd_args.append(f"-upload-dir={settings.LOCAL_FILES_DIR}")
elif settings.S3_ENDPOINT_URL in (
"https://storage.googleapis.com",
"https://storage.googleapis.com/",
):
tusd_args.append(f"-gcs-bucket={settings.S3_AUTH_UPLOADS_BUCKET}")
env_vars["GCS_SERVICE_ACCOUNT_FILE"] = "/etc/zulip/gcp_key.json"
else:
tusd_args.append(f"-s3-bucket={settings.S3_AUTH_UPLOADS_BUCKET}")
if settings.S3_ENDPOINT_URL is not None: