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

Merge pull request #8378 from jwhonce/issues/8366

Browse Source 
Swap out json-iterator for golang default
This commit is contained in:
OpenShift Merge Robot
2020-11-18 01:21:19 +01:00
committed by GitHub
parent 8a0c3d878b 4ed1ef533a
commit 4bbf2b64ca
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/podman/inspect/inspect.go
View File

@ -2,6 +2,7 @@ package inspect
import ( import (
"context" "context"
"encoding/json" // due to a bug in json-iterator it cannot be used here
"fmt" "fmt"
"os" "os"
"regexp" "regexp"
@ -36,9 +37,6 @@ const (
VolumeType = "volume" VolumeType = "volume"
) )
// Pull in configured json library
var json = registry.JSONLibrary()
// AddInspectFlagSet takes a command and adds the inspect flags and returns an // AddInspectFlagSet takes a command and adds the inspect flags and returns an
// InspectOptions object. // InspectOptions object.
func AddInspectFlagSet(cmd *cobra.Command) *entities.InspectOptions { func AddInspectFlagSet(cmd *cobra.Command) *entities.InspectOptions {
@ -238,9 +236,12 @@ func (i *inspector) inspect(namesOrIDs []string) error {
} }
func printJSON(data []interface{}) error { func printJSON(data []interface{}) error {
enc := json.NewEncoder(os.Stdout) buf, err := json.MarshalIndent(data, "", " ")
enc.SetIndent("", " ") if err != nil {
return enc.Encode(data) return err
}
_, err = fmt.Println(string(buf))
return err
} }
func printTmpl(typ, row string, data []interface{}) error { func printTmpl(typ, row string, data []interface{}) error {