From b21a5b7ff470612e2bde5f120aecfbc1a0881689 Mon Sep 17 00:00:00 2001 From: Jhon Honce Date: Thu, 16 Apr 2020 12:06:36 -0700 Subject: 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 --- cmd/podman/report/diff.go | 3 +-- cmd/podman/report/report.go | 6 ++++++ 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 cmd/podman/report/report.go (limited to 'cmd/podman/report') 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() -- cgit v1.2.3-54-g00ecf