Support VPC Interfaces Changes (#536)

Author: zliang-akamai

Makefile

@@ -18,10 +18,13 @@ endif
 install: check-prerequisites requirements build
 	pip3 install --force dist/*.whl
 
-.PHONY: build
-build: clean
+.PHONY: bake
+bake: clean
 	python3 -m linodecli bake ${SPEC} --skip-config
 	cp data-3 linodecli/
+
+.PHONY: build
+build: clean bake
 	python3 -m build --wheel --sdist
 
 .PHONY: requirements

linodecli/baked/operation.py

@@ -11,6 +11,8 @@
 from os import environ, path
 from typing import List, Tuple
 
+from openapi3.paths import Operation
+
 from linodecli.baked.request import OpenAPIFilteringRequest, OpenAPIRequest
 from linodecli.baked.response import OpenAPIResponse
 from linodecli.overrides import OUTPUT_OVERRIDES
@@ -233,7 +235,7 @@ class OpenAPIOperation:
     This is the class that should be pickled when building the CLI.
     """
 
-    def __init__(self, command, operation, method, params):
+    def __init__(self, command, operation: Operation, method, params):
         """
         Wraps an openapi3.Operation object and handles pulling out values relevant
         to the Linode CLI.

linodecli/baked/response.py

@@ -1,6 +1,8 @@
 """
 Converting the processed OpenAPI Responses into something the CLI can work with
 """
+from openapi3.paths import MediaType
+
 from .colors import colorize_string
 
 
@@ -159,26 +161,35 @@ def _parse_response_model(schema, prefix=None, nested_list_depth=0):
     :returns: The list of parsed OpenAPIResponseAttr objects representing this schema
     :rtype: List[OpenAPIResponseAttr]
     """
-    attrs = []
 
-    if schema.properties is not None:
-        for k, v in schema.properties.items():
-            pref = prefix + "." + k if prefix else k
-
-            if v.type == "object":
-                attrs += _parse_response_model(v, prefix=pref)
-            elif v.type == "array" and v.items.type == "object":
-                attrs += _parse_response_model(
-                    v.items,
-                    prefix=pref,
-                    nested_list_depth=nested_list_depth + 1,
-                )
-            else:
-                attrs.append(
-                    OpenAPIResponseAttr(
-                        k, v, prefix=prefix, nested_list_depth=nested_list_depth
-                    )
+    if schema.type == "array":
+        return _parse_response_model(
+            schema.items,
+            prefix=prefix,
+            nested_list_depth=nested_list_depth,
+        )
+
+    attrs = []
+    if schema.properties is None:
+        return attrs
+
+    for k, v in schema.properties.items():
+        pref = prefix + "." + k if prefix else k
+
+        if v.type == "object":
+            attrs += _parse_response_model(v, prefix=pref)
+        elif v.type == "array" and v.items.type == "object":
+            attrs += _parse_response_model(
+                v.items,
+                prefix=pref,
+                nested_list_depth=nested_list_depth + 1,
+            )
+        else:
+            attrs.append(
+                OpenAPIResponseAttr(
+                    k, v, prefix=prefix, nested_list_depth=nested_list_depth
                 )
+            )
 
     return attrs
 
@@ -189,7 +200,7 @@ class OpenAPIResponse:
     responses section of an OpenAPI Operation
     """
 
-    def __init__(self, response):
+    def __init__(self, response: MediaType):
         """
         :param response: The response's MediaType object in the OpenAPI spec,
                           corresponding to the application/json response type
@@ -228,7 +239,9 @@ def fix_json(self, json):
         # Needs to go last to handle custom schemas
         if "pages" in json:
             return json["data"]
-        return [json]
+        if not isinstance(json, list):
+            json = [json]
+        return json
 
     def _fix_json_rows(self, json):
         """