WIP

Author: lgarber-akamai

linodecli/baked/request.py

@@ -26,6 +26,7 @@ def __init__(  # pylint: disable=too-many-arguments
         is_parent: bool = False,
         parent: Optional[str] = None,
         depth: int = 0,
+        option_path: Optional[List[str]] = None,
     ) -> None:
         """
         Parses a single Schema node into a argument the CLI can use when making
@@ -123,12 +124,15 @@ def __init__(  # pylint: disable=too-many-arguments
                 "instead of object's properties!  This is a programming error."
             )
 
+        self.option_path = option_path
+
 
 def _parse_request_model(
     schema: Schema,
     prefix: Optional[str] = None,
     parent: Optional[str] = None,
     depth: int = 0,
+    option_path: Optional[List[str]] = None,
 ) -> List[OpenAPIRequestArg]:
     """
     Parses an OpenAPI schema into a list of OpenAPIRequest objects
@@ -147,6 +151,7 @@ def _parse_request_model(
     args = []
 
     properties, required = _aggregate_schema_properties(schema)
+    print(properties, required)
 
     if properties is None:
         return args
@@ -191,6 +196,7 @@ def _parse_request_model(
                     is_parent=True,
                     parent=parent,
                     depth=depth,
+                    option_path=option_path,
                 )
             )
 
@@ -209,6 +215,7 @@ def _parse_request_model(
                     prefix=prefix,
                     parent=parent,
                     depth=depth,
+                    option_path=option_path,
                 )
             )
 

linodecli/baked/util.py

@@ -3,7 +3,7 @@
 """
 
 from collections import defaultdict
-from typing import Any, Dict, Set, Tuple
+from typing import Any, Dict, List, Set, Tuple
 
 from openapi3.schemas import Schema
 
@@ -23,7 +23,16 @@ def _aggregate_schema_properties(
     properties = {}
     required = defaultdict(lambda: 0)
 
-    def _handle_schema(_schema: Schema):
+    def _handle_schema(path: List[str], data: Dict[str, Any]):
+        # We accept data as a dict here to prevent and parsing edge cases
+        for i, entry in enumerate(data.get("oneOf", [])):
+            _handle_schema(path + ["oneOf", i], entry)
+
+        for i, entry in enumerate(data.get("allOf", [])):
+            _handle_schema(path + ["allOf", i], entry)
+
+        _schema = Schema(path, data, schema._root)
+
         if _schema.properties is None:
             return
 
@@ -37,14 +46,7 @@ def _handle_schema(_schema: Schema):
             for key in _schema.required:
                 required[key] += 1
 
-    _handle_schema(schema)
-
-    one_of = schema.oneOf or []
-    any_of = schema.anyOf or []
-
-    for entry in one_of + any_of:
-        # pylint: disable=protected-access
-        _handle_schema(Schema(schema.path, entry, schema._root))
+    _handle_schema(schema.path, schema.raw_element)
 
     return (
         properties,