opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-02 19:02:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4408 from slimjim2234/master

Browse Source 
Fixed issue #4391; podman info --format '{{ json . }}'
This commit is contained in:
OpenShift Merge Robot
2019-11-08 23:16:03 +01:00
committed by GitHub
parent f456ce90f9 cb2978d6e9
commit b713e5371f
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/podman/info.go
View File

@ -3,6 +3,7 @@ package main
import ( import (
"fmt" "fmt"
rt "runtime" rt "runtime"
"strings"
"github.com/containers/buildah/pkg/formats" "github.com/containers/buildah/pkg/formats"
"github.com/containers/libpod/cmd/podman/cliconfig" "github.com/containers/libpod/cmd/podman/cliconfig"
@ -88,6 +89,9 @@ func infoCmd(c *cliconfig.InfoValues) error {
var out formats.Writer var out formats.Writer
infoOutputFormat := c.Format infoOutputFormat := c.Format
if strings.Join(strings.Fields(infoOutputFormat), "") == "{{json.}}" {
infoOutputFormat = formats.JSONString
}
switch infoOutputFormat { switch infoOutputFormat {
case formats.JSONString: case formats.JSONString:
out = formats.JSONStruct{Output: info} out = formats.JSONStruct{Output: info}

6
test/e2e/info_test.go
View File

@ -45,4 +45,10 @@ var _ = Describe("Podman Info", func() {
Expect(session.ExitCode()).To(Equal(0)) 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())
})
}) })