Merge pull request #2688 from baude/issue2671

support GO template {{ json . }}

2 files changed, 24 insertions, 0 deletions

diff --git a/cmd/podman/version.go b/cmd/podman/version.go
index 336be892e..31b0b8e82 100644
--- a/cmd/podman/version.go
+++ b/cmd/podman/version.go
@@ -3,6 +3,7 @@ package main
 import (
 	"fmt"
 	"os"
+	"strings"
 	"text/tabwriter"
 	"time"
 
@@ -43,6 +44,9 @@ func versionCmd(c *cliconfig.VersionValues) error {
 
 	versionOutputFormat := c.Format
 	if versionOutputFormat != "" {
+		if strings.Join(strings.Fields(versionOutputFormat), "") == "{{json.}}" {
+			versionOutputFormat = formats.JSONString
+		}
 		var out formats.Writer
 		switch versionOutputFormat {
 		case formats.JSONString:
diff --git a/test/e2e/version_test.go b/test/e2e/version_test.go
index b66291734..f546158a9 100644
--- a/test/e2e/version_test.go
+++ b/test/e2e/version_test.go
@@ -36,4 +36,24 @@ var _ = Describe("Podman version", func() {
 		Expect(session.ExitCode()).To(Equal(0))
 		Expect(len(session.OutputToStringArray())).To(BeNumerically(">", 2))
 	})
+
+	It("podman version --format json", func() {
+		session := podmanTest.Podman([]string{"version", "--format", "json"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+		Expect(session.IsJSONOutputValid()).To(BeTrue())
+	})
+
+	It("podman version --format json", func() {
+		session := podmanTest.Podman([]string{"version", "--format", "{{ json .}}"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+		Expect(session.IsJSONOutputValid()).To(BeTrue())
+	})
+
+	It("podman version --format GO template", func() {
+		session := podmanTest.Podman([]string{"version", "--format", "{{ .Version }}"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+	})
 })