3 files changed, 74 insertions, 2 deletions
diff --git a/app/uploaders/deleted_object_uploader.rb b/app/uploaders/deleted_object_uploader.rb
new file mode 100644
index 00000000000..fc0f62b920c
--- /dev/null
+++ b/app/uploaders/deleted_object_uploader.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class DeletedObjectUploader < GitlabUploader
+  include ObjectStorage::Concern
+
+  storage_options Gitlab.config.artifacts
+
+  def store_dir
+    model.store_dir
+  end
+end
diff --git a/app/uploaders/pages/deployment_uploader.rb b/app/uploaders/pages/deployment_uploader.rb
new file mode 100644
index 00000000000..e510025fc7d
--- /dev/null
+++ b/app/uploaders/pages/deployment_uploader.rb
@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module Pages
+  class DeploymentUploader < GitlabUploader
+    include ObjectStorage::Concern
+
+    storage_options Gitlab.config.pages
+
+    alias_method :upload, :model
+
+    private
+
+    def dynamic_segment
+      Gitlab::HashedPath.new('pages_deployments', model.id, root_hash: model.project_id)
+    end
+
+    # @hashed is chosen to avoid conflict with namespace name because we use the same directory for storage
+    # @ is not valid character for namespace
+    def base_dir
+      "@hashed"
+    end
+
+    # override GitlabUploader
+    # if set to true it erases the original file when uploading
+    # and we copy from the artifacts archive, so artifacts end up
+    # without the file
+    def move_to_cache
+      false
+    end
+
+    class << self
+      # we only upload this files from the rails background job
+      # so we don't need direct upload for pages deployments
+      # this method is here to ignore any user setting
+      def direct_upload_enabled?
+        false
+      end
+
+      # we don't need background uploads because we upload files
+      # to the right store right away, and we already do that in
+      # the background job
+      def background_upload_enabled?
+        false
+      end
+
+      def default_store
+        object_store_enabled? ? ObjectStorage::Store::REMOTE : ObjectStorage::Store::LOCAL
+      end
+    end
+  end
+end
diff --git a/app/uploaders/terraform/versioned_state_uploader.rb b/app/uploaders/terraform/versioned_state_uploader.rb
index be07993da0f..e50ab6c7dc6 100644
--- a/app/uploaders/terraform/versioned_state_uploader.rb
+++ b/app/uploaders/terraform/versioned_state_uploader.rb
@@ -2,12 +2,22 @@
 
 module Terraform
   class VersionedStateUploader < StateUploader
+    delegate :terraform_state, to: :model
+
     def filename
-      "#{model.version}.tfstate"
+      if terraform_state.versioning_enabled?
+        "#{model.version}.tfstate"
+      else
+        "#{model.uuid}.tfstate"
+      end
     end
 
     def store_dir
-      Gitlab::HashedPath.new(model.uuid, root_hash: project_id)
+      if terraform_state.versioning_enabled?
+        Gitlab::HashedPath.new(model.uuid, root_hash: project_id)
+      else
+        project_id.to_s
+      end
     end
   end
 end