fix: Fix template create with sub-folders on Windows (#4548)

mafredri · web-flow · commit 19d7281daf04 · 2022-10-14T19:28:47.000+03:00
On Windows, files in tar archives were stored with Windows path-separators resulting in them being individual files as opposed to contained in a folder. This commit ensures Unix-based paths (slash) are being used inside tar archives. Exmple of previous output: ``` /tmp/provisionerd673501182/images: /tmp/provisionerd673501182/: README.md images images\base.Dockerfile images\java.Dockerfile images\node.Dockerfile main.tf ``` Fixes #2815
diff --git a/provisionersdk/archive.go b/provisionersdk/archive.go
@@ -87,7 +87,8 @@ func Tar(directory string, limit int64) ([]byte, error) {
 			// Don't store tfstate!
 			return err
 		}
-		header.Name = rel
+		// Use unix paths in the tar archive.
+		header.Name = filepath.ToSlash(rel)
 		if err := tarWriter.WriteHeader(header); err != nil {
 			return err
 		}
@@ -131,7 +132,7 @@ func Untar(directory string, archive []byte) error {
 			return err
 		}
 		// #nosec
-		target := filepath.Join(directory, header.Name)
+		target := filepath.Join(directory, filepath.FromSlash(header.Name))
 		switch header.Typeflag {
 		case tar.TypeDir:
 			if _, err := os.Stat(target); err != nil {
diff --git a/provisionersdk/archive_test.go b/provisionersdk/archive_test.go
@@ -1,7 +1,6 @@
 package provisionersdk_test
 
 import (
-	"fmt"
 	"os"
 	"path/filepath"
 	"testing"
@@ -59,6 +58,7 @@ func TestTar(t *testing.T) {
 		}}
 		for _, file := range files {
 			newDir := dir
+			file.Name = filepath.FromSlash(file.Name)
 			if filepath.Base(file.Name) != file.Name {
 				newDir = filepath.Join(newDir, filepath.Dir(file.Name))
 				err := os.MkdirAll(newDir, 0755)
@@ -70,7 +70,6 @@ func TestTar(t *testing.T) {
 			_ = tmpFile.Close()
 			file.Name, err = filepath.Rel(dir, tmpFile.Name())
 			require.NoError(t, err)
-			fmt.Printf("rel")
 		}
 		content, err := provisionersdk.Tar(dir, 1024)
 		require.NoError(t, err)

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,8 @@ func Tar(directory string, limit int64) ([]byte, error) {`
`87`	`87`	`// Don't store tfstate!`
`88`	`88`	`return err`
`89`	`89`	`}`
`90`		`- header.Name = rel`
	`90`	`+ // Use unix paths in the tar archive.`
	`91`	`+ header.Name = filepath.ToSlash(rel)`
`91`	`92`	`if err := tarWriter.WriteHeader(header); err != nil {`
`92`	`93`	`return err`
`93`	`94`	`}`
`@@ -131,7 +132,7 @@ func Untar(directory string, archive []byte) error {`
`131`	`132`	`return err`
`132`	`133`	`}`
`133`	`134`	`// #nosec`
`134`		`- target := filepath.Join(directory, header.Name)`
	`135`	`+ target := filepath.Join(directory, filepath.FromSlash(header.Name))`
`135`	`136`	`switch header.Typeflag {`
`136`	`137`	`case tar.TypeDir:`
`137`	`138`	`if _, err := os.Stat(target); err != nil {`