summaryrefslogtreecommitdiff
path: root/cmd/podman/parse
diff options
context:
space:
mode:
authorJhon Honce <jhonce@redhat.com>2021-06-15 10:08:34 -0700
committerMatthew Heon <mheon@redhat.com>2021-06-25 09:33:06 -0400
commit5dabff27db83a0bdbea0e736050f5e3cb2c1d95e (patch)
tree401d590ad7d739a543c99486ddbe6105597cf272 /cmd/podman/parse
parent647c2024e24abdab28480ec2f99bddb4a0a5a6d0 (diff)
downloadpodman-5dabff27db83a0bdbea0e736050f5e3cb2c1d95e.tar.gz
podman-5dabff27db83a0bdbea0e736050f5e3cb2c1d95e.tar.bz2
podman-5dabff27db83a0bdbea0e736050f5e3cb2c1d95e.zip
Scrub podman commands to use report package
Refactor podman commands that have drifted from using c/common report pkg. Report pkg is needed to implement go template functions. Removed obsolete code from podman which exists in c/common. Latest template library added default newlines and method to remove them. Incorporated needed changes in c/common PR below. Depends on https://github.com/containers/common/pull/624 Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1855983 Signed-off-by: Jhon Honce <jhonce@redhat.com> <MH: Fixed cherry-pick conflicts> Signed-off-by: Matthew Heon <mheon@redhat.com>
Diffstat (limited to 'cmd/podman/parse')
-rw-r--r--cmd/podman/parse/template.go22
-rw-r--r--cmd/podman/parse/template_test.go30
2 files changed, 0 insertions, 52 deletions
diff --git a/cmd/podman/parse/template.go b/cmd/podman/parse/template.go
deleted file mode 100644
index 0b80f1b3a..000000000
--- a/cmd/podman/parse/template.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package parse
-
-import (
- "regexp"
- "strings"
-)
-
-var rangeRegex = regexp.MustCompile(`{{\s*range\s*\.\s*}}.*{{\s*end\s*}}`)
-
-// TODO move to github.com/containers/common/pkg/report
-// EnforceRange ensures that the format string contains a range
-func EnforceRange(format string) string {
- if !rangeRegex.MatchString(format) {
- return "{{range .}}" + format + "{{end}}"
- }
- return format
-}
-
-// EnforceRange ensures that the format string contains a range
-func HasTable(format string) bool {
- return strings.HasPrefix(format, "table ")
-}
diff --git a/cmd/podman/parse/template_test.go b/cmd/podman/parse/template_test.go
deleted file mode 100644
index 7880d9bec..000000000
--- a/cmd/podman/parse/template_test.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package parse
-
-import (
- "testing"
-
- "github.com/stretchr/testify/assert"
-)
-
-func TestEnforceRange(t *testing.T) {
- tests := []struct {
- input string
- expected string
- }{
- {"{{range .}}{{.ID}}{{end}}", "{{range .}}{{.ID}}{{end}}"},
- {"{{.ID}}", "{{range .}}{{.ID}}{{end}}"},
- {"{{ range . }}{{ .ID }}{{ end }}", "{{ range . }}{{ .ID }}{{ end }}"},
- // EnforceRange does not verify syntax or semantics, that will happen later
- {"{{range .}}{{.ID}}", "{{range .}}{{range .}}{{.ID}}{{end}}"},
- {".ID", "{{range .}}.ID{{end}}"},
- }
-
- for _, tc := range tests {
- tc := tc
- label := "TestEnforceRange_" + tc.input
- t.Run(label, func(t *testing.T) {
- t.Parallel()
- assert.Equal(t, tc.expected, EnforceRange(tc.input))
- })
- }
-}