From 78c6151519cebf933d0c08c4752f7be47d87aacc Mon Sep 17 00:00:00 2001
From: baude <bbaude@redhat.com>
Date: Mon, 14 Aug 2017 14:32:00 -0500
Subject: [PATCH] Modify kpod diff --json to --format json

We want all kpod subcommands to use the formats code to output
formats like json.  Altering kpod diff --json to kpod diff --format json
like the kpod images command.

Signed-off-by: baude <bbaude@redhat.com>
---
 cmd/kpod/diff.go            |  90 ++++++++++----
 cmd/kpod/formats/formats.go |  71 +++++++++--
 cmd/kpod/history.go         | 232 ++++++++++++++----------------------
 cmd/kpod/images.go          |   8 +-
 cmd/kpod/info.go            |  30 ++---
 cmd/kpod/inspect.go         |  40 ++-----
 cmd/kpod/mount.go           |   5 +-
 completions/bash/kpod       |   2 +-
 docs/kpod-diff.1.md         |   6 +-
 docs/kpod-history.1.md      |   6 +-
 docs/kpod-info.1.md         |   6 +-
 test/kpod.bats              |   4 +-
 test/kpod_diff.bats         |   4 +-
 13 files changed, 267 insertions(+), 237 deletions(-)

diff --git a/cmd/kpod/diff.go b/cmd/kpod/diff.go
index 82f260e0..f8592e71 100644
--- a/cmd/kpod/diff.go
+++ b/cmd/kpod/diff.go
@@ -1,10 +1,9 @@
 package main
 
 import (
-	"encoding/json"
 	"fmt"
-
 	"github.com/containers/storage/pkg/archive"
+	"github.com/kubernetes-incubator/cri-o/cmd/kpod/formats"
 	"github.com/kubernetes-incubator/cri-o/libkpod"
 	"github.com/pkg/errors"
 	"github.com/urfave/cli"
@@ -16,6 +15,22 @@ type diffJSONOutput struct {
 	Deleted []string `json:"deleted,omitempty"`
 }
 
+type diffOutputParams struct {
+	Change archive.ChangeType
+	Path   string
+}
+
+type stdoutStruct struct {
+	output []diffOutputParams
+}
+
+func (so stdoutStruct) Out() error {
+	for _, d := range so.output {
+		fmt.Printf("%s %s\n", d.Change, d.Path)
+	}
+	return nil
+}
+
 var (
 	diffFlags = []cli.Flag{
 		cli.BoolFlag{
@@ -23,9 +38,9 @@ var (
 			Usage:  "Save the diff as a tar archive",
 			Hidden: true,
 		},
-		cli.BoolFlag{
-			Name:  "json",
-			Usage: "Format output as JSON",
+		cli.StringFlag{
+			Name:  "format",
+			Usage: "Change the output format.",
 		},
 	}
 	diffDescription = fmt.Sprint(`Displays changes on a container or image's filesystem.  The
@@ -41,6 +56,23 @@ var (
 	}
 )
 
+func formatJSON(output []diffOutputParams) (diffJSONOutput, error) {
+	jsonStruct := diffJSONOutput{}
+	for _, output := range output {
+		switch output.Change {
+		case archive.ChangeModify:
+			jsonStruct.Changed = append(jsonStruct.Changed, output.Path)
+		case archive.ChangeAdd:
+			jsonStruct.Added = append(jsonStruct.Added, output.Path)
+		case archive.ChangeDelete:
+			jsonStruct.Deleted = append(jsonStruct.Deleted, output.Path)
+		default:
+			return jsonStruct, errors.Errorf("output kind %q not recognized", output.Change.String())
+		}
+	}
+	return jsonStruct, nil
+}
+
 func diffCmd(c *cli.Context) error {
 	if len(c.Args()) != 1 {
 		return errors.Errorf("container, layer, or image name must be specified: kpod diff [options [...]] ID-NAME")
@@ -61,29 +93,35 @@ func diffCmd(c *cli.Context) error {
 		return errors.Wrapf(err, "could not get changes for %q", to)
 	}
 
-	if c.Bool("json") {
-		jsonStruct := diffJSONOutput{}
-		for _, change := range changes {
-			if change.Kind == archive.ChangeModify {
-				jsonStruct.Changed = append(jsonStruct.Changed, change.Path)
-			} else if change.Kind == archive.ChangeAdd {
-				jsonStruct.Added = append(jsonStruct.Added, change.Path)
-			} else if change.Kind == archive.ChangeDelete {
-				jsonStruct.Deleted = append(jsonStruct.Deleted, change.Path)
-			} else {
-				return errors.Errorf("change kind %q not recognized", change.Kind.String())
-			}
-		}
-		b, err := json.MarshalIndent(jsonStruct, "", "  ")
-		if err != nil {
-			return errors.Wrapf(err, "could not marshal json for %+v", jsonStruct)
-		}
-		fmt.Println(string(b))
-	} else {
-		for _, change := range changes {
-			fmt.Println(change.String())
+	diffOutput := []diffOutputParams{}
+	outputFormat := c.String("format")
+
+	for _, change := range changes {
+
+		params := diffOutputParams{
+			Change: change.Kind,
+			Path:   change.Path,
 		}
+		diffOutput = append(diffOutput, params)
 	}
 
+	var out formats.Writer
+
+	if outputFormat != "" {
+		switch outputFormat {
+		case formats.JSONString:
+			data, err := formatJSON(diffOutput)
+			if err != nil {
+				return err
+			}
+			out = formats.JSONStruct{Output: data}
+		default:
+			return errors.New("only valid format for diff is 'json'")
+		}
+	} else {
+		out = stdoutStruct{output: diffOutput}
+	}
+	formats.Writer(out).Out()
+
 	return nil
 }
diff --git a/cmd/kpod/formats/formats.go b/cmd/kpod/formats/formats.go
index 553afdf7..7302f75f 100644
--- a/cmd/kpod/formats/formats.go
+++ b/cmd/kpod/formats/formats.go
@@ -3,6 +3,7 @@ package formats
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/ghodss/yaml"
 	"os"
 	"strings"
 	"text/template"
@@ -10,25 +11,45 @@ import (
 	"github.com/pkg/errors"
 )
 
+// JSONString const to save on duplicate variable names
+const JSONString string = "json"
+
 // Writer interface for outputs
 type Writer interface {
 	Out() error
 }
 
-// JSONstruct for JSON output
-type JSONstruct struct {
+// JSONStructArray for JSON output
+type JSONStructArray struct {
 	Output []interface{}
 }
 
-// StdoutTemplate for Go template output
-type StdoutTemplate struct {
+// StdoutTemplateArray for Go template output
+type StdoutTemplateArray struct {
 	Output   []interface{}
 	Template string
 	Fields   map[string]string
 }
 
-// Out method for JSON
-func (j JSONstruct) Out() error {
+// JSONStruct for JSON output
+type JSONStruct struct {
+	Output interface{}
+}
+
+// StdoutTemplate for Go template output
+type StdoutTemplate struct {
+	Output   interface{}
+	Template string
+	Fields   map[string]string
+}
+
+// YAMLStruct for YAML output
+type YAMLStruct struct {
+	Output interface{}
+}
+
+// Out method for JSON Arrays
+func (j JSONStructArray) Out() error {
 	data, err := json.MarshalIndent(j.Output, "", "    ")
 	if err != nil {
 		return err
@@ -38,7 +59,7 @@ func (j JSONstruct) Out() error {
 }
 
 // Out method for Go templates
-func (t StdoutTemplate) Out() error {
+func (t StdoutTemplateArray) Out() error {
 	if strings.HasPrefix(t.Template, "table") {
 		t.Template = strings.TrimSpace(t.Template[5:])
 		headerTmpl, err := template.New("header").Funcs(headerFunctions).Parse(t.Template)
@@ -67,3 +88,39 @@ func (t StdoutTemplate) Out() error {
 	return nil
 
 }
+
+// Out method for JSON struct
+func (j JSONStruct) Out() error {
+	data, err := json.MarshalIndent(j.Output, "", "    ")
+	if err != nil {
+		return err
+	}
+	fmt.Printf("%s\n", data)
+	return nil
+}
+
+//Out method for Go templates
+func (t StdoutTemplate) Out() error {
+	tmpl, err := template.New("image").Parse(t.Template)
+	if err != nil {
+		return errors.Wrapf(err, "template parsing error")
+	}
+	err = tmpl.Execute(os.Stdout, t.Output)
+	if err != nil {
+		return err
+	}
+	fmt.Println()
+	return nil
+}
+
+// Out method for YAML
+func (y YAMLStruct) Out() error {
+	var buf []byte
+	var err error
+	buf, err = yaml.Marshal(y.Output)
+	if err != nil {
+		return err
+	}
+	fmt.Println(string(buf))
+	return nil
+}
diff --git a/cmd/kpod/history.go b/cmd/kpod/history.go
index 082e6d66..44521734 100644
--- a/cmd/kpod/history.go
+++ b/cmd/kpod/history.go
@@ -3,17 +3,15 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"strings"
-	"text/template"
-	"time"
-
-	"os"
-
+	"reflect"
 	"strconv"
+	"strings"
+	"time"
 
 	is "github.com/containers/image/storage"
 	"github.com/containers/storage"
 	units "github.com/docker/go-units"
+	"github.com/kubernetes-incubator/cri-o/cmd/kpod/formats"
 	"github.com/kubernetes-incubator/cri-o/libkpod/common"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
@@ -27,20 +25,20 @@ const (
 
 // historyOutputParams stores info about each layer
 type historyOutputParams struct {
-	ID        string     `json:"id"`
-	Created   *time.Time `json:"created"`
-	CreatedBy string     `json:"createdby"`
-	Size      int64      `json:"size"`
-	Comment   string     `json:"comment"`
+	ID        string `json:"id"`
+	Created   string `json:"created"`
+	CreatedBy string `json:"createdby"`
+	Size      string `json:"size"`
+	Comment   string `json:"comment"`
 }
 
 // historyOptions stores cli flag values
 type historyOptions struct {
-	image   string
-	human   bool
-	noTrunc bool
-	quiet   bool
-	format  string
+	image    string
+	human    bool
+	truncate bool
+	quiet    bool
+	format   string
 }
 
 var (
@@ -50,7 +48,7 @@ var (
 			Usage: "Display sizes and dates in human readable format",
 		},
 		cli.BoolFlag{
-			Name:  "no-trunc",
+			Name:  "no-trunc, notruncate",
 			Usage: "Do not truncate the output",
 		},
 		cli.BoolFlag{
@@ -59,11 +57,7 @@ var (
 		},
 		cli.StringFlag{
 			Name:  "format",
-			Usage: "Pretty-print history of the image using a Go template",
-		},
-		cli.BoolFlag{
-			Name:  "json",
-			Usage: "Print the history in JSON format",
+			Usage: "Change the output to JSON or a Go template",
 		},
 	}
 
@@ -93,23 +87,19 @@ func historyCmd(c *cli.Context) error {
 	if c.IsSet("human") {
 		human = c.Bool("human")
 	}
-	noTruncate := false
+
+	truncate := true
 	if c.IsSet("no-trunc") {
-		noTruncate = c.Bool("no-trunc")
+		truncate = !c.Bool("no-trunc")
 	}
 	quiet := false
 	if c.IsSet("quiet") {
 		quiet = c.Bool("quiet")
 	}
-	json := false
-	if c.IsSet("json") {
-		json = c.Bool("json")
-	}
 	format := ""
 	if c.IsSet("format") {
 		format = c.String("format")
 	}
-
 	args := c.Args()
 	if len(args) == 0 {
 		logrus.Errorf("an image name must be specified")
@@ -122,98 +112,29 @@ func historyCmd(c *cli.Context) error {
 	imgName := args[0]
 
 	opts := historyOptions{
-		image:   imgName,
-		human:   human,
-		noTrunc: noTruncate,
-		quiet:   quiet,
-		format:  format,
-	}
-
-	var history []byte
-	if json {
-		history, err = createJSON(store, opts)
-		fmt.Println(string(history))
-	} else {
-		if format == "" && !quiet {
-			outputHeading(noTruncate)
-		}
-		err = outputHistory(store, opts)
+		image:    imgName,
+		human:    human,
+		truncate: truncate,
+		quiet:    quiet,
+		format:   format,
 	}
+	err = outputHistory(store, opts)
 	return err
 }
 
-// outputHeader outputs the heading
-func outputHeading(noTrunc bool) {
-	if !noTrunc {
-		fmt.Printf("%-12s\t\t%-16s\t\t%-45s\t\t", "IMAGE", "CREATED", "CREATED BY")
-		fmt.Printf("%-16s\t\t%s\n", "SIZE", "COMMENT")
+func genHistoryFormat(quiet, truncate, human bool) (format string) {
+	if quiet {
+		return "{{.ID}}"
+	}
+
+	if truncate {
+		format = "table {{ .ID | printf \"%-12.12s\" }} {{ .Created | printf \"%-16s\" }} {{ .CreatedBy | " +
+			"printf \"%-45.45s\" }} {{ .Size | printf \"%-16s\" }} {{ .Comment | printf \"%s\" }}"
 	} else {
-		fmt.Printf("%-64s\t%-18s\t%-60s\t", "IMAGE", "CREATED", "CREATED BY")
-		fmt.Printf("%-16s\t%s\n", "SIZE", "COMMENT")
+		format = "table {{ .ID | printf \"%-64s\" }} {{ .Created | printf \"%-18s\" }} {{ .CreatedBy | " +
+			"printf \"%-60s\" }} {{ .Size | printf \"%-16s\" }} {{ .Comment | printf \"%s\"}}"
 	}
-}
-
-// outputString outputs the information in historyOutputParams
-func outputString(noTrunc, human bool, params historyOutputParams) {
-	var (
-		createdTime string
-		outputSize  string
-	)
-
-	if human {
-		createdTime = outputHumanTime(params.Created) + " ago"
-		outputSize = units.HumanSize(float64(params.Size))
-	} else {
-		createdTime = outputTime(params.Created)
-		outputSize = strconv.FormatInt(params.Size, 10)
-	}
-
-	if !noTrunc {
-		fmt.Printf("%-12.12s\t\t%-16s\t\t%-45.45s\t\t", params.ID, createdTime, params.CreatedBy)
-		fmt.Printf("%-16s\t\t%s\n", outputSize, params.Comment)
-	} else {
-		fmt.Printf("%-64s\t%-18s\t%-60s\t", params.ID, createdTime, params.CreatedBy)
-		fmt.Printf("%-16s\t%s\n\n", outputSize, params.Comment)
-	}
-}
-
-// outputWithTemplate is called when --format is given a template
-func outputWithTemplate(format string, params historyOutputParams, human bool) error {
-	templ, err := template.New("history").Parse(format)
-	if err != nil {
-		return errors.Wrapf(err, "error parsing template")
-	}
-
-	createdTime := outputTime(params.Created)
-	outputSize := strconv.FormatInt(params.Size, 10)
-
-	if human {
-		createdTime = outputHumanTime(params.Created) + " ago"
-		outputSize = units.HumanSize(float64(params.Size))
-	}
-
-	// templParams is used to store the info from params and the time and
-	// size that have been converted to type string for when the human flag
-	// is set
-	templParams := struct {
-		ID        string
-		Created   string
-		CreatedBy string
-		Size      string
-		Comment   string
-	}{
-		params.ID,
-		createdTime,
-		params.CreatedBy,
-		outputSize,
-		params.Comment,
-	}
-
-	if err = templ.Execute(os.Stdout, templParams); err != nil {
-		return err
-	}
-	fmt.Println()
-	return nil
+	return
 }
 
 // outputTime displays the time stamp in "2017-06-20T20:24:10Z" format
@@ -229,10 +150,12 @@ func outputHumanTime(tm *time.Time) string {
 // createJSON retrieves the history of the image and returns a JSON object
 func createJSON(store storage.Store, opts historyOptions) ([]byte, error) {
 	var (
-		size     int64
-		img      *storage.Image
-		imageID  string
-		layerAll []historyOutputParams
+		size        int64
+		img         *storage.Image
+		imageID     string
+		layerAll    []historyOutputParams
+		createdTime string
+		outputSize  string
 	)
 
 	ref, err := is.Transport.ParseStoreReference(store, opts.image)
@@ -275,11 +198,18 @@ func createJSON(store storage.Store, opts historyOptions) ([]byte, error) {
 			size = 0
 		}
 
+		if opts.human {
+			createdTime = outputHumanTime(history[i].Created) + " ago"
+			outputSize = units.HumanSize(float64(size))
+		} else {
+			createdTime = outputTime(history[i].Created)
+			outputSize = strconv.FormatInt(size, 10)
+		}
 		params := historyOutputParams{
 			ID:        imageID,
-			Created:   history[i].Created,
+			Created:   createdTime,
 			CreatedBy: history[i].CreatedBy,
-			Size:      size,
+			Size:      outputSize,
 			Comment:   history[i].Comment,
 		}
 
@@ -298,6 +228,15 @@ func createJSON(store storage.Store, opts historyOptions) ([]byte, error) {
 	return output, nil
 }
 
+// historyToGeneric makes an empty array of interfaces for output
+func historyToGeneric(params []historyOutputParams) []interface{} {
+	genericParams := make([]interface{}, len(params))
+	for i, v := range params {
+		genericParams[i] = interface{}(v)
+	}
+	return genericParams
+}
+
 // outputHistory gets the history of the image from the JSON object
 // and pretty prints it to the screen
 func outputHistory(store storage.Store, opts historyOptions) error {
@@ -316,27 +255,25 @@ func outputHistory(store storage.Store, opts historyOptions) error {
 		return errors.Errorf("error Unmarshalling JSON: %v", err)
 	}
 
+	historyOutput := []historyOutputParams{}
+
+	historyFormat := opts.format
+	if historyFormat == "" {
+		historyFormat = genHistoryFormat(opts.quiet, opts.truncate, opts.human)
+	}
+
 	for i := 0; i < len(history); i++ {
 		imageID = history[i].ID
 
 		outputCreatedBy = strings.Join(strings.Fields(history[i].CreatedBy), " ")
-		if !opts.noTrunc && len(outputCreatedBy) > createdByTruncLength {
+		if opts.truncate && len(outputCreatedBy) > createdByTruncLength {
 			outputCreatedBy = outputCreatedBy[:createdByTruncLength-3] + "..."
 		}
 
-		if !opts.noTrunc && i == 0 {
+		if opts.truncate && i == 0 {
 			imageID = history[i].ID[:idTruncLength]
 		}
 
-		if opts.quiet {
-			if !opts.noTrunc {
-				fmt.Printf("%-12.12s\n", imageID)
-			} else {
-				fmt.Printf("%-s\n", imageID)
-			}
-			continue
-		}
-
 		params := historyOutputParams{
 			ID:        imageID,
 			Created:   history[i].Created,
@@ -344,15 +281,28 @@ func outputHistory(store storage.Store, opts historyOptions) error {
 			Size:      history[i].Size,
 			Comment:   history[i].Comment,
 		}
-
-		if len(opts.format) > 0 {
-			if err = outputWithTemplate(opts.format, params, opts.human); err != nil {
-				return errors.Errorf("error outputing with template: %v", err)
-			}
-			continue
-		}
-
-		outputString(opts.noTrunc, opts.human, params)
+		historyOutput = append(historyOutput, params)
 	}
+
+	var out formats.Writer
+	switch opts.format {
+	case formats.JSONString:
+		out = formats.JSONStructArray{Output: historyToGeneric(historyOutput)}
+	default:
+		out = formats.StdoutTemplateArray{Output: historyToGeneric(historyOutput), Template: historyFormat, Fields: historyOutput[0].headerMap()}
+
+	}
+	formats.Writer(out).Out()
 	return nil
 }
+
+func (h *historyOutputParams) headerMap() map[string]string {
+	v := reflect.Indirect(reflect.ValueOf(h))
+	values := make(map[string]string)
+	for h := 0; h < v.NumField(); h++ {
+		key := v.Type().Field(h).Name
+		value := key
+		values[key] = fmt.Sprintf("%s        ", strings.ToUpper(splitCamelCase(value)))
+	}
+	return values
+}
diff --git a/cmd/kpod/images.go b/cmd/kpod/images.go
index 815822b2..457f9d8d 100644
--- a/cmd/kpod/images.go
+++ b/cmd/kpod/images.go
@@ -33,7 +33,7 @@ var (
 		},
 		cli.StringFlag{
 			Name:  "format",
-			Usage: "Change the output format.",
+			Usage: "Change the output format to JSON or a Go template",
 		},
 		cli.StringFlag{
 			Name:  "filter, f",
@@ -160,10 +160,10 @@ func outputImages(store storage.Store, images []storage.Image, truncate, digests
 	var out formats.Writer
 
 	switch outputFormat {
-	case "json":
-		out = formats.JSONstruct{Output: toGeneric(imageOutput)}
+	case formats.JSONString:
+		out = formats.JSONStructArray{Output: toGeneric(imageOutput)}
 	default:
-		out = formats.StdoutTemplate{Output: toGeneric(imageOutput), Template: outputFormat, Fields: imageOutput[0].headerMap()}
+		out = formats.StdoutTemplateArray{Output: toGeneric(imageOutput), Template: outputFormat, Fields: imageOutput[0].headerMap()}
 	}
 
 	formats.Writer(out).Out()
diff --git a/cmd/kpod/info.go b/cmd/kpod/info.go
index be08f91d..79980b08 100644
--- a/cmd/kpod/info.go
+++ b/cmd/kpod/info.go
@@ -2,14 +2,13 @@ package main
 
 import (
 	"bytes"
-	"encoding/json"
 	"fmt"
 	"io/ioutil"
 	"os"
 	"runtime"
 
 	"github.com/docker/docker/pkg/system"
-	"github.com/ghodss/yaml"
+	"github.com/kubernetes-incubator/cri-o/cmd/kpod/formats"
 	"github.com/pkg/errors"
 	"github.com/urfave/cli"
 )
@@ -29,9 +28,9 @@ var (
 			Name:  "debug, D",
 			Usage: "display additional debug information",
 		},
-		cli.BoolFlag{
-			Name:  "json",
-			Usage: "output as JSON instead of the default YAML",
+		cli.StringFlag{
+			Name:  "format",
+			Usage: "Change the output format to JSON or a Go template",
 		},
 	}
 )
@@ -57,17 +56,18 @@ func infoCmd(c *cli.Context) error {
 		info[thisName] = thisInfo
 	}
 
-	var buf []byte
-	var err error
-	if c.Bool("json") {
-		buf, err = json.MarshalIndent(info, "", "  ")
-	} else {
-		buf, err = yaml.Marshal(info)
+	var out formats.Writer
+	infoOutputFormat := c.String("format")
+	switch infoOutputFormat {
+	case formats.JSONString:
+		out = formats.JSONStruct{Output: info}
+	case "":
+		out = formats.YAMLStruct{Output: info}
+	default:
+		out = formats.StdoutTemplate{Output: info, Template: infoOutputFormat}
 	}
-	if err != nil {
-		return err
-	}
-	fmt.Println(string(buf))
+
+	formats.Writer(out).Out()
 
 	return nil
 }
diff --git a/cmd/kpod/inspect.go b/cmd/kpod/inspect.go
index c973c4ad..fe8d53b7 100644
--- a/cmd/kpod/inspect.go
+++ b/cmd/kpod/inspect.go
@@ -1,11 +1,7 @@
 package main
 
 import (
-	"encoding/json"
-	"fmt"
-	"os"
-	"text/template"
-
+	"github.com/kubernetes-incubator/cri-o/cmd/kpod/formats"
 	"github.com/kubernetes-incubator/cri-o/libkpod"
 	libkpodimage "github.com/kubernetes-incubator/cri-o/libkpod/image"
 	"github.com/pkg/errors"
@@ -13,9 +9,6 @@ import (
 )
 
 const (
-	defaultFormat = `Container: {{.Container}}
-ID: {{.ContainerID}}
-`
 	inspectTypeContainer = "container"
 	inspectTypeImage     = "image"
 	inspectAll           = "all"
@@ -30,8 +23,7 @@ var (
 		},
 		cli.StringFlag{
 			Name:  "format, f",
-			Value: defaultFormat,
-			Usage: "Format the output using the given go template",
+			Usage: "Change the output format to a Go template",
 		},
 		cli.BoolFlag{
 			Name:  "size",
@@ -60,10 +52,6 @@ func inspectCmd(c *cli.Context) error {
 
 	itemType := c.String("type")
 	size := c.Bool("size")
-	format := defaultFormat
-	if c.String("format") != "" {
-		format = c.String("format")
-	}
 
 	switch itemType {
 	case inspectTypeContainer:
@@ -73,8 +61,6 @@ func inspectCmd(c *cli.Context) error {
 		return errors.Errorf("the only recognized types are %q, %q, and %q", inspectTypeContainer, inspectTypeImage, inspectAll)
 	}
 
-	t := template.Must(template.New("format").Parse(format))
-
 	name := args[0]
 
 	config, err := getConfig(c)
@@ -89,6 +75,7 @@ func inspectCmd(c *cli.Context) error {
 		return errors.Wrapf(err, "could not update list of containers")
 	}
 
+	outputFormat := c.String("format")
 	var data interface{}
 	switch itemType {
 	case inspectTypeContainer:
@@ -115,18 +102,15 @@ func inspectCmd(c *cli.Context) error {
 		}
 	}
 
-	if c.IsSet("format") {
-		if err = t.Execute(os.Stdout, data); err != nil {
-			return err
-		}
-		fmt.Println()
-		return nil
+	var out formats.Writer
+	if outputFormat != "" && outputFormat != formats.JSONString {
+		//template
+		out = formats.StdoutTemplate{Output: data, Template: outputFormat}
+	} else {
+		// default is json output
+		out = formats.JSONStruct{Output: data}
 	}
 
-	d, err := json.MarshalIndent(data, "", "    ")
-	if err != nil {
-		return errors.Wrapf(err, "error encoding build container as json")
-	}
-	_, err = fmt.Println(string(d))
-	return err
+	formats.Writer(out).Out()
+	return nil
 }
diff --git a/cmd/kpod/mount.go b/cmd/kpod/mount.go
index 424a46f9..108610a4 100644
--- a/cmd/kpod/mount.go
+++ b/cmd/kpod/mount.go
@@ -4,6 +4,7 @@ import (
 	js "encoding/json"
 	"fmt"
 
+	of "github.com/kubernetes-incubator/cri-o/cmd/kpod/formats"
 	"github.com/pkg/errors"
 	"github.com/urfave/cli"
 )
@@ -28,7 +29,7 @@ var (
 		},
 		cli.StringFlag{
 			Name:  "format",
-			Usage: "Print mounted containers in specified format",
+			Usage: "Change the output format to Go template",
 		},
 	}
 	mountCommand = cli.Command{
@@ -55,7 +56,7 @@ func mountCmd(c *cli.Context) error {
 	}
 
 	args := c.Args()
-	json := c.String("format") == "json"
+	json := c.String("format") == of.JSONString
 	if !formats[c.String("format")] {
 		return errors.Errorf("%q is not a supported format", c.String("format"))
 	}
diff --git a/completions/bash/kpod b/completions/bash/kpod
index 2c33a95e..e70fca27 100644
--- a/completions/bash/kpod
+++ b/completions/bash/kpod
@@ -35,10 +35,10 @@ _kpod_info() {
     local boolean_options="
      --help
      -h
-     --json
      --debug
      "
     local options_with_args="
+    --format
   "
 
     local all_options="$options_with_args $boolean_options"
diff --git a/docs/kpod-diff.1.md b/docs/kpod-diff.1.md
index 1978687e..1916780c 100644
--- a/docs/kpod-diff.1.md
+++ b/docs/kpod-diff.1.md
@@ -13,9 +13,9 @@ Displays changes on a container or image's filesystem.  The container or image w
 
 ## OPTIONS
 
-**--json**
+**--format**
 
-Format output as json
+Alter the output into a different format.  The only valid format for diff is `json`.
 
 
 ## EXAMPLE
@@ -26,7 +26,7 @@ C /usr/local
 C /usr/local/bin
 A /usr/local/bin/docker-entrypoint.sh
 
-kpod diff --json redis:alpine
+kpod diff --format json redis:alpine
 {
   "changed": [
     "/usr",
diff --git a/docs/kpod-history.1.md b/docs/kpod-history.1.md
index 701c5243..26fdbdae 100644
--- a/docs/kpod-history.1.md
+++ b/docs/kpod-history.1.md
@@ -47,10 +47,8 @@ Valid placeholders for the Go template are listed below:
     Print the numeric IDs only
 
 **--format**
-    Pretty-print history of the image using a Go template
+    Alter the output for a format like 'json' or a Go template.
 
-**--json**
-    Print the history in JSON form
 
 ## COMMANDS
 
@@ -60,6 +58,8 @@ Valid placeholders for the Go template are listed below:
 
 **kpod history --format "{{.ID}} {{.Created}}" debian**
 
+**kpod history --format json debian**
+
 ## history
 Show the history of an image
 
diff --git a/docs/kpod-info.1.md b/docs/kpod-info.1.md
index b9c7ac3b..99deae9b 100644
--- a/docs/kpod-info.1.md
+++ b/docs/kpod-info.1.md
@@ -21,16 +21,16 @@ Information display here pertain to the host, current storage stats, and build o
 
 Show additional information
 
-**--json**
+**--format**
 
-Output as JSON instead of the default YAML",
+Change output format to "json" or a Go template.
 
 
 ## EXAMPLE
 
 `kpod info`
 
-`kpod info --debug --json | jq .host.kernel`
+`kpod info --debug --format json| jq .host.kernel`
 
 ## SEE ALSO
 crio(8), crio.conf(5)
diff --git a/test/kpod.bats b/test/kpod.bats
index c00a8346..fd83e774 100644
--- a/test/kpod.bats
+++ b/test/kpod.bats
@@ -73,7 +73,7 @@ function teardown() {
 	[ "$status" -eq 0 ]
 }
 
-@test "kpod history with format" {
+@test "kpod history with Go template format" {
 	run ${KPOD_BINARY} ${KPOD_OPTIONS} pull $IMAGE
 	[ "$status" -eq 0 ]
 	run ${KPOD_BINARY} ${KPOD_OPTIONS} history --format "{{.ID}} {{.Created}}" $IMAGE
@@ -116,7 +116,7 @@ function teardown() {
 @test "kpod history json flag" {
 	run ${KPOD_BINARY} ${KPOD_OPTIONS} pull $IMAGE
 	[ "$status" -eq 0 ]
-	run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} history --json $IMAGE | python -m json.tool"
+	run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} history --format json $IMAGE | python -m json.tool"
 	echo "$output"
 	[ "$status" -eq 0 ]
 	run ${KPOD_BINARY} $KPOD_OPTIONS rmi $IMAGE
diff --git a/test/kpod_diff.bats b/test/kpod_diff.bats
index 4af6a429..328419b7 100644
--- a/test/kpod_diff.bats
+++ b/test/kpod_diff.bats
@@ -29,8 +29,8 @@ function teardown() {
 @test "test diff with json output" {
     run ${KPOD_BINARY} $KPOD_OPTIONS pull $IMAGE
     [ "$status" -eq 0 ]
-    # run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} diff --json $IMAGE | python -m json.tool"
-    run ${KPOD_BINARY} $KPOD_OPTIONS diff --json $IMAGE
+    # run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} diff --format json $IMAGE | python -m json.tool"
+    run ${KPOD_BINARY} $KPOD_OPTIONS diff --format json $IMAGE
     [ "$status" -eq 0 ]
     echo "$output"
     run ${KKPOD_BINARY} $KPOD_OPTIONS rmi $IMAGE