diff options
| author | Jhon Honce <jhonce@redhat.com> | 2020-08-03 09:18:49 -0700 |
|---|---|---|
| committer | Jhon Honce <jhonce@redhat.com> | 2020-10-02 06:58:02 -0700 |
| commit | c0757374bf187edcf4ae8c4811e162e27794ebf8 (patch) | |
| tree | 6786a36f86d1a00dc28983ae8580d014ecfc6b4d /cmd/podman/parse/json.go | |
| parent | 14fd7b4d6ac18aaa5705990f3dd0ed13477258ad (diff) | |
| download | podman-c0757374bf187edcf4ae8c4811e162e27794ebf8.tar.gz podman-c0757374bf187edcf4ae8c4811e162e27794ebf8.tar.bz2 podman-c0757374bf187edcf4ae8c4811e162e27794ebf8.zip | |
Restore "table" --format from V1
* --format "table {{.field..." will print fields out in a table with
headings. Table keyword is removed, spaces between fields are
converted to tabs
* Update parse.MatchesJSONFormat()'s regex to be more inclusive
* Add report.Headers(), obtain all the field names to be used as
column headers, a map of field name to column headers may be provided
to override the field names
* Update several commands to use new functions
Signed-off-by: Jhon Honce <jhonce@redhat.com>
Diffstat (limited to 'cmd/podman/parse/json.go')
| -rw-r--r-- | cmd/podman/parse/json.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmd/podman/parse/json.go b/cmd/podman/parse/json.go index 95a6633b8..40ac415db 100644 --- a/cmd/podman/parse/json.go +++ b/cmd/podman/parse/json.go @@ -2,8 +2,9 @@ package parse import "regexp" -var jsonFormatRegex = regexp.MustCompile(`^(\s*json\s*|\s*{{\s*json\s*\.\s*}}\s*)$`) +var jsonFormatRegex = regexp.MustCompile(`^\s*(json|{{\s*json\s*( \.)?\s*}})\s*$`) +// MatchesJSONFormat test CLI --format string to be a JSON request func MatchesJSONFormat(s string) bool { return jsonFormatRegex.Match([]byte(s)) } |