Merge branch 'ssot_repository' into 'master'

Make GlRepository the single source of truth for initialising Repository

See merge request gitlab-org/gitlab!40679

app/models/project.rb

@@ -896,12 +896,12 @@ class Project < ApplicationRecord
   end
 
   def repository
-    @repository ||= Repository.new(full_path, self, shard: repository_storage, disk_path: disk_path)
+    @repository ||= Gitlab::GlRepository::PROJECT.repository_for(self)
   end
 
   def design_repository
     strong_memoize(:design_repository) do
-      DesignManagement::Repository.new(self)
+      Gitlab::GlRepository::DESIGN.repository_for(self)
     end
   end
 

app/models/snippet.rb

@@ -275,7 +275,7 @@ class Snippet < ApplicationRecord
 
   override :repository
   def repository
-    @repository ||= Repository.new(full_path, self, shard: repository_storage, disk_path: disk_path, repo_type: Gitlab::GlRepository::SNIPPET)
+    @repository ||= Gitlab::GlRepository::SNIPPET.repository_for(self)
   end
 
   override :repository_size_checker

app/models/wiki.rb

@@ -180,7 +180,7 @@ class Wiki
 
   override :repository
   def repository
-    @repository ||= Repository.new(full_path, container, shard: repository_storage, disk_path: disk_path, repo_type: Gitlab::GlRepository::WIKI)
+    @repository ||= Gitlab::GlRepository::WIKI.repository_for(container)
   end
 
   def repository_storage

ee/spec/lib/gitlab/gl_repository/repo_type_spec.rb

@@ -12,7 +12,7 @@ RSpec.describe Gitlab::GlRepository::RepoType do
         let(:expected_identifier) { "group-#{expected_id}-wiki" }
         let(:expected_suffix) { '.wiki' }
         let(:expected_container) { group }
-        let(:expected_repository) { expected_container.wiki.repository }
+        let(:expected_repository) { ::Repository.new(group.wiki.full_path, group, shard: group.wiki.repository_storage, disk_path: group.wiki.disk_path, repo_type: Gitlab::GlRepository::WIKI) }
       end
     end
   end

lib/backup/repository.rb

@@ -148,7 +148,7 @@ module Backup
     private
 
     def dump_consecutive
-      Project.includes(:route).find_each(batch_size: 1000) do |project|
+      Project.includes(:route, :group, namespace: :owner).find_each(batch_size: 1000) do |project|
         dump_project(project)
       end
     end
@@ -178,7 +178,7 @@ module Backup
         end
       end
 
-      Project.for_repository_storage(storage).includes(:route).find_each(batch_size: 100) do |project|
+      Project.for_repository_storage(storage).includes(:route, :group, namespace: :owner).find_each(batch_size: 100) do |project|
         break unless errors.empty?
 
         queue.push(project)

lib/gitlab/gl_repository.rb

