Merge branches 'feature/project-export' and 'feature/project-import' of...

Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import

app/services/projects/import_export/export_service.rb

@@ -4,8 +4,8 @@ module Projects
 
       def execute(options = {})
         @shared = Gitlab::ImportExport::Shared.new(relative_path: File.join(project.path_with_namespace, 'work'))
-        # TODO handle errors
         save_all if [save_project_tree, bundle_repo, bundle_wiki_repo].all?
+        notify_worker if @shared.errors.any?
       end
 
       private
@@ -23,7 +23,11 @@ module Projects
       end
 
       def save_all
-        Gitlab::ImportExport::Saver.save(storage_path: @shared.export_path)
+        Gitlab::ImportExport::Saver.save(shared: @shared)
+      end
+
+      def notify_worker
+        raise Gitlab::ImportExport::Error @shared.errors.join(', ')
       end
     end
   end

lib/gitlab/import_export.rb

@@ -6,10 +6,6 @@ module Gitlab
       File.join(storage_path, relative_path)
     end
 
-    def project_tree
-      Gitlab::ImportExport::ImportExportReader.new.project_tree
-    end
-
     def storage_path
       File.join(Settings.shared['path'], 'tmp/project_exports')
     end

lib/gitlab/import_export/error.rb

+module Gitlab
+  module ImportExport
+    class Error < StandardError; end
+  end
+end
\ No newline at end of file

lib/gitlab/import_export/import_export_reader.rb

@@ -2,16 +2,18 @@ module Gitlab
   module ImportExport
     class ImportExportReader
 
-      def initialize(config: 'lib/gitlab/import_export/import_export.yml')
-        config_hash = YAML.load_file(config).with_indifferent_access
+      def initialize(config: 'lib/gitlab/import_export/import_export.yml', shared:)
+        @shared = shared
+        config_hash = YAML.load_file(config).deep_symbolize_keys
         @tree = config_hash[:project_tree]
         @attributes_parser = Gitlab::ImportExport::AttributesFinder.new(included_attributes: config_hash[:included_attributes],
                                                                         excluded_attributes: config_hash[:excluded_attributes])
-        @json_config_hash = {}
       end
 
       def project_tree
         @attributes_parser.find_included(:project).merge(include: build_hash(@tree))
+      rescue => e
+        @shared.error(e.message)
       end
 
       private
@@ -27,6 +29,8 @@ module Gitlab
       end
 
       def build_json_config_hash(model_object_hash)
+        @json_config_hash = {}
+
         model_object_hash.values.flatten.each do |model_object|
           current_key = model_object_hash.keys.first
 
@@ -61,7 +65,7 @@ module Gitlab
       end
 
       def hash_or_merge(value, hash)
-        value.is_a?(Hash) ? value.merge(hash) : hash
+        value.is_a?(Hash) ? value.merge(hash) : { value => hash }
       end
     end
   end

lib/gitlab/import_export/project_tree_saver.rb

@@ -5,16 +5,16 @@ module Gitlab
 
       def initialize(project:, shared:)
         @project = project
-        @export_path = shared.export_path
-        @full_path = File.join(@export_path, project_filename)
+        @shared = shared
+        @full_path = File.join(@shared.export_path, project_filename)
       end
 
       def save
-        FileUtils.mkdir_p(@export_path)
+        FileUtils.mkdir_p(@shared.export_path)
         File.write(full_path, project_json_tree)
         true
-      rescue
-        # TODO: handle error
+      rescue => e
+        @shared.error(e.message)
         false
       end
 
@@ -26,7 +26,7 @@ module Gitlab
       end
 
       def project_json_tree
-        @project.to_json(Gitlab::ImportExport.project_tree)
+        @project.to_json(Gitlab::ImportExport::ImportExportReader.new(shared: @shared).project_tree)
       end
     end
   end

lib/gitlab/import_export/repo_bundler.rb

@@ -7,21 +7,22 @@ module Gitlab
 
       def initialize(project: , shared: )
         @project = project
