Merge pull request #588 from visualphoenix/feature/mirror_search

FEATURE: merge search results between local and index route

Author: dmp42

docker_registry/lib/mirroring.py

@@ -3,6 +3,9 @@
 import functools
 import logging
 
+from docker_registry.core import compat
+json = compat.json
+
 from .. import storage
 from .. import toolkit
 from . import cache
@@ -40,11 +43,12 @@ def lookup_source(path, stream=False, source=None):
     for k, v in flask.request.headers.iteritems():
         if k.lower() != 'location' and k.lower() != 'host':
             headers[k] = v
-    logger.debug('Request: GET {0}\nHeaders: {1}'.format(
-        source_url, headers
+    logger.debug('Request: GET {0}\nHeaders: {1}\nArgs: {2}'.format(
+        source_url, headers, flask.request.args
     ))
     source_resp = requests.get(
         source_url,
+        params=flask.request.args,
         headers=headers,
         cookies=flask.request.cookies,
         stream=stream
@@ -132,7 +136,8 @@ def wrapper(namespace, repository, *args, **kwargs):
     return wrapper
 
 
-def source_lookup(cache=False, stream=False, index_route=False):
+def source_lookup(cache=False, stream=False, index_route=False,
+                  merge_results=False):
     def decorator(f):
         @functools.wraps(f)
         def wrapper(*args, **kwargs):
@@ -144,7 +149,7 @@ def wrapper(*args, **kwargs):
             if index_route and mirroring_cfg.source_index:
                 source = mirroring_cfg.source_index
             logger.debug('Source provided, registry acts as mirror')
-            if resp.status_code != 404:
+            if resp.status_code != 404 and not merge_results:
                 logger.debug('Status code is not 404, no source '
                              'lookup required')
                 return resp
@@ -163,6 +168,19 @@ def wrapper(*args, **kwargs):
             if not stream:
                 logger.debug('JSON data found on source, writing response')
                 resp_data = source_resp.content
+                if merge_results:
+                    mjson = json.loads(resp_data)
+                    pjson = json.loads(resp.data)
+                    for mr in mjson["results"]:
+                        replaced = False
+                        for pi, pr in enumerate(pjson["results"]):
+                            if pr["name"] == mr["name"]:
+                                pjson["results"][pi] = mr
+                                replaced = True
+                        if not replaced:
+                            pjson["results"].extend([mr])
+                    pjson['num_results'] = len(pjson["results"])
+                    resp_data = json.dumps(pjson)
                 if cache:
                     store_mirrored_data(
                         resp_data, flask.request.url_rule.rule, kwargs,

docker_registry/search.py

@@ -4,6 +4,7 @@
 from .app import app
 from .lib import config
 from .lib import index
+from .lib import mirroring
 import flask
 
 
@@ -17,6 +18,7 @@
 
 
 @app.route('/v1/search', methods=['GET'])
+@mirroring.source_lookup(index_route=True, merge_results=True)
 def get_search():
     search_term = flask.request.args.get('q', '')
     if INDEX is None: