Merge pull request #6338 from thaJeztah/cleanup_formatters

cli/command: inline vars and use struct literals in formatting functions
This commit is contained in:
Sebastiaan van Stijn
2025-08-22 12:25:14 +02:00
committed by GitHub
11 changed files with 187 additions and 164 deletions

View File

@ -39,24 +39,28 @@ func newFormat(source string, quiet bool) formatter.Format {
// formatWrite writes the context
func formatWrite(fmtCtx formatter.Context, plugins []*plugin.Plugin) error {
render := func(format func(subContext formatter.SubContext) error) error {
pluginCtx := &pluginContext{
HeaderContext: formatter.HeaderContext{
Header: formatter.SubHeaderContext{
"ID": pluginIDHeader,
"Name": formatter.NameHeader,
"Description": formatter.DescriptionHeader,
"Enabled": enabledHeader,
"PluginReference": formatter.ImageHeader,
},
},
}
return fmtCtx.Write(pluginCtx, func(format func(subContext formatter.SubContext) error) error {
for _, p := range plugins {
pluginCtx := &pluginContext{trunc: fmtCtx.Trunc, p: *p}
if err := format(pluginCtx); err != nil {
if err := format(&pluginContext{
trunc: fmtCtx.Trunc,
p: *p,
}); err != nil {
return err
}
}
return nil
}
pluginCtx := pluginContext{}
pluginCtx.Header = formatter.SubHeaderContext{
"ID": pluginIDHeader,
"Name": formatter.NameHeader,
"Description": formatter.DescriptionHeader,
"Enabled": enabledHeader,
"PluginReference": formatter.ImageHeader,
}
return fmtCtx.Write(&pluginCtx, render)
})
}
type pluginContext struct {