containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19063 from BlackHole1/fix-search 

fix(command): ignore `--format` in `podman search --list-tags`
This commit is contained in:
OpenShift Merge Robot 2023-06-30 09:41:26 -04:00 committed by GitHub
parent b050710827 a16488f89d
commit 92a22bb94b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -182,7 +182,11 @@ func imageSearch(cmd *cobra.Command, args []string) error {
listTagsEntries := buildListTagsJSON(searchReport) listTagsEntries := buildListTagsJSON(searchReport)
return printArbitraryJSON(listTagsEntries) return printArbitraryJSON(listTagsEntries)
} }
rpt, err = rpt.Parse(report.OriginPodman, "{{range .}}{{.Name}}\t{{.Tag}}\n{{end -}}") if cmd.Flags().Changed("format") {
rpt, err = rpt.Parse(report.OriginUser, searchOptions.Format)
} else {
rpt, err = rpt.Parse(report.OriginPodman, "{{range .}}{{.Name}}\t{{.Tag}}\n{{end -}}")
}
case isJSON: case isJSON:
return printArbitraryJSON(searchReport) return printArbitraryJSON(searchReport)
case cmd.Flags().Changed("format"): case cmd.Flags().Changed("format"):

7
test/e2e/search_test.go
View File

@ -177,6 +177,13 @@ registries = ['{{.Host}}:{{.Port}}']`
} }
}) })
It("podman search format list tags with custom", func() {
search := podmanTest.Podman([]string{"search", "--list-tags", "--format", "{{.Name}}", "--limit", "1", ALPINE})
search.WaitWithDefaultTimeout()
Expect(search).Should(Exit(0))
Expect(search.OutputToString()).To(Equal("quay.io/libpod/alpine"))
})
It("podman search attempts HTTP if tls-verify flag is set false", func() { It("podman search attempts HTTP if tls-verify flag is set false", func() {
if podmanTest.Host.Arch == "ppc64le" { if podmanTest.Host.Arch == "ppc64le" {
Skip("No registry image for ppc64le") Skip("No registry image for ppc64le")