From cea450bbbbe6e7609b945b1d04c6795350e7419e Mon Sep 17 00:00:00 2001 From: Alexandre Date: Sat, 6 Jan 2024 21:36:09 +0100 Subject: [PATCH] Remove goroutine --- main.go | 81 +++++++++++++++++++++++++-------------------------------- 1 file changed, 36 insertions(+), 45 deletions(-) diff --git a/main.go b/main.go index b9176c3..5deb194 100644 --- a/main.go +++ b/main.go @@ -65,56 +65,47 @@ func main() { githubactions.Fatalf("Unable to create request: %v", err.Error()) } - go func() { - defer writer.Close() - - mwriter := multipart.NewWriter(writer) - req.Header.Add("Content-Type", mwriter.FormDataContentType()) - - err = filepath.Walk(path, func(innerPath string, info fs.FileInfo, err error) error { - githubactions.Infof("Reading %v", innerPath) - - if err != nil { - return err - } - - relativeParh := strings.TrimPrefix(innerPath, path) - - in, err := os.Open(innerPath) - if err != nil { - return err - } - defer in.Close() - - pathInfo, err := in.Stat() - if err != nil { - return err - } - - if pathInfo.IsDir() { - return nil - } - - w, err := mwriter.CreateFormFile("file", relativeParh) - if err != nil { - return err - } - - if written, err := io.Copy(w, in); err != nil { - return fmt.Errorf("error copying %s (%d bytes written): %v", relativeParh, written, err) - } - - if err := mwriter.Close(); err != nil { - return err - } + mwriter := multipart.NewWriter(writer) + req.Header.Add("Content-Type", mwriter.FormDataContentType()) + err = filepath.Walk(path, func(innerPath string, info fs.FileInfo, err error) error { + githubactions.Infof("Reading %v", innerPath) + if info.IsDir() { + githubactions.Infof("Skipping directory %v", innerPath) return nil - }) + } if err != nil { - githubactions.Fatalf("Unable to create request body : %v", fmt.Errorf("%w", err)) + return err } - }() + + relativeParh := strings.TrimPrefix(innerPath, path) + + in, err := os.Open(innerPath) + if err != nil { + return err + } + defer in.Close() + + w, err := mwriter.CreateFormFile("file", relativeParh) + if err != nil { + return err + } + + if written, err := io.Copy(w, in); err != nil { + return fmt.Errorf("error copying %s (%d bytes written): %v", relativeParh, written, err) + } + + if err := mwriter.Close(); err != nil { + return err + } + + return nil + }) + + if err != nil { + githubactions.Fatalf("Unable to create request body : %v", fmt.Errorf("%w", err)) + } githubactions.Infof("Calling node API") client := &http.Client{}