opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-22 18:08:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

podman secret ls: use report.Formatter over Template

Browse Source 
Currently the podman command --format output code uses a mix of
report.Formatter and report.Template.

I patched report.Formatter to correctly handle newlines[1]. Since we
cannot fix this with report.Template we have to migrate all users to
report.Formatter. This ensures consistent behavior for all commands.

This change does not change the output, we can add a new test for the
newline bug when the common PR is vendored in.

[1] https://github.com/containers/common/pull/1146

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger
2022-09-07 14:33:02 +02:00
parent 1463898b07
commit f5e13ded93
1 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
cmd/podman/secrets/list.go
View File

@ -46,7 +46,7 @@ func init() {
flags := lsCmd.Flags() flags := lsCmd.Flags()
formatFlagName := "format" formatFlagName := "format"
flags.StringVar(&listFlag.format, formatFlagName, "{{.ID}}\t{{.Name}}\t{{.Driver}}\t{{.CreatedAt}}\t{{.UpdatedAt}}\t\n", "Format volume output using Go template") flags.StringVar(&listFlag.format, formatFlagName, "{{range .}}{{.ID}}\t{{.Name}}\t{{.Driver}}\t{{.CreatedAt}}\t{{.UpdatedAt}}\n{{end -}}", "Format volume output using Go template")
_ = lsCmd.RegisterFlagCompletionFunc(formatFlagName, common.AutocompleteFormat(&entities.SecretInfoReport{})) _ = lsCmd.RegisterFlagCompletionFunc(formatFlagName, common.AutocompleteFormat(&entities.SecretInfoReport{}))
filterFlagName := "filter" filterFlagName := "filter"
@ -105,31 +105,25 @@ func outputTemplate(cmd *cobra.Command, responses []*entities.SecretListReport)
"UpdatedAt": "UPDATED", "UpdatedAt": "UPDATED",
}) })
row := cmd.Flag("format").Value.String() rpt := report.New(os.Stdout, cmd.Name())
if cmd.Flags().Changed("format") { defer rpt.Flush()
row = report.NormalizeFormat(row)
}
format := report.EnforceRange(row)
tmpl, err := report.NewTemplate("list").Parse(format) var err error
switch {
case cmd.Flag("format").Changed:
rpt, err = rpt.Parse(report.OriginUser, listFlag.format)
default:
rpt, err = rpt.Parse(report.OriginPodman, listFlag.format)
}
if err != nil { if err != nil {
return err return err
} }
w, err := report.NewWriterDefault(os.Stdout) noHeading, _ := cmd.Flags().GetBool("noheading")
if err != nil { if rpt.RenderHeaders && !noHeading {
return err if err := rpt.Execute(headers); err != nil {
}
defer w.Flush()
if cmd.Flags().Changed("format") && !report.HasTable(listFlag.format) {
listFlag.noHeading = true
}
if !listFlag.noHeading {
if err := tmpl.Execute(w, headers); err != nil {
return fmt.Errorf("failed to write report column headers: %w", err) return fmt.Errorf("failed to write report column headers: %w", err)
} }
} }
return tmpl.Execute(w, responses) return rpt.Execute(responses)
} }