Rename Storage::HashedProject to Storage::Hashed

app/models/pool_repository.rb

@@ -110,8 +110,8 @@ class PoolRepository < ApplicationRecord
   end
 
   def storage
-    Storage::HashedProject
-      .new(self, prefix: Storage::HashedProject::POOL_PATH_PREFIX)
+    Storage::Hashed
+      .new(self, prefix: Storage::Hashed::POOL_PATH_PREFIX)
   end
 end
 

app/models/project.rb

@@ -2288,7 +2288,7 @@ class Project < ApplicationRecord
   def storage
     @storage ||=
       if hashed_storage?(:repository)
-        Storage::HashedProject.new(self)
+        Storage::Hashed.new(self)
       else
         Storage::LegacyProject.new(self)
       end

app/models/storage/hashed_project.rb → app/models/storage/hashed.rb

 # frozen_string_literal: true
 
 module Storage
-  class HashedProject
+  class Hashed
     attr_accessor :project
     delegate :gitlab_shell, :repository_storage, to: :project
 

app/uploaders/file_uploader.rb

@@ -36,7 +36,7 @@ class FileUploader < GitlabUploader
 
   def self.base_dir(model, store = Store::LOCAL)
     decorated_model = model
-    decorated_model = Storage::HashedProject.new(model) if store == Store::REMOTE
+    decorated_model = Storage::Hashed.new(model) if store == Store::REMOTE
 
     model_path_segment(decorated_model)
   end
@@ -57,7 +57,7 @@ class FileUploader < GitlabUploader
   # Returns a String without a trailing slash
   def self.model_path_segment(model)
     case model
-    when Storage::HashedProject then model.disk_path
+    when Storage::Hashed then model.disk_path
     else
       model.hashed_storage?(:attachments) ? model.disk_path : model.full_path
     end

ee/app/models/geo/fdw/project.rb

@@ -36,7 +36,7 @@ module Geo
       def storage
         @storage ||=
           if hashed_storage?(:repository)
-            Storage::HashedProject.new(self)
+            Storage::Hashed.new(self)
           else
             Storage::LegacyProject.new(self)
           end

ee/spec/factories/geo/event_log.rb

@@ -119,7 +119,7 @@ FactoryBot.define do
     project { create(:project, :repository) }
 
     old_attachments_path { Storage::LegacyProject.new(project).disk_path }
-    new_attachments_path { Storage::HashedProject.new(project).disk_path }
+    new_attachments_path { Storage::Hashed.new(project).disk_path }
   end
 
   factory :geo_lfs_object_deleted_event, class: 'Geo::LfsObjectDeletedEvent' do

ee/spec/services/geo/hashed_storage_attachments_migration_service_spec.rb

@@ -10,7 +10,7 @@ describe Geo::HashedStorageAttachmentsMigrationService do
   let!(:project) { create(:project, :legacy_storage) }
 
   let(:legacy_storage) { Storage::LegacyProject.new(project) }
-  let(:hashed_storage) { Storage::HashedProject.new(project) }
+  let(:hashed_storage) { Storage::Hashed.new(project) }
 
   let!(:upload) { Upload.find_by(path: file_uploader.upload_path) }
   let(:file_uploader) { build(:file_uploader, project: project) }

ee/spec/services/projects/hashed_storage/migrate_attachments_service_spec.rb

@@ -7,7 +7,7 @@ describe Projects::HashedStorage::MigrateAttachmentsService do
 
   let(:project) { create(:project, storage_version: 1) }
   let(:legacy_storage) { Storage::LegacyProject.new(project) }
-  let(:hashed_storage) { Storage::HashedProject.new(project) }
+  let(:hashed_storage) { Storage::Hashed.new(project) }
   let(:old_attachments_path) { legacy_storage.disk_path }
   let(:new_attachments_path) { hashed_storage.disk_path }
 

ee/spec/services/projects/hashed_storage/migrate_repository_service_spec.rb

@@ -8,7 +8,7 @@ describe Projects::HashedStorage::MigrateRepositoryService do
   let(:gitlab_shell) { Gitlab::Shell.new }
   let(:project) { create(:project, :empty_repo, :wiki_repo, :design_repo, :legacy_storage) }
   let(:legacy_storage) { Storage::LegacyProject.new(project) }
-  let(:hashed_storage) { Storage::HashedProject.new(project) }
+  let(:hashed_storage) { Storage::Hashed.new(project) }
   let(:old_disk_path) { legacy_storage.disk_path }
   let(:new_disk_path) { hashed_storage.disk_path }
 

ee/spec/services/projects/hashed_storage/rollback_repository_service_spec.rb

@@ -8,7 +8,7 @@ describe Projects::HashedStorage::RollbackRepositoryService, :clean_gitlab_redis
   let(:gitlab_shell) { Gitlab::Shell.new }
   let(:project) { create(:project, :repository, :wiki_repo, :design_repo, storage_version: ::Project::HASHED_STORAGE_FEATURES[:repository]) }
   let(:legacy_storage) { Storage::LegacyProject.new(project) }
