diff options
| author | Jhon Honce <jhonce@redhat.com> | 2020-04-16 12:06:36 -0700 |
|---|---|---|
| committer | Jhon Honce <jhonce@redhat.com> | 2020-04-21 07:56:10 -0700 |
| commit | b21a5b7ff470612e2bde5f120aecfbc1a0881689 (patch) | |
| tree | a47e3a42d363a99537a4d154bfecd2eba0de40fd /cmd/podman/report | |
| parent | f4c2eb1d9dcff5feda5c3eae81ce1bcdbf166ec4 (diff) | |
| download | podman-b21a5b7ff470612e2bde5f120aecfbc1a0881689.tar.gz podman-b21a5b7ff470612e2bde5f120aecfbc1a0881689.tar.bz2 podman-b21a5b7ff470612e2bde5f120aecfbc1a0881689.zip | |
Provide a json variable pointing to a configured json API
* All commands now using the same instance of json API
* `json` variable created in each package to prevent `encoding/json`
from being re-introduced
Signed-off-by: Jhon Honce <jhonce@redhat.com>
Diffstat (limited to 'cmd/podman/report')
| -rw-r--r-- | cmd/podman/report/diff.go | 3 | ||||
| -rw-r--r-- | cmd/podman/report/report.go | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/cmd/podman/report/diff.go b/cmd/podman/report/diff.go index b36189d75..0730f06e8 100644 --- a/cmd/podman/report/diff.go +++ b/cmd/podman/report/diff.go @@ -6,7 +6,6 @@ import ( "github.com/containers/libpod/pkg/domain/entities" "github.com/containers/storage/pkg/archive" - jsoniter "github.com/json-iterator/go" "github.com/pkg/errors" ) @@ -31,7 +30,7 @@ func ChangesToJSON(diffs *entities.DiffReport) error { } } - json := jsoniter.ConfigCompatibleWithStandardLibrary + // Pull in configured json library enc := json.NewEncoder(os.Stdout) return enc.Encode(body) } diff --git a/cmd/podman/report/report.go b/cmd/podman/report/report.go new file mode 100644 index 000000000..8392f10e0 --- /dev/null +++ b/cmd/podman/report/report.go @@ -0,0 +1,6 @@ +package report + +import "github.com/containers/libpod/cmd/podman/registry" + +// Pull in configured json library +var json = registry.JsonLibrary() |