Merge pull request containers#7969 from ParkerVR/format-images/diff

--format updates for images/diff.go
andylibrian · Oct 8, 2020 · 2587cba · 2587cba
2 parents 2a63795 + c254a73
commit 2587cba
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/cmd/podman/images/diff.go b/cmd/podman/images/diff.go
@@ -1,6 +1,7 @@
 package images
 
 import (
+	"github.com/containers/podman/v2/cmd/podman/parse"
 	"github.com/containers/podman/v2/cmd/podman/registry"
 	"github.com/containers/podman/v2/cmd/podman/report"
 	"github.com/containers/podman/v2/pkg/domain/entities"
@@ -49,11 +50,11 @@ func diff(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	switch diffOpts.Format {
-	case "":
-		return report.ChangesToTable(results)
-	case "json":
+	switch {
+	case parse.MatchesJSONFormat(diffOpts.Format):
 		return report.ChangesToJSON(results)
+	case diffOpts.Format == "":
+		return report.ChangesToTable(results)
 	default:
 		return errors.New("only supported value for '--format' is 'json'")
 	}