diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-11-18 01:21:19 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-18 01:21:19 +0100 |
commit | 4bbf2b64cafb6923512d95e338d6b313d289696b (patch) | |
tree | df09b3497019ca94b8add7b7bcdda082d3dea74c /cmd/podman | |
parent | 8a0c3d878b13d86b97da188bda1fe580dbb07b8f (diff) | |
parent | 4ed1ef533aac3a0262f6afe0fbac1f163e7d5706 (diff) | |
download | podman-4bbf2b64cafb6923512d95e338d6b313d289696b.tar.gz podman-4bbf2b64cafb6923512d95e338d6b313d289696b.tar.bz2 podman-4bbf2b64cafb6923512d95e338d6b313d289696b.zip |
Merge pull request #8378 from jwhonce/issues/8366
Swap out json-iterator for golang default
Diffstat (limited to 'cmd/podman')
-rw-r--r-- | cmd/podman/inspect/inspect.go | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/cmd/podman/inspect/inspect.go b/cmd/podman/inspect/inspect.go index f9bd75c93..13f36ebbd 100644 --- a/cmd/podman/inspect/inspect.go +++ b/cmd/podman/inspect/inspect.go @@ -2,6 +2,7 @@ package inspect import ( "context" + "encoding/json" // due to a bug in json-iterator it cannot be used here "fmt" "os" "regexp" @@ -28,17 +29,14 @@ const ( ContainerType = "container" // ImageType is the image type. ImageType = "image" - //NetworkType is the network type + // NetworkType is the network type NetworkType = "network" - //PodType is the pod type. + // PodType is the pod type. PodType = "pod" - //VolumeType is the volume type + // VolumeType is the volume type VolumeType = "volume" ) -// Pull in configured json library -var json = registry.JSONLibrary() - // AddInspectFlagSet takes a command and adds the inspect flags and returns an // InspectOptions object. func AddInspectFlagSet(cmd *cobra.Command) *entities.InspectOptions { @@ -173,7 +171,7 @@ func (i *inspector) inspect(namesOrIDs []string) error { data = append(data, podData) } } - if i.podOptions.Latest { //latest means there are no names in the namesOrID array + if i.podOptions.Latest { // latest means there are no names in the namesOrID array podData, err := i.containerEngine.PodInspect(ctx, i.podOptions) if err != nil { cause := errors.Cause(err) @@ -238,9 +236,12 @@ func (i *inspector) inspect(namesOrIDs []string) error { } func printJSON(data []interface{}) error { - enc := json.NewEncoder(os.Stdout) - enc.SetIndent("", " ") - return enc.Encode(data) + buf, err := json.MarshalIndent(data, "", " ") + if err != nil { + return err + } + _, err = fmt.Println(string(buf)) + return err } func printTmpl(typ, row string, data []interface{}) error { |