Revert "Use Dir.mktmpdir"minimal-fix-for-artifacts-service

This reverts commit 28c6a6b04436230e6e9b29855e4d4d4f88d9a554.

1 files changed, 15 insertions, 14 deletions

diff --git a/app/services/ci/create_trace_artifact_service.rb b/app/services/ci/create_trace_artifact_service.rb
index ffde824972c..dae741a371c 100644
--- a/app/services/ci/create_trace_artifact_service.rb
+++ b/app/services/ci/create_trace_artifact_service.rb
@@ -6,8 +6,9 @@ module Ci
       job.trace.read do |stream|
         break unless stream.file?
 
-        clone_file!(stream.path, JobArtifactUploader.workhorse_upload_path) do |clone_path|
-          create_job_trace!(job, clone_path)
+        temp_file!(JobArtifactUploader.workhorse_upload_path) do |temp_path|
+          FileUtils.copy(stream.path, temp_path)
+          create_job_trace!(job, temp_path)
           FileUtils.rm(stream.path)
         end
       end
@@ -16,21 +17,21 @@ module Ci
     private
 
     def create_job_trace!(job, path)
-      File.open(path) do |stream|
-        job.create_job_artifacts_trace!(
-          project: job.project,
-          file_type: :trace,
-          file: stream)
-      end
+      job.create_job_artifacts_trace!(
+        project: job.project,
+        file_type: :trace,
+        file: UploadedFile.new(path, 'job.log', 'application/octet-stream')
+      )
     end
 
-    def clone_file!(src_path, temp_dir)
+    def temp_file!(temp_dir)
       FileUtils.mkdir_p(temp_dir)
-      Dir.mktmpdir('tmp-trace', temp_dir) do |dir_path|
-        temp_path = File.join(dir_path, "job.log")
-        FileUtils.copy(src_path, temp_path)
-        yield(temp_path)
-      end
+      temp_file = Tempfile.new('trace-tmp-', temp_dir)
+      temp_file&.close
+      yield(temp_file.path)
+    ensure
+      temp_file&.close
+      temp_file&.unlink
     end
   end
 end