compose top: reduce tabwriter padding

Signed-off-by: Dominik Menke <dom@digineo.de>
docker · Dec 17, 2024 · 489d8b8 · 489d8b8
1 parent 3e640be
commit 489d8b8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/cmd/compose/top.go b/cmd/compose/top.go
@@ -124,7 +124,7 @@ func topPrint(out io.Writer, headers topHeader, rows []topEntries) error {
 		return nil
 	}
 
-	w := tabwriter.NewWriter(out, 5, 1, 3, ' ', 0)
+	w := tabwriter.NewWriter(out, 4, 1, 2, ' ', 0)
 
 	// write headers in the order we've encountered them
 	h := make([]string, len(headers))

diff --git a/cmd/compose/top_test.go b/cmd/compose/top_test.go
@@ -74,8 +74,8 @@ var topTestCases = []struct {
 			},
 		},
 		output: trim(`
-			SERVICE   #    UID    PID   PPID   C    STIME   TTY   TIME       CMD
-			simple    1    root   1     1      0    12:00   ?     00:00:01   /entrypoint
+			SERVICE  #   UID   PID  PPID  C   STIME  TTY  TIME      CMD
+			simple   1   root  1    1     0   12:00  ?    00:00:01  /entrypoint
 		`),
 	},
 	{
@@ -107,8 +107,8 @@ var topTestCases = []struct {
 			},
 		},
 		output: trim(`
-			SERVICE   #    UID    PID   C    STIME   TTY   TIME       CMD
-			noppid    1    root   1     0    12:00   ?     00:00:02   /entrypoint
+			SERVICE  #   UID   PID  C   STIME  TTY  TIME      CMD
+			noppid   1   root  1    0   12:00  ?    00:00:02  /entrypoint
 		`),
 	},
 	{
@@ -144,8 +144,8 @@ var topTestCases = []struct {
 			},
 		},
 		output: trim(`
-			SERVICE     #    UID    GID   PID   PPID   C    STIME   TTY   TIME       CMD
-			extra-hdr   1    root   1     1     1      0    12:00   ?     00:00:03   /entrypoint
+			SERVICE    #   UID   GID  PID  PPID  C   STIME  TTY  TIME      CMD
+			extra-hdr  1   root  1    1    1     0   12:00  ?    00:00:03  /entrypoint
 		`),
 	},
 	{
@@ -194,9 +194,9 @@ var topTestCases = []struct {
 			},
 		},
 		output: trim(`
-			SERVICE    #    UID    PID   PPID   C    STIME   TTY   TIME       CMD
-			multiple   1    root   1     1      0    12:00   ?     00:00:04   /entrypoint
-			multiple   1    root   123   1      0    12:00   ?     00:00:42   sleep infinity
+			SERVICE   #   UID   PID  PPID  C   STIME  TTY  TIME      CMD
+			multiple  1   root  1    1     0   12:00  ?    00:00:04  /entrypoint
+			multiple  1   root  123  1     0   12:00  ?    00:00:42  sleep infinity
 		`),
 	},
 }
@@ -311,12 +311,12 @@ func TestRunTopCore(t *testing.T) {
 		err := topPrint(&buf, header, entries)
 		require.NoError(t, err)
 		assert.Equal(t, trim(`
-			SERVICE     #    UID    PID   PPID   C    STIME   TTY   TIME       GID   CMD
-			simple      1    root   1     1      0    12:00   ?     00:00:01   -     /entrypoint
-			noppid      1    root   1     -      0    12:00   ?     00:00:02   -     /entrypoint
-			extra-hdr   1    root   1     1      0    12:00   ?     00:00:03   1     /entrypoint
-			multiple    1    root   1     1      0    12:00   ?     00:00:04   -     /entrypoint
-			multiple    1    root   123   1      0    12:00   ?     00:00:42   -     sleep infinity
+			SERVICE    #   UID   PID  PPID  C   STIME  TTY  TIME      GID  CMD
+			simple     1   root  1    1     0   12:00  ?    00:00:01  -    /entrypoint
+			noppid     1   root  1    -     0   12:00  ?    00:00:02  -    /entrypoint
+			extra-hdr  1   root  1    1     0   12:00  ?    00:00:03  1    /entrypoint
+			multiple   1   root  1    1     0   12:00  ?    00:00:04  -    /entrypoint
+			multiple   1   root  123  1     0   12:00  ?    00:00:42  -    sleep infinity
 		`), buf.String())
 
 	})