aboutsummaryrefslogtreecommitdiff
path: root/cmd/podman/pod_ps.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-01-13 21:03:21 +0100
committerGitHub <noreply@github.com>2020-01-13 21:03:21 +0100
commit796ae87b1a3444557644944ddeb7cb37e303ef83 (patch)
tree192bd260c0b35519fe45ecbc91d7212251d82495 /cmd/podman/pod_ps.go
parentc1d93666d4b175be29a0ba229ee0b94d50765888 (diff)
parent768c476ae3c1dbf37204f5769b43746358af899d (diff)
downloadpodman-796ae87b1a3444557644944ddeb7cb37e303ef83.tar.gz
podman-796ae87b1a3444557644944ddeb7cb37e303ef83.tar.bz2
podman-796ae87b1a3444557644944ddeb7cb37e303ef83.zip
Merge pull request #4850 from vrothberg/fix-linting
Fix linting
Diffstat (limited to 'cmd/podman/pod_ps.go')
-rw-r--r--cmd/podman/pod_ps.go11
1 files changed, 6 insertions, 5 deletions
diff --git a/cmd/podman/pod_ps.go b/cmd/podman/pod_ps.go
index bda447c57..d7731e983 100644
--- a/cmd/podman/pod_ps.go
+++ b/cmd/podman/pod_ps.go
@@ -320,13 +320,14 @@ func generatePodFilterFuncs(filter, filterValue string) (func(pod *adapter.Pod)
// generate the template based on conditions given
func genPodPsFormat(c *cliconfig.PodPsValues) string {
format := ""
- if c.Format != "" {
+ switch {
+ case c.Format != "":
// "\t" from the command line is not being recognized as a tab
// replacing the string "\t" to a tab character if the user passes in "\t"
format = strings.Replace(c.Format, `\t`, "\t", -1)
- } else if c.Quiet {
+ case c.Quiet:
format = formats.IDString
- } else {
+ default:
format = "table {{.ID}}\t{{.Name}}\t{{.Status}}\t{{.Created}}"
if c.Bool("namespace") {
format += "\t{{.Cgroup}}\t{{.Namespaces}}"
@@ -341,14 +342,14 @@ func genPodPsFormat(c *cliconfig.PodPsValues) string {
return format
}
-func podPsToGeneric(templParams []podPsTemplateParams, JSONParams []podPsJSONParams) (genericParams []interface{}) {
+func podPsToGeneric(templParams []podPsTemplateParams, jsonParams []podPsJSONParams) (genericParams []interface{}) {
if len(templParams) > 0 {
for _, v := range templParams {
genericParams = append(genericParams, interface{}(v))
}
return
}
- for _, v := range JSONParams {
+ for _, v := range jsonParams {
genericParams = append(genericParams, interface{}(v))
}
return