fix correcting timestamps for created destination dir after copy

copy/copy.go

@@ -6,6 +6,7 @@ import (
 	"path"
 	"path/filepath"
 	"runtime"
+	"slices"
 	"strings"
 	"sync"
 	"time"
@@ -79,8 +80,10 @@ func Copy(ctx context.Context, srcRoot, src, dstRoot, dst string, opts ...Opt) e
 		if err != nil {
 			return err
 		}
-		if err := MkdirAll(ensureDstPath, 0755, ci.Chown, ci.Utime); err != nil {
+		if createdDirs, err := MkdirAll(ensureDstPath, 0755, ci.Chown, ci.Utime); err != nil {
 			return err
+		} else {
+			defer fixCreatedParentDirs(createdDirs, ci.Utime)
 		}
 	}
 
@@ -120,10 +123,11 @@ func Copy(ctx context.Context, srcRoot, src, dstRoot, dst string, opts ...Opt) e
 		if err != nil {
 			return err
 		}
-		dst, err := c.prepareTargetDir(srcFollowed, src, dst, ci.CopyDirContents)
+		dst, createdDirs, err := c.prepareTargetDir(srcFollowed, src, dst, ci.CopyDirContents)
 		if err != nil {
 			return err
 		}
+		defer fixCreatedParentDirs(createdDirs, ci.Utime)
 		if err := c.copy(ctx, srcFollowed, "", dst, false, patternmatcher.MatchInfo{}, patternmatcher.MatchInfo{}); err != nil {
 			return err
 		}
@@ -132,16 +136,16 @@ func Copy(ctx context.Context, srcRoot, src, dstRoot, dst string, opts ...Opt) e
 	return nil
 }
 
-func (c *copier) prepareTargetDir(srcFollowed, src, destPath string, copyDirContents bool) (string, error) {
+func (c *copier) prepareTargetDir(srcFollowed, src, destPath string, copyDirContents bool) (string, []string, error) {
 	fiSrc, err := os.Lstat(srcFollowed)
 	if err != nil {
-		return "", err
+		return "", nil, err
 	}
 
 	fiDest, err := os.Stat(destPath)
 	if err != nil {
 		if !os.IsNotExist(err) {
-			return "", errors.Wrap(err, "failed to lstat destination path")
+			return "", nil, errors.Wrap(err, "failed to lstat destination path")
 		}
 	}
 
@@ -154,11 +158,14 @@ func (c *copier) prepareTargetDir(srcFollowed, src, destPath string, copyDirCont
 	if copyDirContents && fiSrc.IsDir() && fiDest == nil {
 		target = destPath
 	}
-	if err := MkdirAll(target, 0755, c.chown, c.utime); err != nil {
-		return "", err
+	var createdDirs []string
+	if dirs, err := MkdirAll(target, 0755, c.chown, c.utime); err != nil {
+		return "", nil, err
+	} else {
+		createdDirs = dirs
 	}
 
-	return destPath, nil
+	return destPath, createdDirs, nil
 }
 
 type User struct {
@@ -689,3 +696,15 @@ func rel(basepath, targpath string) (string, error) {
 	}
 	return filepath.Rel(basepath, targpath)
 }
+
+func fixCreatedParentDirs(dirs []string, tm *time.Time) error {
+	slices.Reverse(dirs)
+	for _, d := range dirs {
+		if tm != nil {
+			if err := Utimes(d, tm); err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}

copy/copy_test.go

@@ -596,6 +596,28 @@ func TestCopyIncludeExclude(t *testing.T) {
 	}
 }
 
+func TestCopyFileWithPathTimestamp(t *testing.T) {
+	timestamp := time.Unix(0, 0)
+	apply := fstest.Apply(
+		fstest.CreateDir("/foo/", 0755),
+		fstest.CreateFile("/foo/bar", []byte{}, 0644),
+	)
+
+	t1 := t.TempDir()
+	t2 := t.TempDir()
+
+	require.NoError(t, apply.Apply(t1))
+	require.NoError(t, Copy(context.TODO(), t1, "/foo/bar", t2, "/test1/test2/test3/bar", WithCopyInfo(CopyInfo{
+		CopyDirContents: true,
+		Utime:           &timestamp,
+	})))
+
+	for _, s := range []string{"/test1/test2/test3/bar", "/test1/test2/test3", "/test1/test2", "/test1"} {
+		stat, _ := os.Stat(filepath.Join(t2, s))
+		require.Equal(t, timestamp, stat.ModTime(), "path: %s", s)
+	}
+}
+
 type changeCollector struct {
 	changes []string
 }

copy/mkdir.go

@@ -7,14 +7,14 @@ import (
 )
 
 // MkdirAll is forked os.MkdirAll
-func MkdirAll(path string, perm os.FileMode, user Chowner, tm *time.Time) error {
+func MkdirAll(path string, perm os.FileMode, user Chowner, tm *time.Time) ([]string, error) {
 	// Fast path: if we can tell whether path is a directory or file, stop with success or error.
 	dir, err := os.Stat(path)
 	if err == nil {
 		if dir.IsDir() {
-			return nil
+			return nil, nil
 		}
-		return &os.PathError{Op: "mkdir", Path: path, Err: syscall.ENOTDIR}
+		return nil, &os.PathError{Op: "mkdir", Path: path, Err: syscall.ENOTDIR}
 	}
 
 	// Slow path: make sure parent exists and then call Mkdir for path.
@@ -28,17 +28,19 @@ func MkdirAll(path string, perm os.FileMode, user Chowner, tm *time.Time) error
 		j--
 	}
 
+	var createdDirs []string
+
 	if j > 1 {
 		// Create parent.
-		err = MkdirAll(fixRootDirectory(path[:j-1]), perm, user, tm)
+		createdDirs, err = MkdirAll(fixRootDirectory(path[:j-1]), perm, user, tm)
 		if err != nil {
-			return err
+			return nil, err
 		}
 	}
 
 	dir, err1 := os.Lstat(path)
 	if err1 == nil && dir.IsDir() {
-		return nil
+		return createdDirs, nil
 	}
 
 	// Parent now exists; invoke Mkdir and use its result.
@@ -48,18 +50,19 @@ func MkdirAll(path string, perm os.FileMode, user Chowner, tm *time.Time) error
 		// double-checking that directory doesn't exist.
 		dir, err1 := os.Lstat(path)
 		if err1 == nil && dir.IsDir() {
-			return nil
+			return createdDirs, nil
 		}
-		return err
+		return nil, err
 	}
+	createdDirs = append(createdDirs, path)
 
 	if err := Chown(path, nil, user); err != nil {
-		return err
+		return nil, err
 	}
 
 	if err := Utimes(path, tm); err != nil {
-		return err
+		return nil, err
 	}
 
-	return nil
+	return createdDirs, nil
 }