enforce the use of hashed storage for remote file uploads

app/uploaders/file_uploader.rb

@@ -51,17 +51,15 @@ class FileUploader < GitlabUploader
   #
   # Returns a String without a trailing slash
   def self.model_path_segment(model)
-    if model.hashed_storage?(:attachments)
-      model.disk_path
+    case model
+    when Storage::HashedProject then model.disk_path
+    when Project then
+      model.hashed_storage?(:attachments) ? model.disk_path : model.full_path
     else
       model.full_path
     end
   end
 
-  def self.upload_path(secret, identifier)
-    File.join(secret, identifier)
-  end
-
   def self.generate_secret
     SecureRandom.hex
   end
@@ -75,8 +73,12 @@ class FileUploader < GitlabUploader
     apply_context!(uploader_context)
   end
 
+  # enforce the usage of Hashed storage when storing to
+  # remote store as the FileMover doesn't support OS
   def base_dir
-    self.class.base_dir(@model)
+    model = file_storage? ? @model : Storage::HashedProject.new(@model)
+
+    self.class.base_dir(model)
   end
 
   # we don't need to know the actual path, an uploader instance should be
@@ -86,15 +88,18 @@ class FileUploader < GitlabUploader
   end
 
   def upload_path
-    self.class.upload_path(dynamic_segment, identifier)
+    if file_storage? # Legacy
+      File.join(dynamic_segment, identifier)
+    else
+      File.join(store_dir, identifier)
     end
-
-  def model_path_segment
-    self.class.model_path_segment(@model)
   end
 
-  def store_dir
-    File.join(base_dir, dynamic_segment)
+  def store_dirs
+    {
+      Store::LOCAL => local_store_dir = File.join(base_dir, dynamic_segment),
+      Store::REMOTE => local_store_dir
+    }
   end
 
   def markdown_link
@@ -134,6 +139,9 @@ class FileUploader < GitlabUploader
 
   private
 
+  def hashed_model
+  end
+
   def apply_context!(uploader_context)
     @secret, @identifier = uploader_context.values_at(:secret, :identifier)
 

spec/uploaders/file_uploader_spec.rb

@@ -11,20 +11,20 @@ describe FileUploader do
   shared_examples 'builds correct legacy storage paths' do
     include_examples 'builds correct paths',
                      store_dir: %r{awesome/project/\h+},
+                     upload_path: %r{\h+/<filename>},
                      absolute_path: %r{#{described_class.root}/awesome/project/secret/foo.jpg}
   end
 
-  shared_examples 'uses hashed storage' do
+  context 'legacy storage' do
+    it_behaves_like 'builds correct legacy storage paths'
+
+    context 'uses hashed storage' do
       context 'when rolled out attachments' do
         let(:project) { build_stubbed(:project, namespace: group, name: 'project') }
 
-      before do
-        allow(project).to receive(:disk_path).and_return('ca/fe/fe/ed')
-      end
-
-      it_behaves_like 'builds correct paths',
-                      store_dir: %r{ca/fe/fe/ed/\h+},
-                      absolute_path: %r{#{described_class.root}/ca/fe/fe/ed/secret/foo.jpg}
+        include_examples 'builds correct paths',
+                         store_dir: %r{@hashed/\h{2}/\h{2}/\h+},
+                         upload_path: %r{\h+/<filename>}
       end
 
       context 'when only repositories are rolled out' do
@@ -33,10 +33,6 @@ describe FileUploader do
         it_behaves_like 'builds correct legacy storage paths'
       end
     end
-
-  context 'legacy storage' do
-    it_behaves_like 'builds correct legacy storage paths'
-    include_examples 'uses hashed storage'
   end
 
   context 'object store is remote' do
@@ -46,8 +42,10 @@ describe FileUploader do
 
     include_context 'with storage', described_class::Store::REMOTE
 
-    it_behaves_like 'builds correct legacy storage paths'
-    include_examples 'uses hashed storage'
+    # always use hashed storage path for remote uploads
+    it_behaves_like 'builds correct paths',
+                     store_dir: %r{@hashed/\h{2}/\h{2}/\h+},
+                     upload_path: %r{@hashed/\h{2}/\h{2}/\h+/\h+/<filename>}
   end
 
   describe 'initialize' do