-        @export_path = shared.export_path
+        @shared = shared
       end
 
       def bundle
         return false if @project.empty_repo?
-        @full_path = File.join(@export_path, project_filename)
+        @full_path = File.join(@shared.export_path, project_filename)
         bundle_to_disk
       end
 
       private
 
       def bundle_to_disk
-        FileUtils.mkdir_p(@export_path)
+        FileUtils.mkdir_p(@shared.export_path)
         git_bundle(repo_path: path_to_repo, bundle_path: @full_path)
-      rescue
+      rescue => e
+        @shared.error(e.message)
         false
       end
 

lib/gitlab/import_export/saver.rb

@@ -7,32 +7,35 @@ module Gitlab
         new(*args).save
       end
 
-      def initialize(storage_path:)
-        @storage_path = storage_path
+      def initialize(shared:)
+        @shared = shared
       end
 
       def save
         if compress_and_save
-          remove_storage_path
+          remove_@shared.storage_path
           Rails.logger.info("Saved project export #{archive_file}")
           archive_file
         else
           false
         end
+      rescue => e
+        @shared.error(e.message)
+        false
       end
 
       private
 
       def compress_and_save
-        tar_czf(archive: archive_file, dir: @storage_path)
+        tar_czf(archive: archive_file, dir: @shared.storage_path)
       end
 
-      def remove_storage_path
-        FileUtils.rm_rf(@storage_path)
+      def remove_shared.storage_path
+        FileUtils.rm_rf(@shared.storage_path)
       end
 
       def archive_file
-        @archive_file ||= File.join(@storage_path, '..', "#{Time.now.strftime('%Y-%m-%d_%H-%M-%3N')}_project_export.tar.gz")
+        @archive_file ||= File.join(@shared.storage_path, '..', "#{Time.now.strftime('%Y-%m-%d_%H-%M-%3N')}_project_export.tar.gz")
       end
     end
   end

lib/gitlab/import_export/shared.rb

 module Gitlab
   module ImportExport
     class Shared
+
+      attr_reader :errors
+
       def initialize(opts)
         @opts = opts
+        @errors = []
       end
 
       def export_path
         @export_path ||= Gitlab::ImportExport.export_path(relative_path: @opts[:relative_path])
       end
+
+      def error(message)
+        error_out(message, caller[0].dup)
+        @errors << message
+      end
+
+      private
+
+      def error_out(message, caller)
+        Rails.logger.error("Import/Export error raised on #{caller}: #{message}")
+      end
     end
   end
 end

lib/gitlab/import_export/wiki_repo_bundler.rb

@@ -4,14 +4,15 @@ module Gitlab
       def bundle
         @wiki = ProjectWiki.new(@project)
         return true if !wiki? # it's okay to have no Wiki
-        @full_path = File.join(@export_path, project_filename)
+        @full_path = File.join(@shared.export_path, project_filename)
         bundle_to_disk
       end
 
       def bundle_to_disk
-        FileUtils.mkdir_p(@export_path)
+        FileUtils.mkdir_p(@shared.export_path)
         git_bundle(repo_path: path_to_repo, bundle_path: @full_path)
-      rescue
+      rescue => e
+        @shared.error(e.message)
         false
       end
 

spec/lib/gitlab/import_export/import_export_reader_spec.rb

 require 'spec_helper'
 
 describe Gitlab::ImportExport::ImportExportReader do
-
+  let(:shared) { Gitlab::ImportExport::Shared.new(relative_path:'') }
   let(:test_config) { 'spec/support/import_export/import_export.yml' }
   let(:project_tree_hash) do
     {
@@ -17,6 +17,6 @@ describe Gitlab::ImportExport::ImportExportReader do
   end
 
   it 'should generate hash from project tree config' do
-    expect(described_class.new(config: test_config).project_tree) =~ (project_tree_hash)
+    expect(described_class.new(config: test_config, shared: shared).project_tree) =~ (project_tree_hash)
   end
 end