Fix OpenAPI issue from pagination

https://pulp.plan.io/issues/8037 closes #8037 (cherry picked from commit a2dbb16)
pulp · Jan 15, 2021 · c49ef8c · c49ef8c
1 parent dab9f31
commit c49ef8c
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 18 deletions.
diff --git a/CHANGES/8037.bugfix b/CHANGES/8037.bugfix
@@ -0,0 +1 @@
+Fixed v3 schema pagination to match OpenAPI standard
diff --git a/pulp_ansible/app/galaxy/v3/pagination.py b/pulp_ansible/app/galaxy/v3/pagination.py
@@ -73,27 +73,33 @@ def get_paginated_response_schema(self, schema):
             "type": "object",
             "properties": {
                 "meta": {
-                    "count": {
-                        "type": "integer",
-                        "example": 123,
+                    "type": "object",
+                    "properties": {
+                        "count": {
+                            "type": "integer",
+                            "example": 123,
+                        },
                     },
                 },
                 "links": {
-                    "first": {
-                        "type": "string",
-                        "nullable": True,
-                    },
-                    "previous": {
-                        "type": "string",
-                        "nullable": True,
-                    },
-                    "next": {
-                        "type": "string",
-                        "nullable": True,
-                    },
-                    "last": {
-                        "type": "string",
-                        "nullable": True,
+                    "type": "object",
+                    "properties": {
+                        "first": {
+                            "type": "string",
+                            "nullable": True,
+                        },
+                        "previous": {
+                            "type": "string",
+                            "nullable": True,
+                        },
+                        "next": {
+                            "type": "string",
+                            "nullable": True,
+                        },
+                        "last": {
+                            "type": "string",
+                            "nullable": True,
+                        },
                     },
                 },
                 "data": schema,