mirror of
https://github.com/containers/podman.git
synced 2025-06-20 00:51:16 +08:00
Merge pull request #8378 from jwhonce/issues/8366
Swap out json-iterator for golang default
This commit is contained in:
@ -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 {
|
||||
|
Reference in New Issue
Block a user