Implement backend for 'volume inspect'

Begin to separate the internal structures and frontend for
inspect on volumes. We can't rely on keeping internal data
structures for external presentation - separating presentation
and internal data format is good practice.

Signed-off-by: Matthew Heon <matthew.heon@pm.me>

1 files changed, 34 insertions, 12 deletions

diff --git a/libpod/volume.go b/libpod/volume.go
index 9ed2ff087..bb1e9b6f1 100644
--- a/libpod/volume.go
+++ b/libpod/volume.go
@@ -1,5 +1,9 @@
 package libpod
 
+import (
+	"time"
+)
+
 // Volume is the type used to create named volumes
 // TODO: all volumes should be created using this and the Volume API
 type Volume struct {
@@ -15,10 +19,10 @@ type VolumeConfig struct {
 	Name string `json:"name"`
 
 	Labels        map[string]string `json:"labels"`
-	MountPoint    string            `json:"mountPoint"`
 	Driver        string            `json:"driver"`
+	MountPoint    string            `json:"mountPoint"`
+	CreatedTime   time.Time         `json:"createdAt,omitempty"`
 	Options       map[string]string `json:"options"`
-	Scope         string            `json:"scope"`
 	IsCtrSpecific bool              `json:"ctrSpecific"`
 	UID           int               `json:"uid"`
 	GID           int               `json:"gid"`
@@ -29,6 +33,18 @@ func (v *Volume) Name() string {
 	return v.config.Name
 }
 
+// Driver retrieves the volume's driver.
+func (v *Volume) Driver() string {
+	return v.config.Driver
+}
+
+// Scope retrieves the volume's scope.
+// Libpod does not implement volume scoping, and this is provided solely for
+// Docker compatability. It returns only "local".
+func (v *Volume) Scope() string {
+	return "local"
+}
+
 // Labels returns the volume's labels
 func (v *Volume) Labels() map[string]string {
 	labels := make(map[string]string)
@@ -43,11 +59,6 @@ func (v *Volume) MountPoint() string {
 	return v.config.MountPoint
 }
 
-// Driver returns the volume's driver
-func (v *Volume) Driver() string {
-	return v.config.Driver
-}
-
 // Options return the volume's options
 func (v *Volume) Options() map[string]string {
 	options := make(map[string]string)
@@ -58,14 +69,25 @@ func (v *Volume) Options() map[string]string {
 	return options
 }
 
-// Scope returns the scope of the volume
-func (v *Volume) Scope() string {
-	return v.config.Scope
-}
-
 // IsCtrSpecific returns whether this volume was created specifically for a
 // given container. Images with this set to true will be removed when the
 // container is removed with the Volumes parameter set to true.
 func (v *Volume) IsCtrSpecific() bool {
 	return v.config.IsCtrSpecific
 }
+
+// UID returns the UID the volume will be created as.
+func (v *Volume) UID() int {
+	return v.config.UID
+}
+
+// GID returns the GID the volume will be created as.
+func (v *Volume) GID() int {
+	return v.config.GID
+}
+
+// CreatedTime returns the time the volume was created at. It was not tracked
+// for some time, so older volumes may not contain one.
+func (v *Volume) CreatedTime() time.Time {
+	return v.config.CreatedTime
+}