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

Handle filters correctly for podman prune

Browse Source 
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh
2020-05-20 21:05:32 -04:00
parent a4c8198afd
commit 9add1abd12
4 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/podman/images/prune.go
View File

@ -61,12 +61,6 @@ Are you sure you want to continue? [y/N] `)
}
}
// TODO Remove once filter refactor is finished and url.Values rules :)
for _, f := range filter {
t := strings.SplitN(f, "=", 2)
pruneOpts.Filters.Add(t[0], t[1])
}
results, err := registry.ImageEngine().Prune(registry.GetContext(), pruneOpts)
if err != nil {
return err

6
pkg/domain/entities/images.go
View File

@ -1,7 +1,6 @@
package entities
import (
"net/url"
"time"
"github.com/containers/image/v5/manifest"
@ -226,9 +225,8 @@ type ImageListOptions struct {
}
type ImagePruneOptions struct {
All bool `json:"all" schema:"all"`
Filter []string `json:"filter" schema:"filter"`
Filters url.Values `json:"filters" schema:"filters"`
All bool `json:"all" schema:"all"`
Filter []string `json:"filter" schema:"filter"`
}
type ImagePruneReport struct {

7
pkg/domain/infra/tunnel/images.go
View File

@ -67,8 +67,13 @@ func (ir *ImageEngine) History(ctx context.Context, nameOrId string, opts entiti
}
func (ir *ImageEngine) Prune(ctx context.Context, opts entities.ImagePruneOptions) (*entities.ImagePruneReport, error) {
filters := make(map[string][]string, len(opts.Filter))
for _, filter := range opts.Filter {
f := strings.Split(filter, "=")
filters[f[0]] = f[1:]
}
results, err := images.Prune(ir.ClientCxt, &opts.All, opts.Filters)
results, err := images.Prune(ir.ClientCxt, &opts.All, filters)
if err != nil {
return nil, err
}

7
test/e2e/images_test.go
View File

@ -131,6 +131,7 @@ var _ = Describe("Podman images", func() {
})
It("podman images filter by image name", func() {
Skip(v2remotefail)
podmanTest.RestoreAllArtifacts()
session := podmanTest.PodmanNoCache([]string{"images", "-q", ALPINE})
session.WaitWithDefaultTimeout()
@ -233,6 +234,9 @@ RUN apk update && apk add man
})
It("podman check for image with sha256: prefix", func() {
if podmanTest.RemoteTest {
Skip("Does not work on remote client")
}
session := podmanTest.Podman([]string{"inspect", "--format=json", ALPINE})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
@ -245,6 +249,9 @@ RUN apk update && apk add man
})
It("podman check for image with sha256: prefix", func() {
if podmanTest.RemoteTest {
Skip("Does not work on remote client")
}
session := podmanTest.Podman([]string{"image", "inspect", "--format=json", ALPINE})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))