-  let(:hashed_storage) { Storage::HashedProject.new(project) }
+  let(:hashed_storage) { Storage::Hashed.new(project) }
   let(:old_disk_path) { hashed_storage.disk_path }
   let(:new_disk_path) { legacy_storage.disk_path }
 

lib/gitlab/background_migration/backfill_project_fullpath_in_repo_config.rb

@@ -11,7 +11,7 @@ module Gitlab
 
       module Storage
         # Class that returns the disk path for a project using hashed storage
-        class HashedProject
+        class Hashed
           attr_accessor :project
 
           ROOT_PATH_PREFIX = '@hashed'
@@ -121,7 +121,7 @@ module Gitlab
         def storage
           @storage ||=
             if hashed_storage?
-              Storage::HashedProject.new(self)
+              Storage::Hashed.new(self)
             else
               Storage::LegacyProject.new(self)
             end

lib/gitlab/background_migration/backfill_project_repositories.rb

@@ -46,7 +46,7 @@ module Gitlab
 
       module Storage
         # Class that returns the disk path for a project using hashed storage
-        class HashedProject
+        class Hashed
           attr_accessor :project
 
           ROOT_PATH_PREFIX = '@hashed'
@@ -176,7 +176,7 @@ module Gitlab
         def storage
           @storage ||=
             if hashed_storage?
-              Storage::HashedProject.new(self)
+              Storage::Hashed.new(self)
             else
               Storage::LegacyProject.new(self)
             end

spec/lib/gitlab/background_migration/backfill_project_fullpath_in_repo_config_spec.rb

@@ -8,7 +8,7 @@ describe Gitlab::BackgroundMigration::BackfillProjectFullpathInRepoConfig, :migr
   let(:group) { namespaces.create!(name: 'foo', path: 'foo') }
   let(:subgroup) { namespaces.create!(name: 'bar', path: 'bar', parent_id: group.id) }
 
-  describe described_class::Storage::HashedProject do
+  describe described_class::Storage::Hashed do
     let(:project) { double(id: 555) }
 
     subject(:project_storage) { described_class.new(project) }

spec/services/projects/after_rename_service_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 describe Projects::AfterRenameService do
   let(:rugged_config) { rugged_repo(project.repository).config }
   let(:legacy_storage) { Storage::LegacyProject.new(project) }
-  let(:hashed_storage) { Storage::HashedProject.new(project) }
+  let(:hashed_storage) { Storage::Hashed.new(project) }
   let!(:path_before_rename) { project.path }
   let!(:full_path_before_rename) { project.full_path }
   let!(:path_after_rename) { "#{project.path}-renamed" }

spec/services/projects/hashed_storage/migrate_attachments_service_spec.rb

@@ -7,7 +7,7 @@ describe Projects::HashedStorage::MigrateAttachmentsService do
 
   let(:project) { create(:project, :repository, storage_version: 1, skip_disk_validation: true) }
   let(:legacy_storage) { Storage::LegacyProject.new(project) }
-  let(:hashed_storage) { Storage::HashedProject.new(project) }
+  let(:hashed_storage) { Storage::Hashed.new(project) }
 
   let!(:upload) { Upload.find_by(path: file_uploader.upload_path) }
   let(:file_uploader) { build(:file_uploader, project: project) }

spec/services/projects/hashed_storage/migrate_repository_service_spec.rb

@@ -8,7 +8,7 @@ describe Projects::HashedStorage::MigrateRepositoryService do
   let(:gitlab_shell) { Gitlab::Shell.new }
   let(:project) { create(:project, :legacy_storage, :repository, :wiki_repo) }
   let(:legacy_storage) { Storage::LegacyProject.new(project) }
-  let(:hashed_storage) { Storage::HashedProject.new(project) }
+  let(:hashed_storage) { Storage::Hashed.new(project) }
 
   subject(:service) { described_class.new(project: project, old_disk_path: project.disk_path) }
 

spec/services/projects/hashed_storage/rollback_attachments_service_spec.rb

@@ -7,7 +7,7 @@ describe Projects::HashedStorage::RollbackAttachmentsService do
 
   let(:project) { create(:project, :repository, skip_disk_validation: true) }
   let(:legacy_storage) { Storage::LegacyProject.new(project) }
-  let(:hashed_storage) { Storage::HashedProject.new(project) }
+  let(:hashed_storage) { Storage::Hashed.new(project) }
 
   let!(:upload) { Upload.find_by(path: file_uploader.upload_path) }
   let(:file_uploader) { build(:file_uploader, project: project) }

spec/services/projects/hashed_storage/rollback_repository_service_spec.rb

@@ -8,7 +8,7 @@ describe Projects::HashedStorage::RollbackRepositoryService, :clean_gitlab_redis
   let(:gitlab_shell) { Gitlab::Shell.new }
   let(:project) { create(:project, :repository, :wiki_repo, storage_version: ::Project::HASHED_STORAGE_FEATURES[:repository]) }
   let(:legacy_storage) { Storage::LegacyProject.new(project) }
-  let(:hashed_storage) { Storage::HashedProject.new(project) }
+  let(:hashed_storage) { Storage::Hashed.new(project) }
 
   subject(:service) { described_class.new(project: project, old_disk_path: project.disk_path) }