Merge branch 'main' into 1-add-size-to-status-table

bohendo · bohendo · commit ff6291244a0e · 2023-10-05T15:58:37.000-04:00
diff --git a/cmd/cloudexec/push.go b/cmd/cloudexec/push.go
@@ -14,10 +14,7 @@ import (
 func UploadDirectoryToSpaces(config config.Config, bucket string, sourcePath string, destPath string) error {
 	// Compute the path for the zipped archive of sourcePath
 	zipFileName := "input.zip"
-	zipFilePath, err := filepath.Abs(filepath.Join(filepath.Dir(sourcePath), zipFileName))
-	if err != nil {
-		return err
-	}
+	zipFilePath := filepath.Join(os.TempDir(), zipFileName)
 
 	// Create a file where we will write the zipped archive
 	fmt.Printf("Creating zipped archive at %s\n", zipFilePath)
@@ -40,7 +37,7 @@ func UploadDirectoryToSpaces(config config.Config, bucket string, sourcePath str
 
 		// If it's a symbolic link, resolve the target
 		if info.Mode()&os.ModeSymlink == os.ModeSymlink {
-			target, err := os.Readlink(path)
+			target, err = os.Readlink(path)
 			fmt.Printf("Resolved link from %s to %s\n", path, target)
 			if err != nil {
 				return err
@@ -57,7 +54,7 @@ func UploadDirectoryToSpaces(config config.Config, bucket string, sourcePath str
 		if targetInfo.IsDir() {
 			cleanPath := filepath.Clean(path) + string(filepath.Separator)
 			fmt.Printf("Creating directory %s in the zipped archive\n", cleanPath)
-			_, err := zipWriter.Create(cleanPath)
+			_, err = zipWriter.Create(cleanPath)
 			if err != nil {
 				return err
 			}
@@ -82,14 +79,19 @@ func UploadDirectoryToSpaces(config config.Config, bucket string, sourcePath str
 		if err != nil {
 			return err
 		}
-		defer file.Close()
 
 		// Write this file to the zipped archive
 		_, err = io.Copy(zipFileEntry, file)
 		if err != nil {
 			return err
 		}
 
+		// Explicitly close the file once we're done to prevent a "too many open files" error
+		err = file.Close()
+		if err != nil {
+			return err
+		}
+
 		return nil
 	})
 	if err != nil {
@@ -98,17 +100,25 @@ func UploadDirectoryToSpaces(config config.Config, bucket string, sourcePath str
 	fmt.Printf("Successfully added all files from %s to zipped archive at %s\n", sourcePath, zipFilePath)
 
 	// Make sure all prior writes are sync'd to the filesystem
-	// This is necessary because we're going to read the file immediately after writing it
+	// This is necessary bc we're going to read the file right after writing it
 	err = zipWriter.Flush()
 	if err != nil {
 		return err
 	}
-	zipWriter.Close()
 	err = zipFile.Sync()
 	if err != nil {
 		return err
 	}
-	zipFile.Close()
+
+	// Manually Closing is necessary to prevent zip file corruption during upload
+	err = zipWriter.Close()
+	if err != nil {
+		return err
+	}
+	err = zipFile.Close()
+	if err != nil {
+		return err
+	}
 
 	// Read the zipped archive
 	fileBytes, err := os.ReadFile(zipFilePath)
