mirror of
https://github.com/discourse/discourse.git
synced 2024-11-23 19:37:55 +08:00
e4350bb966
This PR introduces a new `enable_experimental_backup_uploads` site setting (default false and hidden), which when enabled alongside `enable_direct_s3_uploads` will allow for direct S3 multipart uploads of backup .tar.gz files. To make multipart external uploads work with both the S3BackupStore and the S3Store, I've had to move several methods out of S3Store and into S3Helper, including: * presigned_url * create_multipart * abort_multipart * complete_multipart * presign_multipart_part * list_multipart_parts Then, S3Store and S3BackupStore either delegate directly to S3Helper or have their own special methods to call S3Helper for these methods. FileStore.temporary_upload_path has also removed its dependence on upload_path, and can now be used interchangeably between the stores. A similar change was made in the frontend as well, moving the multipart related JS code out of ComposerUppyUpload and into a mixin of its own, so it can also be used by UppyUploadMixin. Some changes to ExternalUploadManager had to be made here as well. The backup direct uploads do not need an Upload record made for them in the database, so they can be moved to their final S3 resting place when completing the multipart upload. This changeset is not perfect; it introduces some special cases in UploadController to handle backups that was previously in BackupController, because UploadController is where the multipart routes are located. A subsequent pull request will pull these routes into a module or some other sharing pattern, along with hooks, so the backup controller and the upload controller (and any future controllers that may need them) can include these routes in a nicer way.
25 lines
828 B
Ruby
25 lines
828 B
Ruby
# frozen_string_literal: true
|
|
|
|
Fabricator(:external_upload_stub) do
|
|
transient :folder_prefix
|
|
|
|
created_by { Fabricate(:user) }
|
|
original_filename "test.txt"
|
|
key { |attrs| FileStore::BaseStore.temporary_upload_path("test.txt", folder_prefix: attrs[:folder_prefix] || "") }
|
|
upload_type "card_background"
|
|
filesize 1024
|
|
status 1
|
|
end
|
|
|
|
Fabricator(:image_external_upload_stub, from: :external_upload_stub) do
|
|
original_filename "logo.png"
|
|
filesize 1024
|
|
key { |attrs| FileStore::BaseStore.temporary_upload_path("logo.png", folder_prefix: attrs[:folder_prefix] || "") }
|
|
end
|
|
|
|
Fabricator(:attachment_external_upload_stub, from: :external_upload_stub) do
|
|
original_filename "file.pdf"
|
|
filesize 1024
|
|
key { |attrs| FileStore::BaseStore.temporary_upload_path("file.pdf", folder_prefix: attrs[:folder_prefix] || "") }
|
|
end
|