From 74a63df0539ce1488353f03c7cb100ee4bbc7e73 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@redhat.com>
Date: Fri, 22 Jan 2021 10:52:18 -0500
Subject: Fixup search

podman-remote search had some FIXMEs in tests that were failing.
So I reworked the search handler to use the local abi.  This
means the podman search and podman-remote search will use the
same functions.

While doing this, I noticed we were just outputing errors via
logrus.Error rather then returning them, which works ok for
podman but the messages get lost on podman-remote.  Changed
the code to actually return the error messages to the caller.

This allows us to turn on the remaining podman-remote FIXME
tests.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
---
 libpod/image/search.go | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

(limited to 'libpod/image/search.go')

diff --git a/libpod/image/search.go b/libpod/image/search.go
index 6020fbca9..c5799219a 100644
--- a/libpod/image/search.go
+++ b/libpod/image/search.go
@@ -102,8 +102,8 @@ func SearchImages(term string, options SearchOptions) ([]SearchResult, error) {
 	searchImageInRegistryHelper := func(index int, registry string) {
 		defer sem.Release(1)
 		defer wg.Done()
-		searchOutput := searchImageInRegistry(term, registry, options)
-		data[index] = searchOutputData{data: searchOutput}
+		searchOutput, err := searchImageInRegistry(term, registry, options)
+		data[index] = searchOutputData{data: searchOutput, err: err}
 	}
 
 	ctx := context.Background()
@@ -116,13 +116,21 @@ func SearchImages(term string, options SearchOptions) ([]SearchResult, error) {
 
 	wg.Wait()
 	results := []SearchResult{}
+	var lastError error
 	for _, d := range data {
 		if d.err != nil {
-			return nil, d.err
+			if lastError != nil {
+				logrus.Errorf("%v", lastError)
+			}
+			lastError = d.err
+			continue
 		}
 		results = append(results, d.data...)
 	}
-	return results, nil
+	if len(results) > 0 {
+		return results, nil
+	}
+	return results, lastError
 }
 
 // getRegistries returns the list of registries to search, depending on an optional registry specification
@@ -140,7 +148,7 @@ func getRegistries(registry string) ([]string, error) {
 	return registries, nil
 }
 
-func searchImageInRegistry(term string, registry string, options SearchOptions) []SearchResult {
+func searchImageInRegistry(term string, registry string, options SearchOptions) ([]SearchResult, error) {
 	// Max number of queries by default is 25
 	limit := maxQueries
 	if options.Limit > 0 {
@@ -156,16 +164,14 @@ func searchImageInRegistry(term string, registry string, options SearchOptions)
 	if options.ListTags {
 		results, err := searchRepositoryTags(registry, term, sc, options)
 		if err != nil {
-			logrus.Errorf("error listing registry tags %q: %v", registry, err)
-			return []SearchResult{}
+			return []SearchResult{}, err
 		}
-		return results
+		return results, nil
 	}
 
 	results, err := docker.SearchRegistry(context.TODO(), sc, registry, term, limit)
 	if err != nil {
-		logrus.Errorf("error searching registry %q: %v", registry, err)
-		return []SearchResult{}
+		return []SearchResult{}, err
 	}
 	index := registry
 	arr := strings.Split(registry, ".")
@@ -219,7 +225,7 @@ func searchImageInRegistry(term string, registry string, options SearchOptions)
 		}
 		paramsArr = append(paramsArr, params)
 	}
-	return paramsArr
+	return paramsArr, nil
 }
 
 func searchRepositoryTags(registry, term string, sc *types.SystemContext, options SearchOptions) ([]SearchResult, error) {
-- 
cgit v1.2.3-54-g00ecf