Improve error handling and close files post-tarring
MODIFY
cmd/dendrite-upgrade-tests/main.go
cmd/dendrite-upgrade-tests/main.go
@@ -104,6 +104,7 @@ func downloadArchive(cli *http.Client, tmpDir, archiveURL string, dockerfile []b
if resp.StatusCode != 200 {
return nil, fmt.Errorf("got HTTP %d", resp.StatusCode)
}
+ _ = os.RemoveAll(tmpDir)
if err = os.Mkdir(tmpDir, os.ModePerm); err != nil {
return nil, fmt.Errorf("failed to make temporary directory: %s", err)
}

MODIFY
cmd/dendrite-upgrade-tests/tar.go
cmd/dendrite-upgrade-tests/tar.go
@@ -17,7 +17,7 @@ func compress(src string, buf io.Writer) error {
tw := tar.NewWriter(zr)
// walk through every file in the folder
- _ = filepath.Walk(src, func(file string, fi os.FileInfo, e error) error {
+ err := filepath.Walk(src, func(file string, fi os.FileInfo, e error) error {
// generate tar header
header, err := tar.FileInfoHeader(fi, file)
if err != nil {
@@ -40,9 +40,15 @@ func compress(src string, buf io.Writer) error {
if _, err := io.Copy(tw, data); err != nil {
return err
}
+ if err = data.Close(); err != nil {
+ return err
+ }
}
return nil
})
+ if err != nil {
+ return err
+ }
// produce tar
if err := tw.Close(); err != nil {

Improve error handling and close files post-tarring