Merge branch '268040-fj-avoid-initializing-wiki-in-import-when-not-present' into 'master'

Avoid creating wiki empty repo when not present in export files

See merge request gitlab-org/gitlab!48890

changelogs/unreleased/268040-fj-avoid-initializing-wiki-in-import-when-not-present.yml

+---
+title: Avoid creating wiki empty repo when not present in export files
+merge_request: 48890
+author:
+type: changed

lib/gitlab/import_export/importer.rb

@@ -79,10 +79,9 @@ module Gitlab
       end
 
       def wiki_restorer
-        Gitlab::ImportExport::WikiRestorer.new(path_to_bundle: wiki_repo_path,
+        Gitlab::ImportExport::RepoRestorer.new(path_to_bundle: wiki_repo_path,
                                                shared: shared,
-                                               project: ProjectWiki.new(project),
-                                               wiki_enabled: project.wiki_enabled?)
+                                               project: ProjectWiki.new(project))
       end
 
       def design_repo_restorer

lib/gitlab/import_export/wiki_restorer.rb

-# frozen_string_literal: true
-
-module Gitlab
-  module ImportExport
-    class WikiRestorer < RepoRestorer
-      def initialize(project:, shared:, path_to_bundle:, wiki_enabled:)
-        super(project: project, shared: shared, path_to_bundle: path_to_bundle)
-
-        @project = project
-        @wiki_enabled = wiki_enabled
-      end
-
-      def restore
-        project.wiki if create_empty_wiki?
-
-        super
-      end
-
-      private
-
-      attr_accessor :project, :wiki_enabled
-
-      def create_empty_wiki?
-        !File.exist?(path_to_bundle) && wiki_enabled
-      end
-    end
-  end
-end

spec/lib/gitlab/import_export/importer_spec.rb

@@ -48,7 +48,6 @@ RSpec.describe Gitlab::ImportExport::Importer do
       [
         Gitlab::ImportExport::AvatarRestorer,
         Gitlab::ImportExport::RepoRestorer,
-        Gitlab::ImportExport::WikiRestorer,
         Gitlab::ImportExport::UploadsRestorer,
         Gitlab::ImportExport::LfsRestorer,
         Gitlab::ImportExport::StatisticsRestorer,
@@ -65,6 +64,20 @@ RSpec.describe Gitlab::ImportExport::Importer do
         end
       end
 
+      it 'calls RepoRestorer with project and wiki' do
+        wiki_repo_path = File.join(shared.export_path, Gitlab::ImportExport.wiki_repo_bundle_filename)
+        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).and_call_original
+
+        expect(restorer).to receive(:restore).and_return(true).twice
+
+        importer.execute
+      end
+
       context 'with sample_data_template' do
         it 'initializes the Sample::TreeRestorer' do
           project.create_or_update_import_data(data: { sample_data: true })

spec/lib/gitlab/import_export/repo_restorer_spec.rb

@@ -5,35 +5,42 @@ require 'spec_helper'
 RSpec.describe Gitlab::ImportExport::RepoRestorer do
   include GitHelpers
 
+  let_it_be(:project_with_repo) do
+    create(:project, :repository, :wiki_repo, name: 'test-repo-restorer', path: 'test-repo-restorer').tap do |p|
+      p.wiki.create_page('page', 'foobar', :markdown, 'created page')
+    end
+  end
+
+  let!(:project) { create(:project) }
+
+  let(:export_path) { "#{Dir.tmpdir}/project_tree_saver_spec" }
+  let(:shared) { project.import_export_shared }
+
+  before do
+    allow(Gitlab::ImportExport).to receive(:storage_path).and_return(export_path)
+
+    bundler.save
+  end
+
+  after do
+    FileUtils.rm_rf(export_path)
+  end
+
   describe 'bundle a project Git repo' do
