3 files changed, 41 insertions, 54 deletions

diff --git a/pkg/bindings/images/images.go b/pkg/bindings/images/images.go
index 1b3df609b..3550c3968 100644
--- a/pkg/bindings/images/images.go
+++ b/pkg/bindings/images/images.go
@@ -2,7 +2,6 @@ package images
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"io"
 	"net/http"
@@ -13,6 +12,7 @@ import (
 	"github.com/containers/libpod/pkg/api/handlers"
 	"github.com/containers/libpod/pkg/bindings"
 	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/pkg/errors"
 )
 
 // Exists a lightweight way to determine if an image exists in local storage.  It returns a
@@ -308,3 +308,34 @@ func Push(ctx context.Context, source string, destination string, options entiti
 	_, err = conn.DoRequest(nil, http.MethodPost, path, params)
 	return err
 }
+
+// Search is the binding for libpod's v2 endpoints for Search images.
+func Search(ctx context.Context, term string, opts entities.ImageSearchOptions) ([]entities.ImageSearchReport, error) {
+	conn, err := bindings.GetClient(ctx)
+	if err != nil {
+		return nil, err
+	}
+	params := url.Values{}
+	params.Set("term", term)
+	params.Set("limit", strconv.Itoa(opts.Limit))
+	for _, f := range opts.Filters {
+		params.Set("filters", f)
+	}
+
+	if opts.TLSVerify != types.OptionalBoolUndefined {
+		val := bool(opts.TLSVerify == types.OptionalBoolTrue)
+		params.Set("tlsVerify", strconv.FormatBool(val))
+	}
+
+	response, err := conn.DoRequest(nil, http.MethodGet, "/images/search", params)
+	if err != nil {
+		return nil, err
+	}
+
+	results := []entities.ImageSearchReport{}
+	if err := response.Process(&results); err != nil {
+		return nil, err
+	}
+
+	return results, nil
+}
diff --git a/pkg/bindings/images/search.go b/pkg/bindings/images/search.go
deleted file mode 100644
index 183ff3d77..000000000
--- a/pkg/bindings/images/search.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package images
-
-import (
-	"context"
-	"net/http"
-	"net/url"
-	"strconv"
-
-	"github.com/containers/libpod/libpod/image"
-	"github.com/containers/libpod/pkg/bindings"
-)
-
-// Search looks for the given image (term) in container image registries.  The optional limit parameter sets
-// a maximum number of results returned.  The optional filters parameter allow for more specific image
-// searches.
-func Search(ctx context.Context, term string, limit *int, filters map[string][]string) ([]image.SearchResult, error) {
-	var (
-		searchResults []image.SearchResult
-	)
-	conn, err := bindings.GetClient(ctx)
-	if err != nil {
-		return nil, err
-	}
-	params := url.Values{}
-	params.Set("term", term)
-	if limit != nil {
-		params.Set("limit", strconv.Itoa(*limit))
-	}
-	if filters != nil {
-		stringFilter, err := bindings.FiltersToString(filters)
-		if err != nil {
-			return nil, err
-		}
-		params.Set("filters", stringFilter)
-	}
-	response, err := conn.DoRequest(nil, http.MethodGet, "/images/search", params)
-	if err != nil {
-		return searchResults, nil
-	}
-	return searchResults, response.Process(&searchResults)
-}
diff --git a/pkg/bindings/test/images_test.go b/pkg/bindings/test/images_test.go
index 992720196..58210efd0 100644
--- a/pkg/bindings/test/images_test.go
+++ b/pkg/bindings/test/images_test.go
@@ -314,11 +314,11 @@ var _ = Describe("Podman images", func() {
 	})
 
 	It("Search for an image", func() {
-		imgs, err := images.Search(bt.conn, "alpine", nil, nil)
+		reports, err := images.Search(bt.conn, "alpine", entities.ImageSearchOptions{})
 		Expect(err).To(BeNil())
-		Expect(len(imgs)).To(BeNumerically(">", 1))
+		Expect(len(reports)).To(BeNumerically(">", 1))
 		var foundAlpine bool
-		for _, i := range imgs {
+		for _, i := range reports {
 			if i.Name == "docker.io/library/alpine" {
 				foundAlpine = true
 				break
@@ -327,23 +327,20 @@ var _ = Describe("Podman images", func() {
 		Expect(foundAlpine).To(BeTrue())
 
 		// Search for alpine with a limit of 10
-		ten := 10
-		imgs, err = images.Search(bt.conn, "docker.io/alpine", &ten, nil)
+		reports, err = images.Search(bt.conn, "docker.io/alpine", entities.ImageSearchOptions{Limit: 10})
 		Expect(err).To(BeNil())
-		Expect(len(imgs)).To(BeNumerically("<=", 10))
+		Expect(len(reports)).To(BeNumerically("<=", 10))
 
 		// Search for alpine with stars greater than 100
-		filters := make(map[string][]string)
-		filters["stars"] = []string{"100"}
-		imgs, err = images.Search(bt.conn, "docker.io/alpine", nil, filters)
+		reports, err = images.Search(bt.conn, "docker.io/alpine", entities.ImageSearchOptions{Filters: []string{"stars=100"}})
 		Expect(err).To(BeNil())
-		for _, i := range imgs {
+		for _, i := range reports {
 			Expect(i.Stars).To(BeNumerically(">=", 100))
 		}
 
 		//	Search with a fqdn
-		imgs, err = images.Search(bt.conn, "quay.io/libpod/alpine_nginx", nil, nil)
-		Expect(len(imgs)).To(BeNumerically(">=", 1))
+		reports, err = images.Search(bt.conn, "quay.io/libpod/alpine_nginx", entities.ImageSearchOptions{})
+		Expect(len(reports)).To(BeNumerically(">=", 1))
 	})
 
 	It("Prune images", func() {