feat: return better error if file size is too big to upload

Emyrk · Emyrk · commit 47e3480d496c · 2023-06-01T11:24:30.000-04:00
diff --git a/provisionersdk/archive.go b/provisionersdk/archive.go
@@ -54,6 +54,7 @@ func Tar(w io.Writer, directory string, limit int64) error {
 		)
 	}
 
+	fileTooBigError := xerrors.Errorf("Archive too big. Must be <= %d bytes", limit)
 	err = filepath.Walk(directory, func(file string, fileInfo os.FileInfo, err error) error {
 		if err != nil {
 			return err
@@ -95,6 +96,10 @@ func Tar(w io.Writer, directory string, limit int64) error {
 		if !fileInfo.Mode().IsRegular() {
 			return nil
 		}
+		// Before we even open the file, check if it is going to exceed our limit.
+		if fileInfo.Size()+totalSize >= limit {
+			return fileTooBigError
+		}
 		data, err := os.Open(file)
 		if err != nil {
 			return err
@@ -106,7 +111,7 @@ func Tar(w io.Writer, directory string, limit int64) error {
 		}
 		totalSize += wrote
 		if limit != 0 && totalSize >= limit {
-			return xerrors.Errorf("Archive too big. Must be <= %d bytes", limit)
+			return fileTooBigError
 		}
 		return data.Close()
 	})

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ func Tar(w io.Writer, directory string, limit int64) error {`
`54`	`54`	`)`
`55`	`55`	`}`
`56`	`56`
	`57`	`+ fileTooBigError := xerrors.Errorf("Archive too big. Must be <= %d bytes", limit)`
`57`	`58`	`err = filepath.Walk(directory, func(file string, fileInfo os.FileInfo, err error) error {`
`58`	`59`	`if err != nil {`
`59`	`60`	`return err`
`@@ -95,6 +96,10 @@ func Tar(w io.Writer, directory string, limit int64) error {`
`95`	`96`	`if !fileInfo.Mode().IsRegular() {`
`96`	`97`	`return nil`
`97`	`98`	`}`
	`99`	`+ // Before we even open the file, check if it is going to exceed our limit.`
	`100`	`+ if fileInfo.Size()+totalSize >= limit {`
	`101`	`+ return fileTooBigError`
	`102`	`+ }`
`98`	`103`	`data, err := os.Open(file)`
`99`	`104`	`if err != nil {`
`100`	`105`	`return err`
`@@ -106,7 +111,7 @@ func Tar(w io.Writer, directory string, limit int64) error {`
`106`	`111`	`}`
`107`	`112`	`totalSize += wrote`
`108`	`113`	`if limit != 0 && totalSize >= limit {`
`109`		`- return xerrors.Errorf("Archive too big. Must be <= %d bytes", limit)`
	`114`	`+ return fileTooBigError`
`110`	`115`	`}`
`111`	`116`	`return data.Close()`
`112`	`117`	`})`