Handle null in query metrics unit (#486)

* Handle None in model_to_dict

* Update cassettes

* Regenerate client from commit 3efd10d of spec repo

Co-authored-by: Thomas Hervé <[email protected]>
Co-authored-by: api-clients-generation-pipeline[bot] <54105614+api-clients-generation-pipeline[bot]@users.noreply.github.com>
Co-authored-by: ci.datadog-api-spec <[email protected]>

Author: 3 people

.apigentools-info

@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.4.1.dev8",
-            "regenerated": "2021-06-17 09:50:27.972538",
-            "spec_repo_commit": "4951cff"
+            "regenerated": "2021-06-17 12:46:48.192991",
+            "spec_repo_commit": "3efd10d"
         },
         "v2": {
             "apigentools_version": "1.4.1.dev8",
-            "regenerated": "2021-06-17 09:50:52.322016",
-            "spec_repo_commit": "4951cff"
+            "regenerated": "2021-06-17 12:47:17.170607",
+            "spec_repo_commit": "3efd10d"
         }
     }
 }

.generator/templates/model_utils.mustache

@@ -1225,7 +1225,7 @@ def model_to_dict(model_instance, serialize=True):
                 elif isinstance(value[0], ModelSimple):
                     result[attr] = [x.value for x in value]
                 else:
-                    result[attr] = [model_to_dict(x, serialize=serialize) for x in value]
+                    result[attr] = [model_to_dict(x, serialize=serialize) if x is not None else None for x in value]
             elif isinstance(value, dict):
                 result[attr] = dict(map(
                     lambda item: (item[0],

src/datadog_api_client/v1/model/metrics_query_unit.py

@@ -52,7 +52,7 @@ class MetricsQueryUnit(ModelNormal):
 
     additional_properties_type = None
 
-    _nullable = False
+    _nullable = True
 
     @cached_property
     def openapi_types():

src/datadog_api_client/v1/model_utils.py

@@ -1417,7 +1417,7 @@ def model_to_dict(model_instance, serialize=True):
                 elif isinstance(value[0], ModelSimple):
                     result[attr] = [x.value for x in value]
                 else:
-                    result[attr] = [model_to_dict(x, serialize=serialize) for x in value]
+                    result[attr] = [model_to_dict(x, serialize=serialize) if x is not None else None for x in value]
             elif isinstance(value, dict):
                 result[attr] = dict(
                     map(

src/datadog_api_client/v1/openapi.yaml

@@ -4816,6 +4816,7 @@ components:
     MetricsQueryUnit:
       description: Object containing the metric unit family, scale factor, name, and
         short name.
+      nullable: true
       properties:
         family:
           description: Unit family, allows for conversion between units of the same

src/datadog_api_client/v2/model_utils.py

@@ -1417,7 +1417,7 @@ def model_to_dict(model_instance, serialize=True):
                 elif isinstance(value[0], ModelSimple):
                     result[attr] = [x.value for x in value]
                 else:
-                    result[attr] = [model_to_dict(x, serialize=serialize) for x in value]
+                    result[attr] = [model_to_dict(x, serialize=serialize) if x is not None else None for x in value]
             elif isinstance(value, dict):
                 result[attr] = dict(
                     map(

tests/v1/cassettes/test_scenarios/test_submit_metrics_returns_payload_accepted_response.frozen

@@ -1 +1 @@
-2021-04-23T10:02:02.688685+02:00
+2021-06-17T14:40:01.472790+02:00

tests/v1/cassettes/test_scenarios/test_submit_metrics_returns_payload_accepted_response.yaml

@@ -1,7 +1,7 @@
 interactions:
 - request:
-    body: '{"series": [{"metric": "system.load.1", "type": "gauge", "points": [[1600348600,
-      1.1]], "tags": ["test:TestSubmitmetricsreturnsPayloadacceptedresponse1619164922"]}]}'
+    body: '{"series": [{"metric": "system.load.1", "type": "gauge", "points": [[1623933601,
+      1.1]], "tags": ["test:TestSubmitmetricsreturnsPayloadacceptedresponse1623933601"]}]}'
     headers:
       Accept:
       - application/json
@@ -10,7 +10,7 @@ interactions:
       Dd-Operation-Id:
       - SubmitMetrics
       User-Agent:
-      - datadog-api-client-python/1.0.0b9.dev1+dirty (python 3.8.8; os Darwin; arch
+      - datadog-api-client-python/1.1.1.dev7+dirty (python 3.8.10; os Darwin; arch
         x86_64)
     method: POST
     uri: https://api.datadoghq.com/api/v1/series
@@ -25,7 +25,7 @@ interactions:
       Content-Type:
       - text/json
       Date:
-      - Fri, 23 Apr 2021 08:02:03 GMT
+      - Thu, 17 Jun 2021 12:40:02 GMT
       content-security-policy:
       - frame-ancestors 'self'; report-uri https://api.datadoghq.com/csp-report
       strict-transport-security:

tests/v1/features/metrics.feature

@@ -77,10 +77,13 @@ Feature: Metrics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip
+  @skip-python
   Scenario: Query timeseries points returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "QueryMetrics" request
+    And request contains "from" parameter with value {{ timestamp("now - 1d") }}
+    And request contains "to" parameter with value {{ timestamp("now") }}
+    And request contains "query" parameter with value "system.cpu.idle{*}"
     When the request is sent
     Then the response status is 200 OK
 
@@ -107,7 +110,7 @@ Feature: Metrics
 
   Scenario: Submit metrics returns "Payload accepted" response
     Given new "SubmitMetrics" request
-    And body with value {"series": [{"metric": "system.load.1", "type": "gauge", "points": [[1600348600, 1.1]], "tags": ["test:{{ unique_alnum }}"]}]}
+    And body with value {"series": [{"metric": "system.load.1", "type": "gauge", "points": [[{{ timestamp("now") }}, 1.1]], "tags": ["test:{{ unique_alnum }}"]}]}
     When the request is sent
     Then the response status is 202 Payload accepted