Much simpler printer...

Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>

Author: silvin-lubecki

internal/inspect/inspect.go

@@ -1,7 +1,6 @@
 package inspect
 
 import (
-	"bytes"
 	"fmt"
 	"io"
 	"sort"
@@ -28,87 +27,70 @@ func Inspect(out io.Writer, app *types.App, argSettings map[string]string) error
 		return err
 	}
 
-	var sections []*bytes.Buffer
-
 	// Add Meta data
-	addMetadata(&sections, app)
+	printMetadata(out, app)
 
 	// Add Service section
-	addSection(&sections, len(config.Services), func(w io.Writer) {
+	printSection(out, len(config.Services), func(w io.Writer) {
 		for _, service := range config.Services {
 			fmt.Fprintf(w, "%s\t%d\t%s\t%s\n", service.Name, getReplicas(service), getPorts(service.Ports), service.Image)
 		}
 	}, "Service", "Replicas", "Ports", "Image")
 
 	// Add Network section
-	addSection(&sections, len(config.Networks), func(w io.Writer) {
+	printSection(out, len(config.Networks), func(w io.Writer) {
 		for name := range config.Networks {
 			fmt.Fprintln(w, name)
 		}
 	}, "Network")
 
 	// Add Volume section
-	addSection(&sections, len(config.Volumes), func(w io.Writer) {
+	printSection(out, len(config.Volumes), func(w io.Writer) {
 		for name := range config.Volumes {
 			fmt.Fprintln(w, name)
 		}
 	}, "Volume")
 
 	// Add Secret section
-	addSection(&sections, len(config.Secrets), func(w io.Writer) {
+	printSection(out, len(config.Secrets), func(w io.Writer) {
 		for name := range config.Secrets {
 			fmt.Fprintln(w, name)
 		}
 	}, "Secret")
 
 	// Add Setting section
-	addSection(&sections, len(settingsKeys), func(w io.Writer) {
+	printSection(out, len(settingsKeys), func(w io.Writer) {
 		for _, k := range settingsKeys {
 			fmt.Fprintf(w, "%s\t%s\n", k, allSettings[k])
 		}
 	}, "Setting", "Value")
 
-	// Print all sections
-	printSections(out, sections)
-
 	return nil
 }
 
-func addMetadata(sections *[]*bytes.Buffer, app *types.App) {
-	buf := &bytes.Buffer{}
+func printMetadata(out io.Writer, app *types.App) {
 	meta := app.Metadata()
-	fmt.Fprintln(buf, meta.Name, meta.Version)
+	fmt.Fprintln(out, meta.Name, meta.Version)
 	if maintainers := meta.Maintainers.String(); maintainers != "" {
-		fmt.Fprintln(buf)
-		fmt.Fprintln(buf, "Maintained by:", maintainers)
+		fmt.Fprintln(out)
+		fmt.Fprintln(out, "Maintained by:", maintainers)
 	}
 	if meta.Description != "" {
-		fmt.Fprintln(buf)
-		fmt.Fprintln(buf, meta.Description)
+		fmt.Fprintln(out)
+		fmt.Fprintln(out, meta.Description)
 	}
-	*sections = append(*sections, buf)
 }
 
-func addSection(sections *[]*bytes.Buffer, len int, printer func(io.Writer), headers ...string) {
+func printSection(out io.Writer, len int, printer func(io.Writer), headers ...string) {
 	if len == 0 {
 		return
 	}
-	buf := &bytes.Buffer{}
-	w := tabwriter.NewWriter(buf, 0, 0, 1, ' ', 0)
+	fmt.Fprintln(out)
+	w := tabwriter.NewWriter(out, 0, 0, 1, ' ', 0)
 	headers[0] = fmt.Sprintf("%s (%d)", headers[0], len)
 	printHeaders(w, headers...)
 	printer(w)
 	w.Flush()
-	*sections = append(*sections, buf)
-}
-
-// printSections makes sure there isn't any extra line at the end of the command output
-func printSections(out io.Writer, sections []*bytes.Buffer) {
-	ss := make([]string, len(sections))
-	for i, section := range sections {
-		ss[i] = section.String()
-	}
-	fmt.Fprint(out, strings.Join(ss, "\n"))
 }
 
 func printHeaders(w io.Writer, headers ...string) {