toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6338 from thaJeztah/cleanup_formatters

Browse Source 
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
parent 2966159873 f72ec26693
commit 4d4533abaa
11 changed files with 187 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
cli/command/secret/formatter.go
View File

@ -44,7 +44,19 @@ func newFormat(source string, quiet bool) formatter.Format {
// formatWrite writes the context
func formatWrite(fmtCtx formatter.Context, secrets []swarm.Secret) error {
render := func(format func(subContext formatter.SubContext) error) error {
sCtx := &secretContext{
HeaderContext: formatter.HeaderContext{
Header: formatter.SubHeaderContext{
"ID": secretIDHeader,
"Name": formatter.NameHeader,
"Driver": formatter.DriverHeader,
"CreatedAt": secretCreatedHeader,
"UpdatedAt": secretUpdatedHeader,
"Labels": formatter.LabelsHeader,
},
},
}
return fmtCtx.Write(sCtx, func(format func(subContext formatter.SubContext) error) error {
for _, secret := range secrets {
secretCtx := &secretContext{s: secret}
if err := format(secretCtx); err != nil {
@ -52,22 +64,7 @@ func formatWrite(fmtCtx formatter.Context, secrets []swarm.Secret) error {
}
}
return nil
}
return fmtCtx.Write(newSecretContext(), render)
}
func newSecretContext() *secretContext {
sCtx := &secretContext{}
sCtx.Header = formatter.SubHeaderContext{
"ID": secretIDHeader,
"Name": formatter.NameHeader,
"Driver": formatter.DriverHeader,
"CreatedAt": secretCreatedHeader,
"UpdatedAt": secretUpdatedHeader,
"Labels": formatter.LabelsHeader,
}
return sCtx
})
}
type secretContext struct {
@ -126,7 +123,7 @@ func inspectFormatWrite(fmtCtx formatter.Context, refs []string, getRef inspect.
if fmtCtx.Format != secretInspectPrettyTemplate {
return inspect.Inspect(fmtCtx.Output, refs, string(fmtCtx.Format), getRef)
}
render := func(format func(subContext formatter.SubContext) error) error {
return fmtCtx.Write(&secretInspectContext{}, func(format func(subContext formatter.SubContext) error) error {
for _, ref := range refs {
secretI, _, err := getRef(ref)
if err != nil {
@ -141,8 +138,7 @@ func inspectFormatWrite(fmtCtx formatter.Context, refs []string, getRef inspect.
}
}
return nil
}
return fmtCtx.Write(&secretInspectContext{}, render)
})
}
type secretInspectContext struct {