@@ -7,19 +7,19 @@ module Gitlab
     PROJECT = RepoType.new(
       name: :project,
       access_checker_class: Gitlab::GitAccessProject,
-      repository_resolver: -> (project) { project&.repository }
+      repository_resolver: -> (project) { ::Repository.new(project.full_path, project, shard: project.repository_storage, disk_path: project.disk_path) }
     ).freeze
     WIKI = RepoType.new(
       name: :wiki,
       access_checker_class: Gitlab::GitAccessWiki,
-      repository_resolver: -> (container) { container&.wiki&.repository },
+      repository_resolver: -> (container) { ::Repository.new(container.wiki.full_path, container, shard: container.wiki.repository_storage, disk_path: container.wiki.disk_path, repo_type: WIKI) },
       project_resolver: -> (container) { container.is_a?(Project) ? container : nil },
       suffix: :wiki
     ).freeze
     SNIPPET = RepoType.new(
       name: :snippet,
       access_checker_class: Gitlab::GitAccessSnippet,
-      repository_resolver: -> (snippet) { snippet&.repository },
+      repository_resolver: -> (snippet) { ::Repository.new(snippet.full_path, snippet, shard: snippet.repository_storage, disk_path: snippet.disk_path, repo_type: SNIPPET) },
       container_class: Snippet,
       project_resolver: -> (snippet) { snippet&.project },
       guest_read_ability: :read_snippet

lib/gitlab/gl_repository/repo_type.rb

@@ -57,6 +57,8 @@ module Gitlab
       end
 
       def repository_for(container)
+        return unless container
+
         repository_resolver.call(container)
       end
 

spec/lib/gitlab/gl_repository/repo_type_spec.rb

@@ -17,7 +17,7 @@ RSpec.describe Gitlab::GlRepository::RepoType do
       let(:expected_identifier) { "project-#{expected_id}" }
       let(:expected_suffix) { '' }
       let(:expected_container) { project }
-      let(:expected_repository) { expected_container.repository }
+      let(:expected_repository) { ::Repository.new(project.full_path, project, shard: project.repository_storage, disk_path: project.disk_path, repo_type: Gitlab::GlRepository::PROJECT) }
     end
 
     it 'knows its type' do
@@ -46,7 +46,7 @@ RSpec.describe Gitlab::GlRepository::RepoType do
       let(:expected_identifier) { "wiki-#{expected_id}" }
       let(:expected_suffix) { '.wiki' }
       let(:expected_container) { project }
-      let(:expected_repository) { expected_container.wiki.repository }
+      let(:expected_repository) { ::Repository.new(project.wiki.full_path, project, shard: project.wiki.repository_storage, disk_path: project.wiki.disk_path, repo_type: Gitlab::GlRepository::WIKI) }
     end
 
     it 'knows its type' do
@@ -75,7 +75,7 @@ RSpec.describe Gitlab::GlRepository::RepoType do
         let(:expected_id) { personal_snippet.id }
         let(:expected_identifier) { "snippet-#{expected_id}" }
         let(:expected_suffix) { '' }
-        let(:expected_repository) { personal_snippet.repository }
+        let(:expected_repository) { ::Repository.new(personal_snippet.full_path, personal_snippet, shard: personal_snippet.repository_storage, disk_path: personal_snippet.disk_path, repo_type: Gitlab::GlRepository::SNIPPET) }
         let(:expected_container) { personal_snippet }
       end
 
@@ -104,7 +104,7 @@ RSpec.describe Gitlab::GlRepository::RepoType do
         let(:expected_id) { project_snippet.id }
         let(:expected_identifier) { "snippet-#{expected_id}" }
         let(:expected_suffix) { '' }
-        let(:expected_repository) { project_snippet.repository }
+        let(:expected_repository) { ::Repository.new(project_snippet.full_path, project_snippet, shard: project_snippet.repository_storage, disk_path: project_snippet.disk_path, repo_type: Gitlab::GlRepository::SNIPPET) }
         let(:expected_container) { project_snippet }
       end
 
@@ -133,10 +133,14 @@ RSpec.describe Gitlab::GlRepository::RepoType do
       let(:expected_identifier) { "design-#{project.id}" }
       let(:expected_id) { project.id }
       let(:expected_suffix) { '.design' }
-      let(:expected_repository) { project.design_repository }
+      let(:expected_repository) { ::DesignManagement::Repository.new(project) }
       let(:expected_container) { project }
     end
 
+    it 'uses the design access checker' do
+      expect(described_class.access_checker_class).to eq(::Gitlab::GitAccessDesign)
+    end
+
     it 'knows its type' do
       aggregate_failures do
         expect(described_class).to be_design

spec/lib/gitlab/gl_repository_spec.rb

@@ -31,15 +31,4 @@ RSpec.describe ::Gitlab::GlRepository do
       expect { described_class.parse("project-foo") }.to raise_error(ArgumentError)
     end
   end
-
-  describe 'DESIGN' do
-    it 'uses the design access checker' do
-      expect(described_class::DESIGN.access_checker_class).to eq(::Gitlab::GitAccessDesign)
-    end
-
-    it 'builds a design repository' do
-      expect(described_class::DESIGN.repository_resolver.call(create(:project)))
-        .to be_a(::DesignManagement::Repository)
-    end
-  end
 end

spec/requests/api/internal/base_spec.rb

@@ -1179,7 +1179,7 @@ RSpec.describe API::Internal::Base do
         let(:gl_repository) { "snippet-#{personal_snippet.id}" }
 
         it 'does not try to notify that project moved' do
-          allow(Gitlab::GlRepository).to receive(:parse).and_return([personal_snippet, nil, Gitlab::GlRepository::PROJECT])
+          allow(Gitlab::GlRepository).to receive(:parse).and_return([personal_snippet, nil, Gitlab::GlRepository::SNIPPET])
 
           expect(Gitlab::Checks::ProjectMoved).not_to receive(:fetch_message)
 

spec/support/shared_examples/lib/gitlab/repo_type_shared_examples.rb

@@ -17,5 +17,9 @@ RSpec.shared_examples 'a repo type' do
     it 'finds the repository for the repo type' do
       expect(described_class.repository_for(expected_container)).to eq(expected_repository)
     end
+
+    it 'returns nil when container is nil' do
+      expect(described_class.repository_for(nil)).to eq(nil)
+    end
   end
 end