cmd/runtimetest: use github.com/moby/sys/mountinfo

I noticed that this package was a fork of an old version of the "mount" package in the docker repository. This package was migrated to a separate module in the github.com/moby/sys repository, which should be easy to consume now that it's no longer insxide the docker repository. This patch switches the local fork to the new module. Signed-off-by: Sebastiaan van Stijn <[email protected]>
opencontainers · Sep 14, 2023 · d034327 · d034327
1 parent 28f43fa
commit d034327
Show file tree

Hide file tree

Showing 23 changed files with 679 additions and 254 deletions.
diff --git a/cmd/runtimetest/main.go b/cmd/runtimetest/main.go
@@ -20,7 +20,7 @@ import (
 	"github.com/syndtr/gocapability/capability"
 	"github.com/urfave/cli"
 
-	"github.com/opencontainers/runtime-tools/cmd/runtimetest/mount"
+	"github.com/moby/sys/mountinfo"
 	rfc2119 "github.com/opencontainers/runtime-tools/error"
 	"github.com/opencontainers/runtime-tools/specerror"
 	"github.com/opencontainers/selinux/go-selinux/label"
@@ -620,14 +620,14 @@ func (c *complianceTester) validateRootfsPropagation(spec *rspec.Spec) error {
 }
 
 func (c *complianceTester) validateDefaultFS(spec *rspec.Spec) error {
-	mountInfos, err := mount.GetMounts()
+	mountInfos, err := mountinfo.GetMounts(nil)
 	if err != nil {
 		return nil
 	}
 
 	mountsMap := make(map[string]string)
 	for _, mountInfo := range mountInfos {
-		mountsMap[mountInfo.Mountpoint] = mountInfo.Fstype
+		mountsMap[mountInfo.Mountpoint] = mountInfo.FSType
 	}
 
 	for fs, fstype := range defaultFS {
@@ -1091,10 +1091,10 @@ func (c *complianceTester) validateGIDMappings(spec *rspec.Spec) error {
 	return c.validateIDMappings(spec.Linux.GIDMappings, "/proc/self/gid_map", "linux.gidMappings")
 }
 
-func mountMatch(configMount rspec.Mount, sysMount *mount.Info) error {
+func mountMatch(configMount rspec.Mount, sysMount *mountinfo.Info) error {
 	sys := rspec.Mount{
 		Destination: sysMount.Mountpoint,
-		Type:        sysMount.Fstype,
+		Type:        sysMount.FSType,
 		Source:      sysMount.Source,
 	}
 
@@ -1137,7 +1137,7 @@ func (c *complianceTester) validatePosixMounts(spec *rspec.Spec) error {
 		return nil
 	}
 
-	mountInfos, err := mount.GetMounts()
+	mountInfos, err := mountinfo.GetMounts(nil)
 	if err != nil {
 		return err
 	}

diff --git a/cmd/runtimetest/mount/README.md b/cmd/runtimetest/mount/README.md
diff --git a/cmd/runtimetest/mount/mountinfo.go b/cmd/runtimetest/mount/mountinfo.go
diff --git a/cmd/runtimetest/mount/mountinfo_freebsd.go b/cmd/runtimetest/mount/mountinfo_freebsd.go
diff --git a/cmd/runtimetest/mount/mountinfo_linux.go b/cmd/runtimetest/mount/mountinfo_linux.go
diff --git a/cmd/runtimetest/mount/mountinfo_solaris.go b/cmd/runtimetest/mount/mountinfo_solaris.go
diff --git a/cmd/runtimetest/mount/mountinfo_unsupported.go b/cmd/runtimetest/mount/mountinfo_unsupported.go
diff --git a/cmd/runtimetest/mount/mountinfo_windows.go b/cmd/runtimetest/mount/mountinfo_windows.go
diff --git a/go.mod b/go.mod
@@ -7,6 +7,7 @@ require (
 	github.com/google/uuid v1.3.0
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/mndrix/tap-go v0.0.0-20171203230836-629fa407e90b
+	github.com/moby/sys/mountinfo v0.6.2
 	github.com/mrunalp/fileutils v0.5.0
 	github.com/opencontainers/runtime-spec v1.0.3-0.20220825212826-86290f6a00fb
 	github.com/opencontainers/selinux v1.9.1

diff --git a/go.sum b/go.sum
@@ -11,6 +11,8 @@ github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+l
 github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
 github.com/mndrix/tap-go v0.0.0-20171203230836-629fa407e90b h1:Ga1nclDSe8gOw37MVLMhfu2QKWtD6gvtQ298zsKVh8g=
 github.com/mndrix/tap-go v0.0.0-20171203230836-629fa407e90b/go.mod h1:pzzDgJWZ34fGzaAZGFW22KVZDfyrYW+QABMrWnJBnSs=
+github.com/moby/sys/mountinfo v0.6.2 h1:BzJjoreD5BMFNmD9Rus6gdd1pLuecOFPt8wC+Vygl78=
+github.com/moby/sys/mountinfo v0.6.2/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI=
 github.com/mrunalp/fileutils v0.5.0 h1:NKzVxiH7eSk+OQ4M+ZYW1K6h27RUV3MI6NUTsHhU6Z4=
 github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ=
 github.com/opencontainers/runtime-spec v1.0.3-0.20220825212826-86290f6a00fb h1:1xSVPOd7/UA+39/hXEGnBJ13p6JFB0E1EvQFlrRDOXI=
@@ -37,6 +39,7 @@ github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17
 github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191115151921-52ab43148777/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=

diff --git a/cmd/runtimetest/mount/LICENSE → vendor/github.com/moby/sys/mountinfo/LICENSE b/cmd/runtimetest/mount/LICENSE → vendor/github.com/moby/sys/mountinfo/LICENSE