Revert schema changes

Author: lgarber-akamai

linodecli/baked/util.py

@@ -23,16 +23,7 @@ def _aggregate_schema_properties(
     properties = {}
     required = defaultdict(lambda: 0)
 
-    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)
-
+    def _handle_schema(_schema: Schema):
         if _schema.properties is None:
             return
 
@@ -46,7 +37,14 @@ def _handle_schema(path: List[str], data: Dict[str, Any]):
             for key in _schema.required:
                 required[key] += 1
 
-    _handle_schema(schema.path, schema.raw_element)
+    _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))
 
     return (
         properties,