summaryrefslogtreecommitdiff
path: root/libpod
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-06-10 08:42:16 -0400
committerGitHub <noreply@github.com>2020-06-10 08:42:16 -0400
commit63468464e8365adefebee7127be888ea649edd8e (patch)
tree1b4d8c8a9af7736f5f4cc813d7897341a3c2b27c /libpod
parent9967f28339dc43c97966bc07345af53a374faf67 (diff)
parent87718c4e676dc503f67ca6f283c4242cf19f9eb7 (diff)
downloadpodman-63468464e8365adefebee7127be888ea649edd8e.tar.gz
podman-63468464e8365adefebee7127be888ea649edd8e.tar.bz2
podman-63468464e8365adefebee7127be888ea649edd8e.zip
Merge pull request #6546 from rhatdan/lint
Turn on golint
Diffstat (limited to 'libpod')
-rw-r--r--libpod/filters/pods.go8
-rw-r--r--libpod/image/filters.go6
2 files changed, 7 insertions, 7 deletions
diff --git a/libpod/filters/pods.go b/libpod/filters/pods.go
index 9bf436eab..0edb9fbf2 100644
--- a/libpod/filters/pods.go
+++ b/libpod/filters/pods.go
@@ -57,13 +57,13 @@ func GeneratePodFilterFunc(filter, filterValue string) (
return nil, errors.Errorf("%s is not a valid status", filterValue)
}
return func(p *libpod.Pod) bool {
- ctr_statuses, err := p.Status()
+ ctrStatuses, err := p.Status()
if err != nil {
return false
}
- for _, ctr_status := range ctr_statuses {
- state := ctr_status.String()
- if ctr_status == define.ContainerStateConfigured {
+ for _, ctrStatus := range ctrStatuses {
+ state := ctrStatus.String()
+ if ctrStatus == define.ContainerStateConfigured {
state = "created"
}
if state == filterValue {
diff --git a/libpod/image/filters.go b/libpod/image/filters.go
index 747eba165..9d99fb344 100644
--- a/libpod/image/filters.go
+++ b/libpod/image/filters.go
@@ -102,8 +102,8 @@ func ReferenceFilter(ctx context.Context, referenceFilter string) ResultFilter {
}
}
-// IdFilter allows you to filter by image Id
-func IdFilter(idFilter string) ResultFilter {
+// IDFilter allows you to filter by image Id
+func IDFilter(idFilter string) ResultFilter {
return func(i *Image) bool {
return i.ID() == idFilter
}
@@ -172,7 +172,7 @@ func (ir *Runtime) createFilterFuncs(filters []string, img *Image) ([]ResultFilt
case "reference":
filterFuncs = append(filterFuncs, ReferenceFilter(ctx, splitFilter[1]))
case "id":
- filterFuncs = append(filterFuncs, IdFilter(splitFilter[1]))
+ filterFuncs = append(filterFuncs, IDFilter(splitFilter[1]))
default:
return nil, errors.Errorf("invalid filter %s ", splitFilter[0])
}