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

cli/command/trust: inline vars and use struct literals

Browse Source 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2025-08-21 15:24:18 +02:00
parent 6de2cdd1af
commit f72ec26693
1 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
cli/command/trust/formatter.go
View File

@ -73,21 +73,23 @@ func TagWrite(fmtCtx formatter.Context, signedTagInfoList []signedTagInfo) error
// tagWrite writes the context
func tagWrite(fmtCtx formatter.Context, signedTagInfoList []signedTagInfo) error {
render := func(format func(subContext formatter.SubContext) error) error {
trustTagCtx := &trustTagContext{
HeaderContext: formatter.HeaderContext{
Header: formatter.SubHeaderContext{
"SignedTag": signedTagNameHeader,
"Digest": trustedDigestHeader,
"Signers": signersHeader,
},
},
}
return fmtCtx.Write(trustTagCtx, func(format func(subContext formatter.SubContext) error) error {
for _, signedTag := range signedTagInfoList {
if err := format(&trustTagContext{s: signedTag}); err != nil {
return err
}
}
return nil
}
trustTagCtx := trustTagContext{}
trustTagCtx.Header = formatter.SubHeaderContext{
"SignedTag": signedTagNameHeader,
"Digest": trustedDigestHeader,
"Signers": signersHeader,
}
return fmtCtx.Write(&trustTagCtx, render)
})
}
type trustTagContext struct {
@ -120,23 +122,25 @@ func SignerInfoWrite(fmtCtx formatter.Context, signerInfoList []signerInfo) erro
// signerInfoWrite writes the context.
func signerInfoWrite(fmtCtx formatter.Context, signerInfoList []signerInfo) error {
render := func(format func(subContext formatter.SubContext) error) error {
for _, signerInfo := range signerInfoList {
signerInfoCtx := &signerInfoContext{
HeaderContext: formatter.HeaderContext{
Header: formatter.SubHeaderContext{
"Signer": signerNameHeader,
"Keys": keysHeader,
},
},
}
return fmtCtx.Write(signerInfoCtx, func(format func(subContext formatter.SubContext) error) error {
for _, info := range signerInfoList {
if err := format(&signerInfoContext{
trunc: fmtCtx.Trunc,
s: signerInfo,
s: info,
}); err != nil {
return err
}
}
return nil
}
signerInfoCtx := signerInfoContext{}
signerInfoCtx.Header = formatter.SubHeaderContext{
"Signer": signerNameHeader,
"Keys": keysHeader,
}
return fmtCtx.Write(&signerInfoCtx, render)
})
}
type signerInfoContext struct {