Unix OS Driver

api/types/types_model.go

@@ -51,49 +51,6 @@ type Instance struct {
 	Fields map[string]string `json:"fields,omitempty"`
 }
 
-// MountInfo reveals information about a particular mounted filesystem. This
-// struct is populated from the content in the /proc/<pid>/mountinfo file.
-type MountInfo struct {
-	// ID is a unique identifier of the mount (may be reused after umount).
-	ID int `json:"id"`
-
-	// Parent indicates the ID of the mount parent (or of self for the top of
-	// the mount tree).
-	Parent int `json:"parent"`
-
-	// Major indicates one half of the device ID which identifies the device
-	// class.
-	Major int `json:"major"`
-
-	// Minor indicates one half of the device ID which identifies a specific
-	// instance of device.
-	Minor int `json:"minor"`
-
-	// Root of the mount within the filesystem.
-	Root string `json:"root"`
-
-	// MountPoint indicates the mount point relative to the process's root.
-	MountPoint string `json:"mountPoint"`
-
-	// Opts represents mount-specific options.
-	Opts string `json:"opts"`
-
-	// Optional represents optional fields.
-	Optional string `json:"optional"`
-
-	// FSType indicates the type of filesystem, such as EXT3.
-	FSType string `json:"fsType"`
-
-	// Source indicates filesystem specific information or "none".
-	Source string `json:"source"`
-
-	// VFSOpts represents per super block options.
-	VFSOpts string `json:"vfsOpts"`
-
-	// Fields are additional properties that can be defined for this type.
-	Fields map[string]string `json:"fields,omitempty"`
-}
-
 // Snapshot provides information about a storage-layer snapshot.
 type Snapshot struct {
 	// A description of the snapshot.
@@ -105,7 +62,8 @@ type Snapshot struct {
 	// The snapshot's ID.
 	ID string `json:"id"`
 
-	// The time (epoch) at which the request to create the snapshot was submitted.
+	// The time (epoch) at which the request to create the snapshot was
+	// submitted.
 	StartTime int64 `json:"startTime,omitempty"`
 
 	// The status of the snapshot.
@@ -173,9 +131,9 @@ func (v *Volume) MountPoint() string {
 // VolumeAttachment provides information about an object attached to a
 // storage volume.
 type VolumeAttachment struct {
-	// The name of the device on which the volume to which the object is
-	// attached is mounted.
-	DeviceName string `json:"deviceName"`
+	// DevicePath is the name of the device on which the volume to which the
+	// object is attached is mounted.
+	DevicePath FileSystemDevicePath `json:"devicePath"`
 
 	// MountPoint is the mount point for the volume. This field is set when a
 	// volume is retrieved via an integration driver.

api/types/types_mount_info.go

@@ -0,0 +1,49 @@
+package types
+
+// MountInfo reveals information about a particular mounted filesystem. This
+// struct is populated from the content in the /proc/<pid>/mountinfo file.
+type MountInfo struct {
+
+	// DevicePath is the path of the mounted path.
+	DevicePath FileSystemDevicePath `json:"devicePath"`
+
+	// MountPoint indicates the mount point relative to the process's root.
+	MountPoint string `json:"mountPoint"`
+
+	// FSType indicates the type of filesystem, such as EXT3.
+	FSType string `json:"fsType"`
+
+	// Opts represents mount-specific options.
+	Opts MountOptions `json:"opts"`
+}
+
+// MarshalText marshals the MountInfo object to its textual representation.
+func (i *MountInfo) String() string {
+	if s, err := i.MarshalText(); err == nil {
+		return string(s)
+	}
+	return ""
+}
+
+// ParseMountInfo parses mount information.
+func ParseMountInfo(text string) *MountInfo {
+	i := &MountInfo{}
+	i.UnmarshalText([]byte(text))
+	return i
+}
+
+// UnmarshalText marshals the MountInfo from its textual representation.
+func (i *MountInfo) UnmarshalText(data []byte) error {
+
+	m := mountInfoRX.FindSubmatch(data)
+	if len(m) == 0 {
+		return nil
+	}
+
+	i.DevicePath = FileSystemDevicePath(m[1])
+	i.MountPoint = string(m[2])
+	i.FSType = string(m[3])
+	i.Opts.UnmarshalText(m[4])
+
+	return nil
+}

api/types/types_mount_info_darwin.go

@@ -0,0 +1,40 @@
+package types
+
+import (
+	"bytes"
+	"fmt"
+	"regexp"
+)
+
+/*
+$ mount
+/dev/disk1 on / (hfs, local, journaled)
+devfs on /dev (devfs, local, nobrowse)
+map -hosts on /net (autofs, nosuid, automounted, nobrowse)
+map auto_home on /home (autofs, automounted, nobrowse)
+/tmp/one on /private/tmp/bind-one (osxfusefs, nodev, nosuid, synchronous, mounted by akutz)
+bindfs@osxfuse1 on /private/tmp/bind-two (osxfusefs, nodev, nosuid, read-only, synchronous, mounted by akutz)
+/dev/disk2s1 on /Volumes/VirtualBox (hfs, local, nodev, nosuid, read-only, noowners, quarantine, mounted by akutz)
+*/
+
+// MarshalText marshals the MountInfo object to its textual representation.
+func (i *MountInfo) MarshalText() ([]byte, error) {
+	buf := &bytes.Buffer{}
+	fmt.Fprintf(buf, "%s on %s (%s", i.DevicePath, i.MountPoint, i.FSType)
+	if len(i.Opts) == 0 {
+		fmt.Fprint(buf, ")")
+	} else {
+		fmt.Fprintf(buf, ", %s)", i.Opts)
+	}
+	return buf.Bytes(), nil
+}
+
+/*
+mountInfoRX is the regex used for matching the output of the Linux mount cmd
+
+$1 = devicePath
+$2 = mountPoint
+$3 = fileSystemType
+$4 = mountOpts
+*/
+var mountInfoRX = regexp.MustCompile(`^(.+) on (.+) \((.+?)(?:, (.+))\)$`)

api/types/types_mount_info_darwin_test.go

@@ -0,0 +1,21 @@
+// +build darwin
+
+package types
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestMountInfoParse(t *testing.T) {
+	expected := &MountInfo{
+		DevicePath: FileSystemDevicePath("/dev/disk1"),
+		MountPoint: "/",
+		Opts:       MountOptions{MountOptLocal, MountOptJournaled},
+		FSType:     "hfs",
+	}
+	actual := ParseMountInfo("/dev/disk1 on / (hfs, local, journaled)")
+	assert.Equal(t, expected, actual)
+	assert.Equal(t, "/dev/disk1 on / (hfs, local, journaled)", actual.String())
+}

api/types/types_mount_info_linux.go

@@ -0,0 +1,49 @@
+package types
+
+import (
+	"bytes"
+	"fmt"
+	"regexp"
+)
+
+/*
+$ mount
+/dev/mapper/mea--vg-root on / type ext4 (rw,errors=remount-ro)
+proc on /proc type proc (rw,noexec,nosuid,nodev)
+sysfs on /sys type sysfs (rw,noexec,nosuid,nodev)
+none on /sys/fs/cgroup type tmpfs (rw)
+none on /sys/fs/fuse/connections type fusectl (rw)
+none on /sys/kernel/debug type debugfs (rw)
+none on /sys/kernel/security type securityfs (rw)
+udev on /dev type devtmpfs (rw,mode=0755)
+devpts on /dev/pts type devpts (rw,noexec,nosuid,gid=5,mode=0620)
+tmpfs on /run type tmpfs (rw,noexec,nosuid,size=10%,mode=0755)
+none on /run/lock type tmpfs (rw,noexec,nosuid,nodev,size=5242880)
+none on /run/shm type tmpfs (rw,nosuid,nodev)
+none on /run/user type tmpfs (rw,noexec,nosuid,nodev,size=104857600,mode=0755)
+none on /sys/fs/pstore type pstore (rw)
+/dev/sda1 on /boot type ext2 (rw)
+systemd on /sys/fs/cgroup/systemd type cgroup (rw,noexec,nosuid,nodev,none,name=systemd)
+go on /media/sf_go type vboxsf (gid=999,rw)
+/tmp/one on /tmp/one-bind type none (rw,bind)
+*/
+
+// MarshalText marshals the MountInfo object to its textual representation.
+func (i *MountInfo) MarshalText() ([]byte, error) {
+	buf := &bytes.Buffer{}
+	fmt.Fprintf(buf, "%s on %s type %s", i.DevicePath, i.MountPoint, i.FSType)
+	if len(i.Opts) > 0 {
+		fmt.Fprintf(buf, " (%s)", i.Opts)
+	}
+	return buf.Bytes(), nil
+}
+
+/*
+mountInfoRX is the regex used for matching the output of the Linux mount cmd
+
+$1 = devicePath
+$2 = mountPoint
+$3 = fileSystemType
+$4 = mountOpts
+*/
+var mountInfoRX = regexp.MustCompile(`^(.+) on (.+) type (.+?)(?: \((.+)\))?$`)

api/types/types_mount_info_linux_test.go

@@ -0,0 +1,22 @@
+// +build linux
+
+package types
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestMountInfoParse(t *testing.T) {
+	expected := &MountInfo{
+		DevicePath: FileSystemDevicePath("proc"),
+		MountPoint: "/proc",
+		Opts:       MountOptions{MountOptNoExec, MountOptNoSUID, MountOptNoDev},
+		FSType:     "proc",
+	}
+	actual := ParseMountInfo("proc on /proc type proc (rw,noexec,nosuid,nodev)")
+	assert.Equal(t, expected, actual)
+	assert.Equal(
+		t, "proc on /proc type proc (noexec,nosuid,nodev)", actual.String())
+}