Merge branch '207886-fj-refactor-export-repo-restorers-to-use-exportable' into 'master'

Refactor repo importers to use exportable instead of project

See merge request gitlab-org/gitlab!52187

doc/development/import_project.md

@@ -170,7 +170,7 @@ The last option is to import a project using a Rails console:
 
    Gitlab::ImportExport::RepoRestorer.new(path_to_bundle: repo_path,
                                           shared: shared,
-                                          project: project).restore
+                                          importable: project).restore
    ```
 
    We are storing all import failures in the `import_failures` data table.

lib/gitlab/import_export/design_repo_restorer.rb

@@ -3,10 +3,11 @@
 module Gitlab
   module ImportExport
     class DesignRepoRestorer < RepoRestorer
-      def initialize(project:, shared:, path_to_bundle:)
-        super(project: project, shared: shared, path_to_bundle: path_to_bundle)
+      extend ::Gitlab::Utils::Override
 
-        @repository = project.design_repository
+      override :repository
+      def repository
+        @repository ||= importable.design_repository
       end
 
       # `restore` method is handled in super class

lib/gitlab/import_export/importer.rb

@@ -75,19 +75,19 @@ module Gitlab
       def repo_restorer
         Gitlab::ImportExport::RepoRestorer.new(path_to_bundle: repo_path,
                                                shared: shared,
-                                               project: project)
+                                               importable: project)
       end
 
       def wiki_restorer
         Gitlab::ImportExport::RepoRestorer.new(path_to_bundle: wiki_repo_path,
                                                shared: shared,
-                                               project: ProjectWiki.new(project))
+                                               importable: ProjectWiki.new(project))
       end
 
       def design_repo_restorer
         Gitlab::ImportExport::DesignRepoRestorer.new(path_to_bundle: design_repo_path,
                                                      shared: shared,
-                                                     project: project)
+                                                     importable: project)
       end
 
       def uploads_restorer

lib/gitlab/import_export/repo_restorer.rb

@@ -5,10 +5,12 @@ module Gitlab
     class RepoRestorer
       include Gitlab::ImportExport::CommandLineUtil
 
-      def initialize(project:, shared:, path_to_bundle:)
-        @repository = project.repository
+      attr_reader :importable
+
+      def initialize(importable:, shared:, path_to_bundle:)
         @path_to_bundle = path_to_bundle
         @shared = shared
+        @importable = importable
       end
 
       def restore
@@ -22,9 +24,13 @@ module Gitlab
         false
       end
 
+      def repository
+        @repository ||= importable.repository
+      end
+
       private
 
-      attr_accessor :repository, :path_to_bundle, :shared
+      attr_accessor :path_to_bundle, :shared
 
       def ensure_repository_does_not_exist!
         if repository.exists?

spec/lib/gitlab/import_export/design_repo_restorer_spec.rb

@@ -16,7 +16,7 @@ RSpec.describe Gitlab::ImportExport::DesignRepoRestorer do
     let(:restorer) do
       described_class.new(path_to_bundle: bundle_path,
                           shared: shared,
-                          project: project)
+                          importable: project)
     end
 
     before do

spec/lib/gitlab/import_export/fork_spec.rb

@@ -16,7 +16,7 @@ RSpec.describe 'forked project import' do
   let(:bundle_path) { File.join(shared.export_path, Gitlab::ImportExport.project_bundle_filename) }
 
   let(:repo_restorer) do
-    Gitlab::ImportExport::RepoRestorer.new(path_to_bundle: bundle_path, shared: shared, project: project)
+    Gitlab::ImportExport::RepoRestorer.new(path_to_bundle: bundle_path, shared: shared, importable: project)
   end
 
   let!(:merge_request) do

spec/lib/gitlab/import_export/importer_spec.rb

@@ -69,8 +69,8 @@ RSpec.describe Gitlab::ImportExport::Importer do
         repo_path = File.join(shared.export_path, Gitlab::ImportExport.project_bundle_filename)
         restorer = double(Gitlab::ImportExport::RepoRestorer)
 
-        expect(Gitlab::ImportExport::RepoRestorer).to receive(:new).with(path_to_bundle: repo_path, shared: shared, project: project).and_return(restorer)
-        expect(Gitlab::ImportExport::RepoRestorer).to receive(:new).with(path_to_bundle: wiki_repo_path, shared: shared, project: ProjectWiki.new(project)).and_return(restorer)
+        expect(Gitlab::ImportExport::RepoRestorer).to receive(:new).with(path_to_bundle: repo_path, shared: shared, importable: project).and_return(restorer)
+        expect(Gitlab::ImportExport::RepoRestorer).to receive(:new).with(path_to_bundle: wiki_repo_path, shared: shared, importable: ProjectWiki.new(project)).and_return(restorer)
         expect(Gitlab::ImportExport::RepoRestorer).to receive(:new).and_call_original
 
         expect(restorer).to receive(:restore).and_return(true).twice

spec/lib/gitlab/import_export/repo_restorer_spec.rb

@@ -30,7 +30,7 @@ RSpec.describe Gitlab::ImportExport::RepoRestorer do
     let(:bundler) { Gitlab::ImportExport::RepoSaver.new(exportable: project_with_repo, shared: shared) }
     let(:bundle_path) { File.join(shared.export_path, Gitlab::ImportExport.project_bundle_filename) }
 
-    subject { described_class.new(path_to_bundle: bundle_path, shared: shared, project: project) }
+    subject { described_class.new(path_to_bundle: bundle_path, shared: shared, importable: project) }
 
     after do
       Gitlab::Shell.new.remove_repository(project.repository_storage, project.disk_path)
@@ -65,7 +65,7 @@ RSpec.describe Gitlab::ImportExport::RepoRestorer do
     let(:bundler) { Gitlab::ImportExport::WikiRepoSaver.new(exportable: project_with_repo, shared: shared) }
     let(:bundle_path) { File.join(shared.export_path, Gitlab::ImportExport.wiki_repo_bundle_filename) }
 
-    subject { described_class.new(path_to_bundle: bundle_path, shared: shared, project: ProjectWiki.new(project)) }
+    subject { described_class.new(path_to_bundle: bundle_path, shared: shared, importable: ProjectWiki.new(project)) }
 
     after do
       Gitlab::Shell.new.remove_repository(project.wiki.repository_storage, project.wiki.disk_path)