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>

2 files changed, 15 insertions, 13 deletions

diff --git a/cmd/podman/secrets/inspect.go b/cmd/podman/secrets/inspect.go
index bcb1adb5e..7d44dc075 100644
--- a/cmd/podman/secrets/inspect.go
+++ b/cmd/podman/secrets/inspect.go
@@ -4,13 +4,10 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"html/template"
 	"os"
-	"text/tabwriter"
 
 	"github.com/containers/common/pkg/report"
 	"github.com/containers/podman/v3/cmd/podman/common"
-	"github.com/containers/podman/v3/cmd/podman/parse"
 	"github.com/containers/podman/v3/cmd/podman/registry"
 	"github.com/containers/podman/v3/pkg/domain/entities"
 	"github.com/pkg/errors"
@@ -53,13 +50,17 @@ func inspect(cmd *cobra.Command, args []string) error {
 
 	if cmd.Flags().Changed("format") {
 		row := report.NormalizeFormat(format)
-		formatted := parse.EnforceRange(row)
+		formatted := report.EnforceRange(row)
 
-		tmpl, err := template.New("inspect secret").Parse(formatted)
+		tmpl, err := report.NewTemplate("inspect").Parse(formatted)
+		if err != nil {
+			return err
+		}
+
+		w, err := report.NewWriterDefault(os.Stdout)
 		if err != nil {
 			return err
 		}
-		w := tabwriter.NewWriter(os.Stdout, 12, 2, 2, ' ', 0)
 		defer w.Flush()
 		tmpl.Execute(w, inspected)
 	} else {
diff --git a/cmd/podman/secrets/list.go b/cmd/podman/secrets/list.go
index ba7065d61..29d364a1b 100644
--- a/cmd/podman/secrets/list.go
+++ b/cmd/podman/secrets/list.go
@@ -2,15 +2,12 @@ package secrets
 
 import (
 	"context"
-	"html/template"
 	"os"
-	"text/tabwriter"
 	"time"
 
 	"github.com/containers/common/pkg/completion"
 	"github.com/containers/common/pkg/report"
 	"github.com/containers/podman/v3/cmd/podman/common"
-	"github.com/containers/podman/v3/cmd/podman/parse"
 	"github.com/containers/podman/v3/cmd/podman/registry"
 	"github.com/containers/podman/v3/cmd/podman/validate"
 	"github.com/containers/podman/v3/pkg/domain/entities"
@@ -76,16 +73,20 @@ func outputTemplate(cmd *cobra.Command, responses []*entities.SecretListReport)
 	})
 
 	row := report.NormalizeFormat(listFlag.format)
-	format := parse.EnforceRange(row)
+	format := report.EnforceRange(row)
 
-	tmpl, err := template.New("list secret").Parse(format)
+	tmpl, err := report.NewTemplate("list").Parse(format)
+	if err != nil {
+		return err
+	}
+
+	w, err := report.NewWriterDefault(os.Stdout)
 	if err != nil {
 		return err
 	}
-	w := tabwriter.NewWriter(os.Stdout, 12, 2, 2, ' ', 0)
 	defer w.Flush()
 
-	if cmd.Flags().Changed("format") && !parse.HasTable(listFlag.format) {
+	if cmd.Flags().Changed("format") && !report.HasTable(listFlag.format) {
 		listFlag.noHeading = true
 	}