FIx handling of log aggregation oneOf in Python (#463)

* Fix handling of log aggregate oneOf

* Regenerate client from commit b3fffea of spec repo

Co-authored-by: Thomas Hervé <thomas.herve@datadoghq.com>
Co-authored-by: ci.datadog-api-spec <packages@datadoghq.com>

Author: 3 people

.apigentools-info

@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.4.1.dev8",
-            "regenerated": "2021-06-03 18:55:49.527271",
-            "spec_repo_commit": "f5f3f9b"
+            "regenerated": "2021-06-04 09:04:21.709024",
+            "spec_repo_commit": "b3fffea"
         },
         "v2": {
             "apigentools_version": "1.4.1.dev8",
-            "regenerated": "2021-06-03 18:56:14.612629",
-            "spec_repo_commit": "f5f3f9b"
+            "regenerated": "2021-06-04 09:04:47.790201",
+            "spec_repo_commit": "b3fffea"
         }
     }
-}
+}

.generator/templates/model_templates/method_init_simple.mustache

@@ -56,6 +56,18 @@
                 valid_classes=(self.__class__,),
             )
 
+{{#isArray}}
+        if not isinstance(value, list):
+            raise ApiTypeError(
+                "Invalid non-list arguments=%s passed to %s." % (
+                    args,
+                    self.__class__.__name__,
+                ),
+                path_to_item=_path_to_item,
+                valid_classes=(self.__class__,),
+            )
+
+{{/isArray}}
         self._data_store = {}
         self._check_type = _check_type
         self._spec_property_naming = _spec_property_naming
@@ -71,4 +83,4 @@
                 ),
                 path_to_item=_path_to_item,
                 valid_classes=(self.__class__,),
-            )
+            )

.generator/templates/model_utils.mustache

@@ -1,5 +1,6 @@
 {{>partial_header}}
 
+import copy
 from datetime import date, datetime  # noqa: F401
 import inspect
 import io
@@ -913,7 +914,10 @@ def deserialize_model(model_data, model_class, path_to_item, check_type,
     if issubclass(model_class, ModelSimple):
         return model_class(model_data, **kw_args)
     elif isinstance(model_data, list):
-        return model_class(*model_data, **kw_args)
+        if issubclass(model_class, ModelComposed) and allows_single_value_input(model_class):
+            return model_class(model_data, **kw_args)
+        else:
+            return model_class(*model_data, **kw_args)
     if isinstance(model_data, dict):
         kw_args.update(model_data)
         return model_class(**kw_args)
@@ -1364,6 +1368,10 @@ def get_oneof_instance(cls, model_kwargs, constant_kwargs, model_arg=None):
     if len(cls._composed_schemas['oneOf']) == 0:
         return None
 
+    # Buld a configuration that doesn't discard unknown keys for primitive types
+    discard_configuration = copy.deepcopy(constant_kwargs["_configuration"])
+    discard_configuration.discard_unknown_keys = False
+
     oneof_instances = []
     # Iterate over each oneOf schema and determine if the input data
     # matches the oneOf schemas.
@@ -1412,7 +1420,7 @@ def get_oneof_instance(cls, model_kwargs, constant_kwargs, model_arg=None):
                         constant_kwargs['_path_to_item'],
                         constant_kwargs['_spec_property_naming'],
                         constant_kwargs['_check_type'],
-                        configuration=constant_kwargs['_configuration']
+                        configuration=discard_configuration
                     )
             oneof_instances.append(oneof_instance)
         except Exception:

src/datadog_api_client/v1/model/azure_account_list_response.py

@@ -163,6 +163,17 @@ def __init__(self, *args, **kwargs):
                 valid_classes=(self.__class__,),
             )
 
+        if not isinstance(value, list):
+            raise ApiTypeError(
+                "Invalid non-list arguments=%s passed to %s."
+                % (
+                    args,
+                    self.__class__.__name__,
+                ),
+                path_to_item=_path_to_item,
+                valid_classes=(self.__class__,),
+            )
+
         self._data_store = {}
         self._check_type = _check_type
         self._spec_property_naming = _spec_property_naming

src/datadog_api_client/v1/model/gcp_account_list_response.py

@@ -163,6 +163,17 @@ def __init__(self, *args, **kwargs):
                 valid_classes=(self.__class__,),
             )
 
+        if not isinstance(value, list):
+            raise ApiTypeError(
+                "Invalid non-list arguments=%s passed to %s."
+                % (
+                    args,
+                    self.__class__.__name__,
+                ),
+                path_to_item=_path_to_item,
+                valid_classes=(self.__class__,),
+            )
+
         self._data_store = {}
         self._check_type = _check_type
         self._spec_property_naming = _spec_property_naming

src/datadog_api_client/v1/model/http_log.py

@@ -163,6 +163,17 @@ def __init__(self, *args, **kwargs):
                 valid_classes=(self.__class__,),
             )
 
+        if not isinstance(value, list):
+            raise ApiTypeError(
+                "Invalid non-list arguments=%s passed to %s."
+                % (
+                    args,
+                    self.__class__.__name__,
+                ),
+                path_to_item=_path_to_item,
+                valid_classes=(self.__class__,),
+            )
+
         self._data_store = {}
         self._check_type = _check_type
         self._spec_property_naming = _spec_property_naming

src/datadog_api_client/v1/model/logs_pipeline_list.py

@@ -163,6 +163,17 @@ def __init__(self, *args, **kwargs):
                 valid_classes=(self.__class__,),
             )
 
+        if not isinstance(value, list):
+            raise ApiTypeError(
+                "Invalid non-list arguments=%s passed to %s."
+                % (
+                    args,
+                    self.__class__.__name__,
+                ),
+                path_to_item=_path_to_item,
+                valid_classes=(self.__class__,),
+            )
+
         self._data_store = {}
         self._check_type = _check_type
         self._spec_property_naming = _spec_property_naming

src/datadog_api_client/v1/model/monitor_search_count.py

@@ -156,6 +156,17 @@ def __init__(self, *args, **kwargs):
                 valid_classes=(self.__class__,),
             )
 
+        if not isinstance(value, list):
+            raise ApiTypeError(
+                "Invalid non-list arguments=%s passed to %s."
+                % (
+                    args,
+                    self.__class__.__name__,
+                ),
+                path_to_item=_path_to_item,
+                valid_classes=(self.__class__,),
+            )
+
         self._data_store = {}
         self._check_type = _check_type
         self._spec_property_naming = _spec_property_naming

src/datadog_api_client/v1/model/point.py

@@ -161,6 +161,17 @@ def __init__(self, *args, **kwargs):
                 valid_classes=(self.__class__,),
             )
 
+        if not isinstance(value, list):
+            raise ApiTypeError(
+                "Invalid non-list arguments=%s passed to %s."
+                % (
+                    args,
+                    self.__class__.__name__,
+                ),
+                path_to_item=_path_to_item,
+                valid_classes=(self.__class__,),
+            )
+
         self._data_store = {}
         self._check_type = _check_type
         self._spec_property_naming = _spec_property_naming

src/datadog_api_client/v1/model/service_checks.py

@@ -163,6 +163,17 @@ def __init__(self, *args, **kwargs):
                 valid_classes=(self.__class__,),
             )
 
+        if not isinstance(value, list):
+            raise ApiTypeError(
+                "Invalid non-list arguments=%s passed to %s."
+                % (
+                    args,
+                    self.__class__.__name__,
+                ),
+                path_to_item=_path_to_item,
+                valid_classes=(self.__class__,),
+            )
+
         self._data_store = {}
         self._check_type = _check_type
         self._spec_property_naming = _spec_property_naming