From bd9987239dae148bfd3eea8540d21ae7715faff7 Mon Sep 17 00:00:00 2001
From: Jhon Honce <jhonce@redhat.com>
Date: Tue, 15 Jun 2021 10:08:34 -0700
Subject: 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>
---
 cmd/podman/parse/template.go      | 22 ----------------------
 cmd/podman/parse/template_test.go | 30 ------------------------------
 2 files changed, 52 deletions(-)
 delete mode 100644 cmd/podman/parse/template.go
 delete mode 100644 cmd/podman/parse/template_test.go

(limited to 'cmd/podman/parse')

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))
-		})
-	}
-}
-- 
cgit v1.2.3-54-g00ecf