Skip to content

Commit 7589722

Browse files
committed
cli/command/network: formatWrite: inline vars and use struct literals
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
1 parent 58bb45c commit 7589722

1 file changed

Lines changed: 21 additions & 17 deletions

File tree

cli/command/network/formatter.go

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -50,28 +50,32 @@ func FormatWrite(fmtCtx formatter.Context, networks []network.Summary) error {
5050

5151
// formatWrite writes the context.
5252
func formatWrite(fmtCtx formatter.Context, networks []network.Summary) error {
53-
render := func(format func(subContext formatter.SubContext) error) error {
53+
networkCtx := networkContext{
54+
HeaderContext: formatter.HeaderContext{
55+
Header: formatter.SubHeaderContext{
56+
"ID": networkIDHeader,
57+
"Name": formatter.NameHeader,
58+
"Driver": formatter.DriverHeader,
59+
"Scope": formatter.ScopeHeader,
60+
"IPv4": ipv4Header,
61+
"IPv6": ipv6Header,
62+
"Internal": internalHeader,
63+
"Labels": formatter.LabelsHeader,
64+
"CreatedAt": formatter.CreatedAtHeader,
65+
},
66+
},
67+
}
68+
return fmtCtx.Write(&networkCtx, func(format func(subContext formatter.SubContext) error) error {
5469
for _, nw := range networks {
55-
networkCtx := &networkContext{trunc: fmtCtx.Trunc, n: nw}
56-
if err := format(networkCtx); err != nil {
70+
if err := format(&networkContext{
71+
trunc: fmtCtx.Trunc,
72+
n: nw,
73+
}); err != nil {
5774
return err
5875
}
5976
}
6077
return nil
61-
}
62-
networkCtx := networkContext{}
63-
networkCtx.Header = formatter.SubHeaderContext{
64-
"ID": networkIDHeader,
65-
"Name": formatter.NameHeader,
66-
"Driver": formatter.DriverHeader,
67-
"Scope": formatter.ScopeHeader,
68-
"IPv4": ipv4Header,
69-
"IPv6": ipv6Header,
70-
"Internal": internalHeader,
71-
"Labels": formatter.LabelsHeader,
72-
"CreatedAt": formatter.CreatedAtHeader,
73-
}
74-
return fmtCtx.Write(&networkCtx, render)
78+
})
7579
}
7680

7781
type networkContext struct {

0 commit comments

Comments
 (0)