Merge branch 'track-project-import-failure' into 'master'

Track project import failure

Fixes #12512 

This also help us on identify why the import process is returning the wrong status when the project was successfully imported. Like mentioned in the issue #12450 

See merge request !2538

2 files changed, 74 insertions, 39 deletions

diff --git a/app/services/projects/import_service.rb b/app/services/projects/import_service.rb
new file mode 100644
index 00000000000..2015897dd19
--- /dev/null
+++ b/app/services/projects/import_service.rb
@@ -0,0 +1,67 @@
+module Projects
+  class ImportService < BaseService
+    include Gitlab::ShellAdapter
+
+    class Error < StandardError; end
+
+    ALLOWED_TYPES = [
+      'bitbucket',
+      'fogbugz',
+      'gitlab',
+      'github',
+      'google_code'
+    ]
+
+    def execute
+      if unknown_url?
+        # In this case, we only want to import issues, not a repository.
+        create_repository
+      else
+        import_repository
+      end
+
+      import_data
+
+      success
+    rescue Error => e
+      error(e.message)
+    end
+
+    private
+
+    def create_repository
+      unless project.create_repository
+        raise Error, 'The repository could not be created.'
+      end
+    end
+
+    def import_repository
+      begin
+        gitlab_shell.import_repository(project.path_with_namespace, project.import_url)
+      rescue Gitlab::Shell::Error => e
+        raise Error, e.message
+      end
+    end
+
+    def import_data
+      return unless has_importer?
+
+      unless importer.execute
+        raise Error, 'The remote data could not be imported.'
+      end
+    end
+
+    def has_importer?
+      ALLOWED_TYPES.include?(project.import_type)
+    end
+
+    def importer
+      class_name = "Gitlab::#{project.import_type.camelize}Import::Importer"
+      class_name.constantize.new(project)
+    end
+
+    def unknown_url?
+      project.import_url == Project::UNKNOWN_IMPORT_URL
+    end
+  end
+end
diff --git a/app/workers/repository_import_worker.rb b/app/workers/repository_import_worker.rb
index d18c0706b30..e295a9ddd14 100644
--- a/app/workers/repository_import_worker.rb
+++ b/app/workers/repository_import_worker.rb
@@ -4,52 +4,20 @@ class RepositoryImportWorker
 
   sidekiq_options queue: :gitlab_shell
 
-  def perform(project_id)
-    project = Project.find(project_id)
+  attr_accessor :project, :current_user
 
-    if project.import_url == Project::UNKNOWN_IMPORT_URL
-      # In this case, we only want to import issues, not a repository.
-      unless project.create_repository
-        project.update(import_error: "The repository could not be created.")
-        project.import_fail
-        return
-      end
-    else
-      begin
-        gitlab_shell.import_repository(project.path_with_namespace, project.import_url)
-      rescue Gitlab::Shell::Error => e
-        project.update(import_error: e.message)
-        project.import_fail
-        return
-      end
-    end
+  def perform(project_id)
+    @project = Project.find(project_id)
+    @current_user = @project.creator
 
-    data_import_result =
-      case project.import_type
-      when 'github'
-        Gitlab::GithubImport::Importer.new(project).execute
-      when 'gitlab'
-        Gitlab::GitlabImport::Importer.new(project).execute
-      when 'bitbucket'
-        Gitlab::BitbucketImport::Importer.new(project).execute
-      when 'google_code'
-        Gitlab::GoogleCodeImport::Importer.new(project).execute
-      when 'fogbugz'
-        Gitlab::FogbugzImport::Importer.new(project).execute
-      else
-        true
-      end
+    result = Projects::ImportService.new(project, current_user).execute
 
-    unless data_import_result
-      project.update(import_error: "The remote issue data could not be imported.")
+    if result[:status] == :error
+      project.update(import_error: result[:message])
       project.import_fail
       return
     end
 
-    if project.import_type == 'bitbucket'
-      Gitlab::BitbucketImport::KeyDeleter.new(project).execute
-    end
-
     project.import_finish
   end
 end