util/system: deprecate Atime implementation for containerd/continuity/fs

These were added in 0b5a315, because the continuity/fs package did not provide a Windows implementation. They were upstreamed in [continuity@3cbda8c], which is part of continuity v0.4.4, so we can deprecate the implementation here. [continuity@3cbda8c]: https://github.com/containerd/continuity//commit/3cbda8c24bde1ce635ff5dc3417a481a3b6b6e07 Signed-off-by: Sebastiaan van Stijn <[email protected]>
moby · Nov 14, 2024 · 195cef1 · 195cef1
1 parent 8530ae8
commit 195cef1
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 41 deletions.
diff --git a/executor/stubs.go b/executor/stubs.go
@@ -10,7 +10,6 @@ import (
 
 	"github.com/containerd/continuity/fs"
 	"github.com/moby/buildkit/util/bklog"
-	"github.com/moby/buildkit/util/system"
 )
 
 func MountStubsCleaner(ctx context.Context, dir string, mounts []Mount, recursive bool) func() {
@@ -87,7 +86,7 @@ func MountStubsCleaner(ctx context.Context, dir string, mounts []Mount, recursiv
 				continue
 			}
 			mtime := dirSt.ModTime()
-			atime, err := system.Atime(dirSt)
+			atime, err := fs.Atime(dirSt)
 			if err != nil {
 				bklog.G(ctx).WithError(err).Warnf("Failed to stat atime of %q (parent of mount stub %q)", dir, p)
 				atime = mtime

diff --git a/util/system/atime_deprecated.go b/util/system/atime_deprecated.go
@@ -0,0 +1,13 @@
+package system
+
+import (
+	iofs "io/fs"
+	"time"
+
+	"github.com/containerd/continuity/fs"
+)
+
+// Deprecated: use [fs.Atime] instead.
+func Atime(st iofs.FileInfo) (time.Time, error) {
+	return fs.Atime(st)
+}
diff --git a/util/system/atime_unix.go b/util/system/atime_unix.go
diff --git a/util/system/atime_windows.go b/util/system/atime_windows.go