25ee00c494
pkg/system historically has been a bit of a kitchen-sink of things that were somewhat "system" related, but didn't have a good place for. EnsureRemoveAll() is one of those utilities. EnsureRemoveAll() is used to both unmount and remove a path, for which it depends on both github.com/moby/sys/mount, which in turn depends on github.com/moby/sys/mountinfo. pkg/system is imported in the CLI, but neither EnsureRemoveAll(), nor any of its moby/sys dependencies are used on the client side, so let's move this function somewhere else, to remove those dependencies from the CLI. I looked for plausible locations that were related; it's used in: - daemon - daemon/graphdriver/XXX/ - plugin I considered moving it into a (e.g.) "utils" package within graphdriver (but not a huge fan of "utils" packages), and given that it felt (mostly) related to cleaning up container filesystems, I decided to move it there. Some things to follow-up on after this: - Verify if this function is still needed (it feels a bit like a big hammer in a "YOLO, let's try some things just in case it fails") - Perhaps it should be integrated in `containerfs.Remove()` (so that it's used automatically) - Look if there's other implementations (and if they should be consolidated), although (e.g.) the one in containerd is a copy of ours: https://github.com/containerd/containerd/blob/v1.5.9/pkg/cri/server/helpers_linux.go#L200 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
37 lines
780 B
Go
37 lines
780 B
Go
//go:build !darwin
|
|
// +build !darwin
|
|
|
|
package containerfs // import "github.com/docker/docker/pkg/containerfs"
|
|
|
|
import (
|
|
"os"
|
|
"testing"
|
|
)
|
|
|
|
func TestEnsureRemoveAllNotExist(t *testing.T) {
|
|
// should never return an error for a non-existent path
|
|
if err := EnsureRemoveAll("/non/existent/path"); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
}
|
|
|
|
func TestEnsureRemoveAllWithDir(t *testing.T) {
|
|
dir, err := os.MkdirTemp("", "test-ensure-removeall-with-dir")
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if err := EnsureRemoveAll(dir); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
}
|
|
|
|
func TestEnsureRemoveAllWithFile(t *testing.T) {
|
|
tmp, err := os.CreateTemp("", "test-ensure-removeall-with-dir")
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
tmp.Close()
|
|
if err := EnsureRemoveAll(tmp.Name()); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
}
|