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>

5 files changed, 25 insertions, 24 deletions

diff --git a/cmd/podman/system/connection/list.go b/cmd/podman/system/connection/list.go
index ae88b0b30..b0b15b57d 100644
--- a/cmd/podman/system/connection/list.go
+++ b/cmd/podman/system/connection/list.go
@@ -2,11 +2,10 @@ package connection
 
 import (
 	"os"
-	"text/tabwriter"
-	"text/template"
 
 	"github.com/containers/common/pkg/completion"
 	"github.com/containers/common/pkg/config"
+	"github.com/containers/common/pkg/report"
 	"github.com/containers/podman/v3/cmd/podman/registry"
 	"github.com/containers/podman/v3/cmd/podman/system"
 	"github.com/containers/podman/v3/cmd/podman/validate"
@@ -73,13 +72,16 @@ func list(_ *cobra.Command, _ []string) error {
 	}
 
 	// TODO: Allow user to override format
-	format := "{{range . }}{{.Name}}\t{{.Identity}}\t{{.URI}}\n{{end}}"
-	tmpl, err := template.New("connection").Parse(format)
+	format := "{{range . }}{{.Name}}\t{{.Identity}}\t{{.URI}}\n{{end -}}"
+	tmpl, err := report.NewTemplate("list").Parse(format)
 	if err != nil {
 		return err
 	}
 
-	w := tabwriter.NewWriter(os.Stdout, 8, 2, 2, ' ', 0)
+	w, err := report.NewWriterDefault(os.Stdout)
+	if err != nil {
+		return err
+	}
 	defer w.Flush()
 
 	_ = tmpl.Execute(w, hdrs)
diff --git a/cmd/podman/system/df.go b/cmd/podman/system/df.go
index de56c57d0..dfde3bc07 100644
--- a/cmd/podman/system/df.go
+++ b/cmd/podman/system/df.go
@@ -4,13 +4,10 @@ import (
 	"fmt"
 	"os"
 	"strings"
-	"text/tabwriter"
-	"text/template"
 	"time"
 
 	"github.com/containers/common/pkg/completion"
 	"github.com/containers/common/pkg/report"
-	"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"
@@ -57,7 +54,10 @@ func df(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	w := tabwriter.NewWriter(os.Stdout, 8, 2, 2, ' ', 0)
+	w, err := report.NewWriterDefault(os.Stdout)
+	if err != nil {
+		return err
+	}
 
 	if dfOptions.Verbose {
 		return printVerbose(w, cmd, reports)
@@ -65,7 +65,7 @@ func df(cmd *cobra.Command, args []string) error {
 	return printSummary(w, cmd, reports)
 }
 
-func printSummary(w *tabwriter.Writer, cmd *cobra.Command, reports *entities.SystemDfReport) error {
+func printSummary(w *report.Writer, cmd *cobra.Command, reports *entities.SystemDfReport) error {
 	var (
 		dfSummaries       []*dfSummary
 		active            int
@@ -143,7 +143,7 @@ func printSummary(w *tabwriter.Writer, cmd *cobra.Command, reports *entities.Sys
 	return writeTemplate(w, cmd, hdrs, row, dfSummaries)
 }
 
-func printVerbose(w *tabwriter.Writer, cmd *cobra.Command, reports *entities.SystemDfReport) error {
+func printVerbose(w *report.Writer, cmd *cobra.Command, reports *entities.SystemDfReport) error {
 	defer w.Flush()
 
 	fmt.Fprint(w, "Images space usage:\n\n")
@@ -191,11 +191,11 @@ func printVerbose(w *tabwriter.Writer, cmd *cobra.Command, reports *entities.Sys
 	return writeTemplate(w, cmd, hdrs, volumeRow, dfVolumes)
 }
 
-func writeTemplate(w *tabwriter.Writer, cmd *cobra.Command, hdrs []map[string]string, format string, output interface{}) error {
+func writeTemplate(w *report.Writer, cmd *cobra.Command, hdrs []map[string]string, format string, output interface{}) error {
 	defer w.Flush()
 
-	format = parse.EnforceRange(format)
-	tmpl, err := template.New("df").Parse(format)
+	format = report.EnforceRange(format)
+	tmpl, err := report.NewTemplate("df").Parse(format)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/podman/system/events.go b/cmd/podman/system/events.go
index 4aa413ec6..677504cfc 100644
--- a/cmd/podman/system/events.go
+++ b/cmd/podman/system/events.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"os"
-	"text/template"
 
 	"github.com/containers/common/pkg/completion"
 	"github.com/containers/common/pkg/report"
@@ -75,7 +74,7 @@ func eventsCmd(cmd *cobra.Command, _ []string) error {
 	errChannel := make(chan error)
 
 	var (
-		tmpl   *template.Template
+		tmpl   *report.Template
 		doJSON bool
 	)
 
@@ -83,7 +82,7 @@ func eventsCmd(cmd *cobra.Command, _ []string) error {
 		doJSON = report.IsJSON(eventFormat)
 		if !doJSON {
 			var err error
-			tmpl, err = template.New("events").Parse(eventFormat)
+			tmpl, err = report.NewTemplate("events").Parse(eventFormat)
 			if err != nil {
 				return err
 			}
diff --git a/cmd/podman/system/info.go b/cmd/podman/system/info.go
index 1dc90f79a..c3f543e6a 100644
--- a/cmd/podman/system/info.go
+++ b/cmd/podman/system/info.go
@@ -3,7 +3,6 @@ package system
 import (
 	"fmt"
 	"os"
-	"text/template"
 
 	"github.com/containers/common/pkg/completion"
 	"github.com/containers/common/pkg/report"
@@ -85,7 +84,7 @@ func info(cmd *cobra.Command, args []string) error {
 		}
 		fmt.Println(string(b))
 	case cmd.Flags().Changed("format"):
-		tmpl, err := template.New("info").Parse(inFormat)
+		tmpl, err := report.NewTemplate("info").Parse(inFormat)
 		if err != nil {
 			return err
 		}
diff --git a/cmd/podman/system/version.go b/cmd/podman/system/version.go
index 5575fc87d..4502b156c 100644
--- a/cmd/podman/system/version.go
+++ b/cmd/podman/system/version.go
@@ -5,8 +5,6 @@ import (
 	"io"
 	"os"
 	"strings"
-	"text/tabwriter"
-	"text/template"
 
 	"github.com/containers/common/pkg/completion"
 	"github.com/containers/common/pkg/report"
@@ -55,19 +53,22 @@ func version(cmd *cobra.Command, args []string) error {
 		return nil
 	}
 
-	w := tabwriter.NewWriter(os.Stdout, 0, 0, 2, ' ', 0)
+	w, err := report.NewWriterDefault(os.Stdout)
+	if err != nil {
+		return err
+	}
 	defer w.Flush()
 
 	if cmd.Flag("format").Changed {
 		row := report.NormalizeFormat(versionFormat)
-		tmpl, err := template.New("version 2.0.0").Parse(row)
+		tmpl, err := report.NewTemplate("version 2.0.0").Parse(row)
 		if err != nil {
 			return err
 		}
 		if err := tmpl.Execute(w, versions); err != nil {
 			// On Failure, assume user is using older version of podman version --format and check client
 			row = strings.Replace(row, ".Server.", ".", 1)
-			tmpl, err := template.New("version 1.0.0").Parse(row)
+			tmpl, err := report.NewTemplate("version 1.0.0").Parse(row)
 			if err != nil {
 				return err
 			}