Make ADD untar tar.gz files

lib/snapshot/copy_op.go

@@ -103,18 +103,18 @@ func (c *CopyOperation) Execute() error {
 			}
 			defer reader.Close()
 
-			dstFi, err := os.Stat(c.dst)
-			if os.IsNotExist(err) {
-				if err := os.MkdirAll(c.dst, 0755); err != nil {
-					return fmt.Errorf("create untar directory: %s", err)
-				}
+			if err := os.MkdirAll(c.dst, 0755); err != nil {
+				return fmt.Errorf("create/validate untar dst: %s", err)
 			}
-			if !dstFi.IsDir() {
-				return fmt.Errorf("target untar path exists and is not directory: %s", c.dst)
+
+			gzipReader, err := tario.NewGzipReader(reader)
+			if err != nil {
+				return fmt.Errorf("unzip gz %s: %s", src, err)
 			}
-			if err := tario.Untar(reader, c.dst); err != nil {
-				return fmt.Errorf("untar tar: %s", err)
+			if err := tario.Untar(gzipReader, c.dst); err != nil {
+				return fmt.Errorf("untar %s to dst %s: %s", src, c.dst, err)
 			}
+			return nil
 		}
 
 		var copier fileio.Copier

lib/snapshot/copy_op_test.go

@@ -15,13 +15,16 @@
 package snapshot
 
 import (
+	"archive/tar"
 	"fmt"
 	"io/ioutil"
 	"os"
+	"path"
 	"path/filepath"
 	"testing"
 
 	"github.com/uber/makisu/lib/pathutils"
+	"github.com/uber/makisu/lib/tario"
 	"github.com/uber/makisu/lib/utils/testutil"
 
 	"github.com/stretchr/testify/require"
@@ -242,4 +245,43 @@ func TestExecuteCopyOperation(t *testing.T) {
 		require.NoError(err)
 		require.Equal(_hello2, b)
 	})
+
+	t.Run("untar gz if created from add step", func(t *testing.T) {
+		require := require.New(t)
+
+		tmpDir, err := ioutil.TempDir("/tmp", "makisu-test")
+		require.NoError(err)
+		defer os.RemoveAll(tmpDir)
+		srcRoot, err := ioutil.TempDir("/tmp", "makisu-test")
+		require.NoError(err)
+		defer os.RemoveAll(srcRoot)
+		workDir, err := ioutil.TempDir("/tmp", "makisu-test")
+		require.NoError(err)
+		defer os.RemoveAll(workDir)
+		dst := "test_dst/" // dst is not absolute and will be placed under workdir.
+
+		require.NoError(os.MkdirAll(filepath.Join(tmpDir, "test"), os.ModePerm))
+		require.NoError(ioutil.WriteFile(filepath.Join(tmpDir, "test", "test.txt"), _hello, os.ModePerm))
+		require.NoError(os.Chown(filepath.Join(tmpDir, "test", "test.txt"), testutil.CurrUID(), testutil.CurrGID()))
+
+		tempGzipTar, err := os.Create(path.Join(srcRoot, "test_add.tar.gz"))
+		require.NoError(err)
+		gzipper, err := tario.NewGzipWriter(tempGzipTar)
+		require.NoError(err)
+		tarWriter := tar.NewWriter(gzipper)
+		require.NoError(writeTarHelper(tmpDir, tarWriter))
+		tarWriter.Close()
+		gzipper.Close()
+		tempGzipTar.Close()
+
+		srcs := []string{"test_add.tar.gz"}
+		c, err := NewCopyOperation(
+			srcs, srcRoot, workDir, dst, validChown, false, false, pathutils.DefaultBlacklist, true)
+		require.NoError(err)
+		require.NoError(c.Execute())
+
+		b, err := ioutil.ReadFile(filepath.Join(workDir, dst, "test", "test.txt"))
+		require.NoError(err)
+		require.Equal(_hello, b)
+	})
 }

lib/snapshot/testutils_test.go

@@ -237,7 +237,7 @@ func findNode(fs *MemFS, p string, followSymlink bool, depth int) (*memFSNode, e
 	return nil, os.ErrNotExist
 }
 
-func writeTarHelper(m *memFile, srcRoot string, w *tar.Writer) error {
+func writeTarHelper(srcRoot string, w *tar.Writer) error {
 	return filepath.Walk(srcRoot, func(p string, fi os.FileInfo, err error) error {
 		if err != nil {
 			return err
@@ -250,6 +250,10 @@ func writeTarHelper(m *memFile, srcRoot string, w *tar.Writer) error {
 			return err
 		}
 
+		if h.Name, err = filepath.Rel(srcRoot, p); err != nil {
+			return err
+		}
+
 		return tario.WriteEntry(w, p, h)
 	})
 }