From 45c9573ae65d461e87eaa671e418e76fd9726f86 Mon Sep 17 00:00:00 2001 From: Christoph Meier Date: Fri, 9 Feb 2024 19:11:54 +0100 Subject: [PATCH 1/2] fix: close tmp file before rename Signed-off-by: Christoph MEIER --- pkg/vendir/fetch/http/sync.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/vendir/fetch/http/sync.go b/pkg/vendir/fetch/http/sync.go index 800aabf3..b8d2d11d 100644 --- a/pkg/vendir/fetch/http/sync.go +++ b/pkg/vendir/fetch/http/sync.go @@ -48,6 +48,7 @@ func (t *Sync) Sync(dstPath string, tempArea ctlfetch.TempArea) (ctlconf.LockDir incomingTmpPath := filepath.Dir(tmpFile.Name()) archivePath := filepath.Join(incomingTmpPath, path.Base(t.opts.URL)) + tmpFile.Close() err = os.Rename(tmpFile.Name(), archivePath) if err != nil { return lockConf, err From 728e3d4e01a73c7d596f9ba6c0255fe60b58b159 Mon Sep 17 00:00:00 2001 From: Christoph Meier Date: Tue, 20 Feb 2024 00:38:19 +0100 Subject: [PATCH 2/2] fix: remove double close Signed-off-by: Christoph MEIER --- pkg/vendir/fetch/http/sync.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/vendir/fetch/http/sync.go b/pkg/vendir/fetch/http/sync.go index b8d2d11d..fa63166b 100644 --- a/pkg/vendir/fetch/http/sync.go +++ b/pkg/vendir/fetch/http/sync.go @@ -38,11 +38,11 @@ func (t *Sync) Sync(dstPath string, tempArea ctlfetch.TempArea) (ctlconf.LockDir return lockConf, err } - defer tmpFile.Close() defer os.Remove(tmpFile.Name()) err = t.downloadFileAndChecksum(tmpFile) if err != nil { + tmpFile.Close() return lockConf, fmt.Errorf("Downloading URL: %s", err) }