Fix post v0.11.0 bugs - 500 error on missing local collection, 400 error from proxied v2 paginated requests

changelogs/fragments/114-bugfixes.yml

@@ -0,0 +1,4 @@
+---
+bugfixes:
+  - Requests for collections that were not already present in artifactory resulted in a 500 internal server error (https://github.com/briantist/galactory/issues/112).
+  - Requests proxied to a v2 upstream endpoint that supports pagination caused a 400 error from the upstream due to the inclusion of the v3 ``limit`` query string parameter (https://github.com/briantist/galactory/issues/113).

galactory/api/v2/collections.py

@@ -178,23 +178,23 @@
     if len(collections) > 1:
         abort(C.HTTP_INTERNAL_SERVER_ERROR)
 
-    col = next(iter(collections.values()))
     vers = set()
-    for i in col.values():
-        results.append(
-            {
-                'href': url_for(
-                    ".version",
-                    namespace=i.namespace,
-                    collection=i.name,
-                    version=i.version,
-                    _external=True,
-                    _scheme=scheme,
-                ),
-                'version': i.version,
-            }
-        )
-        vers.add(i.version)
+    for col in collections.values():
+        for i in col.values():
+            results.append(
+                {
+                    'href': url_for(
+                        ".version",
+                        namespace=i.namespace,
+                        collection=i.name,
+                        version=i.version,
+                        _external=True,
+                        _scheme=scheme,
+                    ),
+                    'version': i.version,
+                }
+            )
+            vers.add(i.version)
 
     if upstream_result:
         for item in upstream_result['results']:

galactory/api/v3/collections.py

@@ -190,27 +190,27 @@
     if len(collections) > 1:
         abort(C.HTTP_INTERNAL_SERVER_ERROR)
 
-    col = next(iter(collections.values()))
     vers = set()
-    for i in col.values():
-        results.append(
-            {
-                'href': url_for(
-                    ".version",
-                    namespace=i.namespace,
-                    collection=i.name,
-                    version=i.version,
-                    _external=False,
-                    _scheme=scheme,
-                ),
-                'version': i.version,
-                'created_at': i.created,
-                'updated_at': i.modified,
-                'marks': [],
-                'requires_ansible': None, # FIXME
-            }
-        )
-        vers.add(i.version)
+    for col in collections.values():
+        for i in col.values():
+            results.append(
+                {
+                    'href': url_for(
+                        ".version",
+                        namespace=i.namespace,
+                        collection=i.name,
+                        version=i.version,
+                        _external=False,
+                        _scheme=scheme,
+                    ),
+                    'version': i.version,
+                    'created_at': i.created,
+                    'updated_at': i.modified,
+                    'marks': [],
+                    'requires_ansible': None, # FIXME
+                }
+            )
+            vers.add(i.version)
 
     if upstream_result:
         for item in upstream_result['data']:

galactory/upstream.py

@@ -258,8 +258,10 @@
             current_app.logger.info(f"Rewriting '{this_url}' to '{rewritten}'")
             params = request.args.copy()
             if not no_paginate:
-                # FIXME: use the correct parameter for the galaxy API version
-                params['page_size'] = params['limit'] = 100
+                if 'v2' in this_url:
+                    params['page_size'] = 100
+                else:
+                    params['limit'] = 100
 
         headers = {k: v for k, v in request.headers.items() if k not in ['Authorization', 'Host']}
         headers['Accept'] = 'application/json, */*'