Merge branch 'fj-6860-instance-level-project-templates' into 'master'

[CE Port]: Implement instance level project templates

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

2 files changed, 47 insertions, 29 deletions

diff --git a/app/services/projects/create_from_template_service.rb b/app/services/projects/create_from_template_service.rb
index f5c48e56880..8306d43ca7c 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).presence
+      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