fix(openapi): convert more sub-schemas

truenas · Oct 9, 2024 · 3e4f112 · 3e4f112
1 parent ecc63ff
commit 3e4f112
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/middlewared/middlewared/restful.py b/src/middlewared/middlewared/restful.py
@@ -368,11 +368,13 @@ def _convert_schema(self, schema):
                     if item.get('type') == 'null':
                         items.remove(item)
                 if len(items) > 1:
-                    schema['items'] = {'oneOf': items}
+                    schema['items'] = {'oneOf': list(map(self._convert_schema, items))}
                 elif len(items) > 0:
-                    schema['items'] = items[0]
+                    schema['items'] = self._convert_schema(items[0])
                 else:
                     schema['items'] = {}
+        if anyOf := schema.get('anyOf', None):
+            schema['anyOf'] = list(map(self._convert_schema, anyOf))
         return schema
 
     def _returns_to_request(self, methodname, method_returns):