diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-11-08 23:16:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-08 23:16:03 +0100 |
| commit | b713e5371fa8767067bd2c329a3744ea593b2ade (patch) | |
| tree | 9fec27ec1ebc354f3c2eafa7b8a860260abf60fd | |
| parent | f456ce90f966f2eefdfc27ca83541ceacc4a298d (diff) | |
| parent | cb2978d6e93b5ad19478386484ba57610d6cfa67 (diff) | |
| download | podman-b713e5371fa8767067bd2c329a3744ea593b2ade.tar.gz podman-b713e5371fa8767067bd2c329a3744ea593b2ade.tar.bz2 podman-b713e5371fa8767067bd2c329a3744ea593b2ade.zip | |
Merge pull request #4408 from slimjim2234/master
Fixed issue #4391; podman info --format '{{ json . }}'
| -rw-r--r-- | cmd/podman/info.go | 4 | ||||
| -rw-r--r-- | test/e2e/info_test.go | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/cmd/podman/info.go b/cmd/podman/info.go index bf6dd4a8f..7361525ce 100644 --- a/cmd/podman/info.go +++ b/cmd/podman/info.go @@ -3,6 +3,7 @@ package main import ( "fmt" rt "runtime" + "strings" "github.com/containers/buildah/pkg/formats" "github.com/containers/libpod/cmd/podman/cliconfig" @@ -88,6 +89,9 @@ func infoCmd(c *cliconfig.InfoValues) error { var out formats.Writer infoOutputFormat := c.Format + if strings.Join(strings.Fields(infoOutputFormat), "") == "{{json.}}" { + infoOutputFormat = formats.JSONString + } switch infoOutputFormat { case formats.JSONString: out = formats.JSONStruct{Output: info} diff --git a/test/e2e/info_test.go b/test/e2e/info_test.go index c960fb311..d3b1b974e 100644 --- a/test/e2e/info_test.go +++ b/test/e2e/info_test.go @@ -45,4 +45,10 @@ var _ = Describe("Podman Info", func() { Expect(session.ExitCode()).To(Equal(0)) }) + It("podman info --format GO template", func() { + session := podmanTest.Podman([]string{"info", "--format", "{{ json .}}"}) + session.WaitWithDefaultTimeout() + Expect(session.ExitCode()).To(Equal(0)) + Expect(session.IsJSONOutputValid()).To(BeTrue()) + }) }) |