summaryrefslogtreecommitdiff
path: root/pkg/api
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-08-03 03:06:24 -0400
committerGitHub <noreply@github.com>2020-08-03 03:06:24 -0400
commitbfd34542f463b7ea59b9560516b3b3d66674eefe (patch)
treee5c6ebfcc2bfaf952850f207c13c5b6df587f034 /pkg/api
parentf4d4bd22887e1271c3bf04532596f4c02201022e (diff)
parent54256fbe7881894063f27e19e7dc63cb7c358e0c (diff)
downloadpodman-bfd34542f463b7ea59b9560516b3b3d66674eefe.tar.gz
podman-bfd34542f463b7ea59b9560516b3b3d66674eefe.tar.bz2
podman-bfd34542f463b7ea59b9560516b3b3d66674eefe.zip
Merge pull request #7141 from rhafer/image_descr_test
Add test case for description being present in search result
Diffstat (limited to 'pkg/api')
-rw-r--r--pkg/api/handlers/libpod/images.go6
-rw-r--r--pkg/api/server/register_images.go4
2 files changed, 8 insertions, 2 deletions
diff --git a/pkg/api/handlers/libpod/images.go b/pkg/api/handlers/libpod/images.go
index 3421f0836..e0da990c3 100644
--- a/pkg/api/handlers/libpod/images.go
+++ b/pkg/api/handlers/libpod/images.go
@@ -638,6 +638,7 @@ func SearchImages(w http.ResponseWriter, r *http.Request) {
query := struct {
Term string `json:"term"`
Limit int `json:"limit"`
+ NoTrunc bool `json:"noTrunc"`
Filters []string `json:"filters"`
TLSVerify bool `json:"tlsVerify"`
}{
@@ -650,7 +651,8 @@ func SearchImages(w http.ResponseWriter, r *http.Request) {
}
options := image.SearchOptions{
- Limit: query.Limit,
+ Limit: query.Limit,
+ NoTrunc: query.NoTrunc,
}
if _, found := r.URL.Query()["tlsVerify"]; found {
options.InsecureSkipTLSVerify = types.NewOptionalBool(!query.TLSVerify)
@@ -677,7 +679,7 @@ func SearchImages(w http.ResponseWriter, r *http.Request) {
for i := range searchResults {
reports[i].Index = searchResults[i].Index
reports[i].Name = searchResults[i].Name
- reports[i].Description = searchResults[i].Index
+ reports[i].Description = searchResults[i].Description
reports[i].Stars = searchResults[i].Stars
reports[i].Official = searchResults[i].Official
reports[i].Automated = searchResults[i].Automated
diff --git a/pkg/api/server/register_images.go b/pkg/api/server/register_images.go
index 7f060d098..cb4ce4fe7 100644
--- a/pkg/api/server/register_images.go
+++ b/pkg/api/server/register_images.go
@@ -972,6 +972,10 @@ func (s *APIServer) registerImagesHandlers(r *mux.Router) error {
// type: integer
// description: maximum number of results
// - in: query
+ // name: noTrunc
+ // type: boolean
+ // description: do not truncate any of the result strings
+ // - in: query
// name: filters
// type: string
// description: |