Merge pull request #774 from zappy-shu/APP-327-adjust-output-column-s…

…pacing Standardize column spacing in output
docker · Dec 2, 2019 · d119541 · d119541
2 parents e244826 + 0c20457
commit d119541
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 28 deletions.
diff --git a/cmd/cnab-run/status.go b/cmd/cnab-run/status.go
@@ -179,7 +179,7 @@ func runningServices(cli command.Cli, instanceName string) ([]swarmtypes.Service
 }
 
 func printServices(out io.Writer, services []swarmtypes.Service) error {
-	w := tabwriter.NewWriter(out, 0, 0, 1, ' ', 0)
+	w := tabwriter.NewWriter(out, 20, 2, 3, ' ', 0)
 	printHeaders(w)
 
 	for _, service := range services {

diff --git a/internal/commands/list.go b/internal/commands/list.go
@@ -106,7 +106,7 @@ func runList(dockerCli command.Cli, opts listOptions, installerContext *cliopts.
 		return tmpl.Execute(dockerCli.Out(), installations)
 	}
 
-	w := tabwriter.NewWriter(dockerCli.Out(), 0, 0, 1, ' ', 0)
+	w := tabwriter.NewWriter(dockerCli.Out(), 20, 1, 3, ' ', 0)
 	printHeaders(w)
 
 	for _, installation := range installations {

diff --git a/internal/inspect/inspect.go b/internal/inspect/inspect.go
@@ -280,7 +280,7 @@ func printSection(out io.Writer, len int, printer func(io.Writer), headers ...st
 		return
 	}
 	fmt.Fprintln(out)
-	w := tabwriter.NewWriter(out, 0, 0, 1, ' ', 0)
+	w := tabwriter.NewWriter(out, 20, 1, 3, ' ', 0)
 	fmt.Fprintln(w, strings.Join(headers, "\t"))
 	printer(w)
 	w.Flush()

diff --git a/internal/inspect/testdata/inspect-bundle-pretty.golden b/internal/inspect/testdata/inspect-bundle-pretty.golden
@@ -8,17 +8,17 @@ maintainers:
   email: dev2@example.com
 
 
-SERVICE     IMAGE
-app-watcher watcher
-debug       busybox:latest
-front       nginx
-monitor     busybox:latest
+SERVICE             IMAGE
+app-watcher         watcher
+debug               busybox:latest
+front               nginx
+monitor             busybox:latest
 
-PARAMETER                           VALUE
-com.docker.app.args                 
-com.docker.app.inspect-format       json
-com.docker.app.kubernetes-namespace 
-com.docker.app.orchestrator         
-com.docker.app.render-format        yaml
-com.docker.app.share-registry-creds false
-watcher.cmd                         foo
+PARAMETER                             VALUE
+com.docker.app.args                   
+com.docker.app.inspect-format         json
+com.docker.app.kubernetes-namespace   
+com.docker.app.orchestrator           
+com.docker.app.render-format          yaml
+com.docker.app.share-registry-creds   false
+watcher.cmd                           foo
diff --git a/internal/inspect/testdata/inspect-full.golden b/internal/inspect/testdata/inspect-full.golden
@@ -6,9 +6,9 @@ maintainers:
   email: dev@example.com
 
 
-SERVICE REPLICAS PORTS     IMAGE
-web1    2        8080-8100 nginx:latest
-web2    2        9080-9100 nginx:latest
+SERVICE             REPLICAS            PORTS               IMAGE
+web1                2                   8080-8100           nginx:latest
+web2                2                   9080-9100           nginx:latest
 
 NETWORK
 my-network1
@@ -22,9 +22,9 @@ SECRET
 my-secret1
 my-secret2
 
-PARAMETER VALUE
-port      8080
-text      hello
+PARAMETER           VALUE
+port                8080
+text                hello
 
-ATTACHMENT SIZE
-config.cfg 9B
+ATTACHMENT          SIZE
+config.cfg          9B
diff --git a/internal/inspect/testdata/inspect-overridden.golden b/internal/inspect/testdata/inspect-overridden.golden
@@ -4,8 +4,8 @@ description: ""
 maintainers: []
 
 
-SERVICE REPLICAS PORTS IMAGE
-web     1        80    nginx
+SERVICE             REPLICAS            PORTS               IMAGE
+web                 1                   80                  nginx
 
-PARAMETER VALUE
-web.port  80
+PARAMETER           VALUE
+web.port            80