-    let(:user) { create(:user) }
-    let!(:project_with_repo) { create(:project, :repository, name: 'test-repo-restorer', path: 'test-repo-restorer') }
-    let!(:project) { create(:project) }
-    let(:export_path) { "#{Dir.tmpdir}/project_tree_saver_spec" }
-    let(:shared) { project.import_export_shared }
     let(:bundler) { Gitlab::ImportExport::RepoSaver.new(project: 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) }
 
-    before do
-      allow_next_instance_of(Gitlab::ImportExport) do |instance|
-        allow(instance).to receive(:storage_path).and_return(export_path)
-      end
-
-      bundler.save
-    end
-
     after do
-      FileUtils.rm_rf(export_path)
-      Gitlab::GitalyClient::StorageSettings.allow_disk_access do
-        FileUtils.rm_rf(project_with_repo.repository.path_to_repo)
-        FileUtils.rm_rf(project.repository.path_to_repo)
-      end
+      Gitlab::Shell.new.remove_repository(project.repository_storage, project.disk_path)
     end
 
     it 'restores the repo successfully' do
+      expect(project.repository.exists?).to be false
       expect(subject.restore).to be_truthy
+
+      expect(project.repository.empty?).to be false
     end
 
     context 'when the repository already exists' do
@@ -53,4 +60,35 @@ RSpec.describe Gitlab::ImportExport::RepoRestorer do
       end
     end
   end
+
+  describe 'restore a wiki Git repo' do
+    let(:bundler) { Gitlab::ImportExport::WikiRepoSaver.new(project: 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)) }
+
+    after do
+      Gitlab::Shell.new.remove_repository(project.wiki.repository_storage, project.wiki.disk_path)
+    end
+
+    it 'restores the wiki repo successfully' do
+      expect(project.wiki_repository_exists?).to be false
+
+      subject.restore
+      project.wiki.repository.expire_status_cache
+
+      expect(project.wiki_repository_exists?).to be true
+    end
+
+    describe 'no wiki in the bundle' do
+      let!(:project_without_wiki) { create(:project) }
+
+      let(:bundler) { Gitlab::ImportExport::WikiRepoSaver.new(project: project_without_wiki, shared: shared) }
+
+      it 'does not creates an empty wiki' do
+        expect(subject.restore).to be true
+        expect(project.wiki_repository_exists?).to be false
+      end
+    end
+  end
 end

spec/lib/gitlab/import_export/wiki_restorer_spec.rb

-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe Gitlab::ImportExport::WikiRestorer do
-  describe 'restore a wiki Git repo' do
-    let!(:project_with_wiki) { create(:project, :wiki_repo) }
-    let!(:project_without_wiki) { create(:project) }
-    let!(:project) { create(:project) }
-    let(:export_path) { "#{Dir.tmpdir}/project_tree_saver_spec" }
-    let(:shared) { project.import_export_shared }
-    let(:bundler) { Gitlab::ImportExport::WikiRepoSaver.new(project: project_with_wiki, shared: shared) }
-    let(:bundle_path) { File.join(shared.export_path, Gitlab::ImportExport.project_bundle_filename) }
-    let(:restorer) do
-      described_class.new(path_to_bundle: bundle_path,
-                          shared: shared,
-                          project: project.wiki,
-                          wiki_enabled: true)
-    end
-
-    before do
-      allow(Gitlab::ImportExport).to receive(:storage_path).and_return(export_path)
-
-      bundler.save
-    end
-
-    after do
-      FileUtils.rm_rf(export_path)
-      Gitlab::Shell.new.remove_repository(project_with_wiki.wiki.repository_storage, project_with_wiki.wiki.disk_path)
-      Gitlab::Shell.new.remove_repository(project.wiki.repository_storage, project.wiki.disk_path)
-    end
-
-    it 'restores the wiki repo successfully' do
-      expect(restorer.restore).to be true
-    end
-
-    describe "no wiki in the bundle" do
-      let(:bundler) { Gitlab::ImportExport::WikiRepoSaver.new(project: project_without_wiki, shared: shared) }
-
-      it 'creates an empty wiki' do
-        expect(restorer.restore).to be true
-
-        expect(project.wiki_repository_exists?).to be true
-      end
-    end
-  end
-end