diff options
author | Jhon Honce <jhonce@redhat.com> | 2022-05-03 10:51:58 -0700 |
---|---|---|
committer | openshift-cherrypick-robot <> | 2022-05-04 13:36:40 +0000 |
commit | bea8301a8688073a03651ea23ff19bb760ec9e34 (patch) | |
tree | b8d714804faa0a6b6f826908170e103470a11993 /cmd | |
parent | 3210a3f4257d19744abd4ae2302018b16edb2507 (diff) | |
download | podman-bea8301a8688073a03651ea23ff19bb760ec9e34.tar.gz podman-bea8301a8688073a03651ea23ff19bb760ec9e34.tar.bz2 podman-bea8301a8688073a03651ea23ff19bb760ec9e34.zip |
Implement --format for machine inspect
* Fix issue of nil pointer derefence
Signed-off-by: Jhon Honce <jhonce@redhat.com>
Diffstat (limited to 'cmd')
-rw-r--r-- | cmd/podman/machine/inspect.go | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/cmd/podman/machine/inspect.go b/cmd/podman/machine/inspect.go index 21e5074b7..a1f467bbb 100644 --- a/cmd/podman/machine/inspect.go +++ b/cmd/podman/machine/inspect.go @@ -7,10 +7,10 @@ import ( "encoding/json" "os" + "github.com/containers/common/pkg/report" "github.com/containers/podman/v4/cmd/podman/common" "github.com/containers/podman/v4/cmd/podman/registry" "github.com/containers/podman/v4/cmd/podman/utils" - "github.com/containers/podman/v4/libpod/define" "github.com/containers/podman/v4/pkg/machine" "github.com/sirupsen/logrus" "github.com/spf13/cobra" @@ -66,12 +66,29 @@ func inspect(cmd *cobra.Command, args []string) error { } vms = append(vms, *ii) } - if len(inspectFlag.format) > 0 { - // need jhonce to work his template magic - return define.ErrNotImplemented - } - if err := printJSON(vms); err != nil { - logrus.Error(err) + switch { + case cmd.Flag("format").Changed: + row := report.NormalizeFormat(inspectFlag.format) + row = report.EnforceRange(row) + + tmpl, err := report.NewTemplate("Machine inspect").Parse(row) + if err != nil { + return err + } + + w, err := report.NewWriterDefault(os.Stdout) + if err != nil { + return err + } + + if err := tmpl.Execute(w, vms); err != nil { + logrus.Error(err) + } + w.Flush() + default: + if err := printJSON(vms); err != nil { + logrus.Error(err) + } } return errs.PrintErrors() } |