fix(provisionersdk): add trailing path separator to directory entries

johnstcn · johnstcn · commit 0a15bca045db · 2024-03-08T17:54:49.000Z
diff --git a/provisionersdk/archive.go b/provisionersdk/archive.go
@@ -107,6 +107,11 @@ func Tar(w io.Writer, logger slog.Logger, directory string, limit int64) error {
 		}
 		// Use unix paths in the tar archive.
 		header.Name = filepath.ToSlash(rel)
+		// tar.FileInfoHeader() will do this, but filepath.Rel() calls filepath.Clean()
+		// which strips trailing path separators for directories.
+		if fileInfo.IsDir() {
+			header.Name += "/"
+		}
 		if err := tarWriter.WriteHeader(header); err != nil {
 			return err
 		}

Original file line number	Diff line number	Diff line change
`@@ -107,6 +107,11 @@ func Tar(w io.Writer, logger slog.Logger, directory string, limit int64) error {`
`107`	`107`	`}`
`108`	`108`	`// Use unix paths in the tar archive.`
`109`	`109`	`header.Name = filepath.ToSlash(rel)`
	`110`	`+ // tar.FileInfoHeader() will do this, but filepath.Rel() calls filepath.Clean()`
	`111`	`+ // which strips trailing path separators for directories.`
	`112`	`+ if fileInfo.IsDir() {`
	`113`	`+ header.Name += "/"`
	`114`	`+ }`
`110`	`115`	`if err := tarWriter.WriteHeader(header); err != nil {`
`111`	`116`	`return err`
`112`	`117`	`}`