1 files changed, 31 insertions, 58 deletions

diff --git a/cmd/podman/system/version.go b/cmd/podman/system/version.go
index b0f4eb528..92a3225b6 100644
--- a/cmd/podman/system/version.go
+++ b/cmd/podman/system/version.go
@@ -6,35 +6,25 @@ import (
 	"os"
 	"strings"
 	"text/tabwriter"
-	"time"
 
 	"github.com/containers/buildah/pkg/formats"
-	"github.com/containers/libpod/cmd/podman/common"
 	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/cmd/podman/validate"
 	"github.com/containers/libpod/libpod/define"
 	"github.com/containers/libpod/pkg/domain/entities"
-	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
 
 var (
 	versionCommand = &cobra.Command{
 		Use:   "version",
-		Args:  common.NoArgs,
+		Args:  validate.NoArgs,
 		Short: "Display the Podman Version Information",
 		RunE:  version,
-		Annotations: map[string]string{
-			registry.ParentNSRequired: "",
-		},
 	}
 	versionFormat string
 )
 
-type versionStruct struct {
-	Client define.Version
-	Server define.Version
-}
-
 func init() {
 	registry.Commands = append(registry.Commands, registry.CliCommand{
 		Mode:    []entities.EngineMode{entities.ABIMode, entities.TunnelMode},
@@ -45,78 +35,61 @@ func init() {
 }
 
 func version(cmd *cobra.Command, args []string) error {
-	var (
-		v   versionStruct
-		err error
-	)
-	v.Client, err = define.GetVersion()
+	versions, err := registry.ContainerEngine().Version(registry.Context())
 	if err != nil {
-		return errors.Wrapf(err, "unable to determine version")
+		return err
 	}
-	// TODO we need to discuss how to implement
-	// this more. current endpoints dont have a
-	// version endpoint.  maybe we use info?
-	//if remote {
-	//	v.Server, err = getRemoteVersion(c)
-	//	if err != nil {
-	//		return err
-	//	}
-	//} else {
-	v.Server = v.Client
-	//}
 
-	versionOutputFormat := versionFormat
-	if versionOutputFormat != "" {
-		if strings.Join(strings.Fields(versionOutputFormat), "") == "{{json.}}" {
-			versionOutputFormat = formats.JSONString
+	switch {
+	case versionFormat == "json", versionFormat == "{{ json .}}":
+		s, err := json.MarshalToString(versions)
+		if err != nil {
+			return err
+		}
+		_, err = io.WriteString(os.Stdout, s)
+		return err
+	case cmd.Flag("format").Changed:
+		if !strings.HasSuffix(versionFormat, "\n") {
+			versionFormat += "\n"
 		}
-		var out formats.Writer
-		switch versionOutputFormat {
-		case formats.JSONString:
-			out = formats.JSONStruct{Output: v}
-			return out.Out()
-		default:
-			out = formats.StdoutTemplate{Output: v, Template: versionOutputFormat}
-			err := out.Out()
-			if err != nil {
-				// On Failure, assume user is using older version of podman version --format and check client
-				out = formats.StdoutTemplate{Output: v.Client, Template: versionOutputFormat}
-				if err1 := out.Out(); err1 != nil {
-					return err
-				}
+		out := formats.StdoutTemplate{Output: versions, Template: versionFormat}
+		err := out.Out()
+		if err != nil {
+			// On Failure, assume user is using older version of podman version --format and check client
+			versionFormat = strings.Replace(versionFormat, ".Server.", ".", 1)
+			out = formats.StdoutTemplate{Output: versions.Client, Template: versionFormat}
+			if err1 := out.Out(); err1 != nil {
+				return err
 			}
 		}
 		return nil
 	}
+
 	w := tabwriter.NewWriter(os.Stdout, 0, 0, 2, ' ', 0)
 	defer w.Flush()
 
-	if registry.IsRemote() {
+	if versions.Server != nil {
 		if _, err := fmt.Fprintf(w, "Client:\n"); err != nil {
 			return err
 		}
-		formatVersion(w, v.Client)
+		formatVersion(w, versions.Client)
 		if _, err := fmt.Fprintf(w, "\nServer:\n"); err != nil {
 			return err
 		}
-		formatVersion(w, v.Server)
+		formatVersion(w, versions.Server)
 	} else {
-		formatVersion(w, v.Client)
+		formatVersion(w, versions.Client)
 	}
 	return nil
 }
 
-func formatVersion(writer io.Writer, version define.Version) {
+func formatVersion(writer io.Writer, version *define.Version) {
 	fmt.Fprintf(writer, "Version:\t%s\n", version.Version)
-	fmt.Fprintf(writer, "RemoteAPI Version:\t%d\n", version.RemoteAPIVersion)
+	fmt.Fprintf(writer, "API Version:\t%d\n", version.APIVersion)
 	fmt.Fprintf(writer, "Go Version:\t%s\n", version.GoVersion)
 	if version.GitCommit != "" {
 		fmt.Fprintf(writer, "Git Commit:\t%s\n", version.GitCommit)
 	}
-	// Prints out the build time in readable format
-	if version.Built != 0 {
-		fmt.Fprintf(writer, "Built:\t%s\n", time.Unix(version.Built, 0).Format(time.ANSIC))
-	}
-
+	fmt.Fprintf(writer, "Built:\t%s\n", version.BuiltTime)
 	fmt.Fprintf(writer, "OS/Arch:\t%s\n", version.OsArch)
 }