Add latest changes from gitlab-org/gitlab@13-2-stable-ee

2 files changed, 35 insertions, 1 deletions

diff --git a/app/uploaders/object_storage.rb b/app/uploaders/object_storage.rb
index 5297112eef8..63b6197a04d 100644
--- a/app/uploaders/object_storage.rb
+++ b/app/uploaders/object_storage.rb
@@ -169,6 +169,10 @@ module ObjectStorage
         object_store_options.connection.to_hash.deep_symbolize_keys
       end
 
+      def consolidated_settings?
+        object_store_options.fetch('consolidated_settings', false)
+      end
+
       def remote_store_path
         object_store_options.remote_directory
       end
@@ -196,7 +200,7 @@ module ObjectStorage
         id = [CarrierWave.generate_cache_id, SecureRandom.hex].join('-')
         upload_path = File.join(TMP_UPLOAD_PATH, id)
         direct_upload = ObjectStorage::DirectUpload.new(self.object_store_credentials, remote_store_path, upload_path,
-          has_length: has_length, maximum_size: maximum_size)
+          has_length: has_length, maximum_size: maximum_size, consolidated_settings: consolidated_settings?)
 
         direct_upload.to_hash.merge(ID: id)
       end
diff --git a/app/uploaders/packages/package_file_uploader.rb b/app/uploaders/packages/package_file_uploader.rb
new file mode 100644
index 00000000000..20fcf0a7a32
--- /dev/null
+++ b/app/uploaders/packages/package_file_uploader.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+class Packages::PackageFileUploader < GitlabUploader
+  extend Workhorse::UploadPath
+  include ObjectStorage::Concern
+
+  storage_options Gitlab.config.packages
+
+  after :store, :schedule_background_upload
+
+  alias_method :upload, :model
+
+  def filename
+    model.file_name
+  end
+
+  def store_dir
+    dynamic_segment
+  end
+
+  private
+
+  def dynamic_segment
+    File.join(disk_hash[0..1], disk_hash[2..3], disk_hash,
+              'packages', model.package.id.to_s, 'files', model.id.to_s)
+  end
+
+  def disk_hash
+    @disk_hash ||= Digest::SHA2.hexdigest(model.package.project_id.to_s)
+  end
+end