From 04a73c0623eb0049ac48a337ad9922278d555530 Mon Sep 17 00:00:00 2001 From: Jeff Haynie Date: Tue, 27 May 2025 23:54:01 -0500 Subject: [PATCH 1/2] Deploy: fixed error missing file on zip --- internal/util/io.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/internal/util/io.go b/internal/util/io.go index 42ac50b4..08526939 100644 --- a/internal/util/io.go +++ b/internal/util/io.go @@ -123,6 +123,9 @@ func ZipDir(dir string, outfilename string, opts ...ZipDirCallbackMatcher) error if err != nil { return fmt.Errorf("error getting relative path: %s. %w", file, err) } + if !Exists(file) { + continue + } rf, err := os.Open(file) if err != nil { return fmt.Errorf("error opening file: %s. %w", file, err) From 5adb7c247857f84477f433221f60347e6556e157 Mon Sep 17 00:00:00 2001 From: Jeff Haynie Date: Tue, 27 May 2025 23:58:33 -0500 Subject: [PATCH 2/2] slight optimization --- internal/util/io.go | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/internal/util/io.go b/internal/util/io.go index 08526939..b42481d7 100644 --- a/internal/util/io.go +++ b/internal/util/io.go @@ -126,20 +126,14 @@ func ZipDir(dir string, outfilename string, opts ...ZipDirCallbackMatcher) error if !Exists(file) { continue } - rf, err := os.Open(file) - if err != nil { - return fmt.Errorf("error opening file: %s. %w", file, err) - } - defer rf.Close() if len(opts) > 0 { - fi, err := rf.Stat() + fi, err := os.Stat(file) if err != nil { return fmt.Errorf("error getting file info: %s. %w", file, err) } var notok bool for _, opt := range opts { if !opt(fn, fi) { - rf.Close() notok = true break } @@ -148,6 +142,11 @@ func ZipDir(dir string, outfilename string, opts ...ZipDirCallbackMatcher) error continue } } + rf, err := os.Open(file) + if err != nil { + return fmt.Errorf("error opening file: %s. %w", file, err) + } + defer rf.Close() w, err := zw.Create(fn) if err != nil { return fmt.Errorf("error creating file: %s. %w", fn, err)