Merge branch '4826-geo-wikisyncservice-attempts-to-sync-projects' into 'master'

Create an empty wiki when there is no wiki in the gitlab export bundle

See merge request gitlab-org/gitlab-ce!17010

4 files changed, 76 insertions, 2 deletions

diff --git a/changelogs/unreleased/4826-geo-wikisyncservice-attempts-to-sync-projects.yml b/changelogs/unreleased/4826-geo-wikisyncservice-attempts-to-sync-projects.yml
new file mode 100644
index 00000000000..7f1ccbfcc7e
--- /dev/null
+++ b/changelogs/unreleased/4826-geo-wikisyncservice-attempts-to-sync-projects.yml
@@ -0,0 +1,5 @@
+---
+title: Create empty wiki when import from GitLab and wiki is not there
+merge_request:
+author:
+type: fixed
diff --git a/lib/gitlab/import_export/importer.rb b/lib/gitlab/import_export/importer.rb
index c14646b0611..a00795f553e 100644
--- a/lib/gitlab/import_export/importer.rb
+++ b/lib/gitlab/import_export/importer.rb
@@ -50,9 +50,10 @@ module Gitlab
       end
 
       def wiki_restorer
-        Gitlab::ImportExport::RepoRestorer.new(path_to_bundle: wiki_repo_path,
+        Gitlab::ImportExport::WikiRestorer.new(path_to_bundle: wiki_repo_path,
                                                shared: @shared,
-                                               project: ProjectWiki.new(project_tree.restored_project))
+                                               project: ProjectWiki.new(project_tree.restored_project),
+                                               wiki_enabled: @project.wiki_enabled?)
       end
 
       def uploads_restorer
diff --git a/lib/gitlab/import_export/wiki_restorer.rb b/lib/gitlab/import_export/wiki_restorer.rb
new file mode 100644
index 00000000000..f33bfb332ab
--- /dev/null
+++ b/lib/gitlab/import_export/wiki_restorer.rb
@@ -0,0 +1,23 @@
+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)
+
+        @wiki_enabled = wiki_enabled
+      end
+
+      def restore
+        @project.wiki if create_empty_wiki?
+
+        super
+      end
+
+      private
+
+      def create_empty_wiki?
+        !File.exist?(@path_to_bundle) && @wiki_enabled
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/import_export/wiki_restorer_spec.rb b/spec/lib/gitlab/import_export/wiki_restorer_spec.rb
new file mode 100644
index 00000000000..81b654e9c5f
--- /dev/null
+++ b/spec/lib/gitlab/import_export/wiki_restorer_spec.rb
@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+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) { Gitlab::ImportExport::Shared.new(relative_path: project.full_path) }
+    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_path, project_with_wiki.wiki.disk_path)
+      Gitlab::Shell.new.remove_repository(project.wiki.repository_storage_path, 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