opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-24 11:28:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add default template functions

Browse Source 
For commands that use the golang template library directly add the
compatible template functions

[NO TESTS NEEDED]

Fixes #8773

Signed-off-by: Jhon Honce <jhonce@redhat.com>
This commit is contained in:
Jhon Honce
2021-02-09 08:46:17 -07:00
parent 1db9053add
commit 3ed56079f9
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/podman/containers/ps.go
View File

@ -232,7 +232,9 @@ func ps(cmd *cobra.Command, _ []string) error {
ns := strings.NewReplacer(".Namespaces.", ".") ns := strings.NewReplacer(".Namespaces.", ".")
format = ns.Replace(format) format = ns.Replace(format)
tmpl, err := template.New("listContainers").Parse(format) tmpl, err := template.New("listContainers").
Funcs(template.FuncMap(report.DefaultFuncs)).
Parse(format)
if err != nil { if err != nil {
return err return err
} }

12
cmd/podman/inspect/inspect.go
View File

@ -1,7 +1,6 @@
package inspect package inspect
import ( import (
"bytes"
"context" "context"
"encoding/json" // due to a bug in json-iterator it cannot be used here "encoding/json" // due to a bug in json-iterator it cannot be used here
"fmt" "fmt"
@ -246,15 +245,8 @@ func printJSON(data []interface{}) error {
} }
func printTmpl(typ, row string, data []interface{}) error { func printTmpl(typ, row string, data []interface{}) error {
t, err := template.New(typ + " inspect").Funcs(map[string]interface{}{ // We cannot use c/common/reports here, too many levels of interface{}
"json": func(v interface{}) string { t, err := template.New(typ + " inspect").Funcs(template.FuncMap(report.DefaultFuncs)).Parse(row)
b := &bytes.Buffer{}
e := registry.JSONLibrary().NewEncoder(b)
e.SetEscapeHTML(false)
_ = e.Encode(v)
return strings.TrimSpace(b.String())
},
}).Parse(row)
if err != nil { if err != nil {
return err return err
} }