diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-15 20:48:22 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-15 20:48:22 +0000 |
| commit | 7fc80ce5a5d21d2ba452eefabb02a2c8f7eb86ea (patch) | |
| tree | 0387bb9caa938f9aeb138f8c893afd28fa371b2a | |
| parent | ac5bb796c5545cfe6626d39d580c55f2631ac296 (diff) | |
| download | gitlab-ce-7fc80ce5a5d21d2ba452eefabb02a2c8f7eb86ea.tar.gz | |
Add latest changes from gitlab-org/gitlab@15-0-stable-ee
| -rw-r--r-- | workhorse/internal/upload/artifacts_uploader.go | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/workhorse/internal/upload/artifacts_uploader.go b/workhorse/internal/upload/artifacts_uploader.go index 3c2d89e976f..c1c49638e21 100644 --- a/workhorse/internal/upload/artifacts_uploader.go +++ b/workhorse/internal/upload/artifacts_uploader.go @@ -35,7 +35,6 @@ var zipSubcommandsErrorsCounter = promauto.NewCounterVec( }, []string{"error"}) type artifactsUploadProcessor struct { - opts *destination.UploadOpts format string SavedFileTracker @@ -52,7 +51,7 @@ func Artifacts(myAPI *api.API, h http.Handler, p Preparer) http.Handler { format := r.URL.Query().Get(ArtifactFormatKey) - mg := &artifactsUploadProcessor{opts: opts, format: format, SavedFileTracker: SavedFileTracker{Request: r}} + mg := &artifactsUploadProcessor{format: format, SavedFileTracker: SavedFileTracker{Request: r}} interceptMultipartFiles(w, r, h, a, mg, opts) }, "/authorize") } @@ -62,12 +61,9 @@ func (a *artifactsUploadProcessor) generateMetadataFromZip(ctx context.Context, defer metaWriter.Close() metaOpts := &destination.UploadOpts{ - LocalTempPath: a.opts.LocalTempPath, + LocalTempPath: os.TempDir(), TempFilePrefix: "metadata.gz", } - if metaOpts.LocalTempPath == "" { - metaOpts.LocalTempPath = os.TempDir() - } fileName := file.LocalPath if fileName == "" { |