diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-10-14 13:07:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-14 13:07:11 -0400 |
| commit | e3eb6fd0e4115162e10caf6ae2196fd8774657e0 (patch) | |
| tree | 9c75804b98eefa34a2cc924c8ccb2b8fc9c40d01 /cmd/podman/parse | |
| parent | d30b4b7aa5076c3192faada7d408f039a40414eb (diff) | |
| parent | eb4a746efcb9e76e29942461b97da797fd67109f (diff) | |
| download | podman-e3eb6fd0e4115162e10caf6ae2196fd8774657e0.tar.gz podman-e3eb6fd0e4115162e10caf6ae2196fd8774657e0.tar.bz2 podman-e3eb6fd0e4115162e10caf6ae2196fd8774657e0.zip | |
Merge pull request #7987 from jwhonce/jira/run-898-5
Restore --format table support
Diffstat (limited to 'cmd/podman/parse')
| -rw-r--r-- | cmd/podman/parse/json.go | 2 | ||||
| -rw-r--r-- | cmd/podman/parse/json_test.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cmd/podman/parse/json.go b/cmd/podman/parse/json.go index 40ac415db..d7486d0b1 100644 --- a/cmd/podman/parse/json.go +++ b/cmd/podman/parse/json.go @@ -2,7 +2,7 @@ package parse import "regexp" -var jsonFormatRegex = regexp.MustCompile(`^\s*(json|{{\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 { diff --git a/cmd/podman/parse/json_test.go b/cmd/podman/parse/json_test.go index ec3b5664b..b3b29c93c 100644 --- a/cmd/podman/parse/json_test.go +++ b/cmd/podman/parse/json_test.go @@ -27,7 +27,7 @@ func TestMatchesJSONFormat(t *testing.T) { {"json . }}", false}, {"{{.ID }} json .", false}, {"json .", false}, - {"{{json.}}", false}, + {"{{json.}}", true}, } for _, tt := range tests { |