Merge branch 'georgekoltsov/update-project-export-temp-folder-cleanup' into 'master'

Update Project/Group Exporter temp folder cleanup

See merge request gitlab-org/gitlab!51969

app/services/groups/import_export/export_service.rb

@@ -22,7 +22,7 @@ module Groups
 
         save!
       ensure
-        remove_base_tmp_dir
+        remove_archive_tmp_dir
       end
 
       private
@@ -81,8 +81,8 @@ module Groups
         Gitlab::ImportExport::Saver.new(exportable: @group, shared: @shared)
       end
 
-      def remove_base_tmp_dir
-        FileUtils.rm_rf(shared.base_path) if shared&.base_path
+      def remove_archive_tmp_dir
+        FileUtils.rm_rf(shared.archive_path) if shared&.archive_path
       end
 
       def notify_error!

changelogs/unreleased/georgekoltsov-update-project-export-temp-folder-cleanup.yml

+---
+title: Update Project/Group Exporter temp folder cleanup
+merge_request: 51969
+author:
+type: fixed

lib/gitlab/import_export/saver.rb

@@ -31,7 +31,7 @@ module Gitlab
         @shared.error(e)
         false
       ensure
-        remove_base_tmp_dir
+        remove_archive_tmp_dir
       end
 
       private
@@ -40,8 +40,8 @@ module Gitlab
         tar_czf(archive: archive_file, dir: @shared.export_path)
       end
 
-      def remove_base_tmp_dir
-        FileUtils.rm_rf(@shared.base_path)
+      def remove_archive_tmp_dir
+        FileUtils.rm_rf(@shared.archive_path)
       end
 
       def archive_file

spec/lib/gitlab/import_export/saver_spec.rb

@@ -6,7 +6,8 @@ require 'fileutils'
 RSpec.describe Gitlab::ImportExport::Saver do
   let!(:project) { create(:project, :public, name: 'project') }
   let(:base_path) { "#{Dir.tmpdir}/project_tree_saver_spec" }
-  let(:export_path) { "#{base_path}/project_tree_saver_spec/export" }
+  let(:archive_path) { "#{base_path}/archive" }
+  let(:export_path) { "#{archive_path}/export" }
   let(:shared) { project.import_export_shared }
 
   subject { described_class.new(exportable: project, shared: shared) }
@@ -35,10 +36,13 @@ RSpec.describe Gitlab::ImportExport::Saver do
       .to match(%r[\/uploads\/-\/system\/import_export_upload\/export_file.*])
   end
 
-  it 'removes tmp files' do
+  it 'removes archive path and keeps base path untouched' do
+    allow(shared).to receive(:archive_path).and_return(archive_path)
+
     subject.save
 
-    expect(FileUtils).to have_received(:rm_rf).with(base_path)
-    expect(Dir.exist?(base_path)).to eq(false)
+    expect(FileUtils).not_to have_received(:rm_rf).with(base_path)
+    expect(FileUtils).to have_received(:rm_rf).with(archive_path)
+    expect(Dir.exist?(archive_path)).to eq(false)
   end
 end

spec/services/groups/import_export/export_service_spec.rb

@@ -134,7 +134,7 @@ RSpec.describe Groups::ImportExport::ExportService do
           expect { service.execute }.to raise_error(Gitlab::ImportExport::Error)
 
           expect(group.import_export_upload).to be_nil
-          expect(Dir.exist?(shared.base_path)).to eq(false)
+          expect(Dir.exist?(shared.archive_path)).to eq(false)
         end
 
         it 'notifies the user about failed group export' do
@@ -159,7 +159,7 @@ RSpec.describe Groups::ImportExport::ExportService do
           expect { service.execute }.to raise_error(Gitlab::ImportExport::Error)
 
           expect(group.import_export_upload).to be_nil
-          expect(Dir.exist?(shared.base_path)).to eq(false)
+          expect(Dir.exist?(shared.archive_path)).to eq(false)
         end
 
         it 'notifies logger' do