Skip to content

Commit 3d2bd97

Browse files
committed
cli/command/config: formatWrite: inline vars and use struct literals
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
1 parent 70033b7 commit 3d2bd97

1 file changed

Lines changed: 15 additions & 19 deletions

File tree

cli/command/config/formatter.go

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -59,29 +59,26 @@ func FormatWrite(fmtCtx formatter.Context, configs []swarm.Config) error {
5959

6060
// formatWrite writes the context
6161
func formatWrite(fmtCtx formatter.Context, configs []swarm.Config) error {
62-
render := func(format func(subContext formatter.SubContext) error) error {
62+
cCtx := &configContext{
63+
HeaderContext: formatter.HeaderContext{
64+
Header: formatter.SubHeaderContext{
65+
"ID": configIDHeader,
66+
"Name": formatter.NameHeader,
67+
"CreatedAt": configCreatedHeader,
68+
"UpdatedAt": configUpdatedHeader,
69+
"Labels": formatter.LabelsHeader,
70+
},
71+
},
72+
}
73+
return fmtCtx.Write(cCtx, func(format func(subContext formatter.SubContext) error) error {
6374
for _, config := range configs {
6475
configCtx := &configContext{c: config}
6576
if err := format(configCtx); err != nil {
6677
return err
6778
}
6879
}
6980
return nil
70-
}
71-
return fmtCtx.Write(newConfigContext(), render)
72-
}
73-
74-
func newConfigContext() *configContext {
75-
cCtx := &configContext{}
76-
77-
cCtx.Header = formatter.SubHeaderContext{
78-
"ID": configIDHeader,
79-
"Name": formatter.NameHeader,
80-
"CreatedAt": configCreatedHeader,
81-
"UpdatedAt": configUpdatedHeader,
82-
"Labels": formatter.LabelsHeader,
83-
}
84-
return cCtx
81+
})
8582
}
8683

8784
type configContext struct {
@@ -140,7 +137,7 @@ func inspectFormatWrite(fmtCtx formatter.Context, refs []string, getRef inspect.
140137
if fmtCtx.Format != configInspectPrettyTemplate {
141138
return inspect.Inspect(fmtCtx.Output, refs, string(fmtCtx.Format), getRef)
142139
}
143-
render := func(format func(subContext formatter.SubContext) error) error {
140+
return fmtCtx.Write(&configInspectContext{}, func(format func(subContext formatter.SubContext) error) error {
144141
for _, ref := range refs {
145142
configI, _, err := getRef(ref)
146143
if err != nil {
@@ -155,8 +152,7 @@ func inspectFormatWrite(fmtCtx formatter.Context, refs []string, getRef inspect.
155152
}
156153
}
157154
return nil
158-
}
159-
return fmtCtx.Write(&configInspectContext{}, render)
155+
})
160156
}
161157

162158
type configInspectContext struct {

0 commit comments

Comments
 (0)