diff options
author | Francisco Javier López <fjlopez@gitlab.com> | 2018-07-21 02:25:10 +0300 |
---|---|---|
committer | Francisco Javier López <fjlopez@gitlab.com> | 2018-07-21 02:25:10 +0300 |
commit | 38eab74483e728018a129c36d4064313f5d152f6 (patch) | |
tree | f946438bc3085b175fe20e08ebf0773cfbfdb782 /app | |
parent | 334ee10727540c8e16d47075781564fd21e8a9cb (diff) |
EE Port
Diffstat (limited to 'app')
-rw-r--r-- | app/services/projects/create_from_template_service.rb | 12 | ||||
-rw-r--r-- | app/services/projects/gitlab_projects_import_service.rb | 64 | ||||
-rw-r--r-- | app/workers/repository_import_worker.rb | 16 |
3 files changed, 58 insertions, 34 deletions
diff --git a/app/services/projects/create_from_template_service.rb b/app/services/projects/create_from_template_service.rb index f5c48e56880..79b28ff6688 100644 --- a/app/services/projects/create_from_template_service.rb +++ b/app/services/projects/create_from_template_service.rb @@ -2,21 +2,27 @@ module Projects class CreateFromTemplateService < BaseService + include Gitlab::Utils::StrongMemoize + def initialize(user, params) @current_user, @params = user, params.dup end def execute - template_name = params.delete(:template_name) - file = Gitlab::ProjectTemplate.find(template_name).file + file = Gitlab::ProjectTemplate.find(template_name)&.file override_params = params.dup params[:file] = file GitlabProjectsImportService.new(current_user, params, override_params).execute - ensure file&.close end + + def template_name + strong_memoize(:template_name) do + params.delete(:template_name) + end + end end end diff --git a/app/services/projects/gitlab_projects_import_service.rb b/app/services/projects/gitlab_projects_import_service.rb index bc6e9caebb8..615dccc4685 100644 --- a/app/services/projects/gitlab_projects_import_service.rb +++ b/app/services/projects/gitlab_projects_import_service.rb @@ -5,6 +5,9 @@ # The latter will under the hood just import an archive supplied by GitLab. module Projects class GitlabProjectsImportService + include Gitlab::Utils::StrongMemoize + include Gitlab::TemplateHelper + attr_reader :current_user, :params def initialize(user, import_params, override_params = nil) @@ -12,39 +15,17 @@ module Projects end def execute - FileUtils.mkdir_p(File.dirname(import_upload_path)) - - file = params.delete(:file) - FileUtils.copy_entry(file.path, import_upload_path) - - @overwrite = params.delete(:overwrite) - data = {} - data[:override_params] = @override_params if @override_params - - if overwrite_project? - data[:original_path] = params[:path] - params[:path] += "-#{tmp_filename}" - end + prepare_template_environment(template_file&.path) - params[:import_type] = 'gitlab_project' - params[:import_source] = import_upload_path - params[:import_data] = { data: data } if data.present? + prepare_import_params ::Projects::CreateService.new(current_user, params).execute end private - def import_upload_path - @import_upload_path ||= Gitlab::ImportExport.import_upload_path(filename: tmp_filename) - end - - def tmp_filename - SecureRandom.hex - end - def overwrite_project? - @overwrite && project_with_same_full_path? + overwrite? && project_with_same_full_path? end def project_with_same_full_path? @@ -52,7 +33,38 @@ module Projects end def current_namespace - @current_namespace ||= Namespace.find_by(id: params[:namespace_id]) + strong_memoize(:current_namespace) do + Namespace.find_by(id: params[:namespace_id]) + end + end + + def overwrite? + strong_memoize(:overwrite) do + params.delete(:overwrite) + end + end + + def template_file + strong_memoize(:template_file) do + params.delete(:file) + end + end + + def prepare_import_params + data = {} + data[:override_params] = @override_params if @override_params + + if overwrite_project? + data[:original_path] = params[:path] + params[:path] += "-#{tmp_filename}" + end + + if template_file + params[:import_type] = 'gitlab_project' + params[:import_source] = import_upload_path + end + + params[:import_data] = { data: data } if data.present? end end end diff --git a/app/workers/repository_import_worker.rb b/app/workers/repository_import_worker.rb index 25fec542ac7..16b93313ece 100644 --- a/app/workers/repository_import_worker.rb +++ b/app/workers/repository_import_worker.rb @@ -6,10 +6,12 @@ class RepositoryImportWorker include ProjectStartImport include ProjectImportOptions + attr_reader :project + def perform(project_id) - project = Project.find(project_id) + @project = Project.find(project_id) - return unless start_import(project) + return unless start_import Gitlab::Metrics.add_event(:import_repository, import_url: project.import_url, @@ -23,7 +25,7 @@ class RepositoryImportWorker return if service.async? if result[:status] == :error - fail_import(project, result[:message]) if project.gitlab_project_import? + fail_import(result[:message]) if template_import? raise result[:message] end @@ -33,14 +35,18 @@ class RepositoryImportWorker private - def start_import(project) + def start_import return true if start(project) Rails.logger.info("Project #{project.full_path} was in inconsistent state (#{project.import_status}) while importing.") false end - def fail_import(project, message) + def fail_import(message) project.mark_import_as_failed(message) end + + def template_import? + project.gitlab_project_import? + end end |