From 0ec3a12fd2e2cac11bae8b85ed5f1c53d3dc23ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Herv=C3=A9?= Date: Mon, 13 Jun 2022 13:21:30 +0200 Subject: [PATCH] Don't build models for nullable (#1046) While technically it works because of a trick in the new method, it's a bit confusing when the method needs extra arguments. --- .generator/src/generator/formatter.py | 1 + examples/v1/notebooks/CreateNotebook.py | 3 +-- examples/v1/notebooks/UpdateNotebook.py | 3 +-- examples/v2/incidents/UpdateIncident_1009194038.py | 3 +-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.generator/src/generator/formatter.py b/.generator/src/generator/formatter.py index 3a2f39bcb5..41c865cc5a 100644 --- a/.generator/src/generator/formatter.py +++ b/.generator/src/generator/formatter.py @@ -191,6 +191,7 @@ def format_data_with_schema( else: if schema.get("nullable") and data is None: parameters = repr(data) + return parameters, imports else: def format_datetime(x): diff --git a/examples/v1/notebooks/CreateNotebook.py b/examples/v1/notebooks/CreateNotebook.py index 52568d0ef9..1ca6cdc4d9 100644 --- a/examples/v1/notebooks/CreateNotebook.py +++ b/examples/v1/notebooks/CreateNotebook.py @@ -6,7 +6,6 @@ from datadog_api_client.v1.api.notebooks_api import NotebooksApi from datadog_api_client.v1.model.notebook_cell_create_request import NotebookCellCreateRequest from datadog_api_client.v1.model.notebook_cell_resource_type import NotebookCellResourceType -from datadog_api_client.v1.model.notebook_cell_time import NotebookCellTime from datadog_api_client.v1.model.notebook_create_data import NotebookCreateData from datadog_api_client.v1.model.notebook_create_data_attributes import NotebookCreateDataAttributes from datadog_api_client.v1.model.notebook_create_request import NotebookCreateRequest @@ -67,7 +66,7 @@ keys=[], tags=[], ), - time=NotebookCellTime(None), + time=None, ), type=NotebookCellResourceType("notebook_cells"), ), diff --git a/examples/v1/notebooks/UpdateNotebook.py b/examples/v1/notebooks/UpdateNotebook.py index 411dcc32f8..2708eda972 100644 --- a/examples/v1/notebooks/UpdateNotebook.py +++ b/examples/v1/notebooks/UpdateNotebook.py @@ -7,7 +7,6 @@ from datadog_api_client.v1.api.notebooks_api import NotebooksApi from datadog_api_client.v1.model.notebook_cell_create_request import NotebookCellCreateRequest from datadog_api_client.v1.model.notebook_cell_resource_type import NotebookCellResourceType -from datadog_api_client.v1.model.notebook_cell_time import NotebookCellTime from datadog_api_client.v1.model.notebook_graph_size import NotebookGraphSize from datadog_api_client.v1.model.notebook_markdown_cell_attributes import NotebookMarkdownCellAttributes from datadog_api_client.v1.model.notebook_markdown_cell_definition import NotebookMarkdownCellDefinition @@ -71,7 +70,7 @@ keys=[], tags=[], ), - time=NotebookCellTime(None), + time=None, ), type=NotebookCellResourceType("notebook_cells"), ), diff --git a/examples/v2/incidents/UpdateIncident_1009194038.py b/examples/v2/incidents/UpdateIncident_1009194038.py index c568863fa2..72e36416e8 100644 --- a/examples/v2/incidents/UpdateIncident_1009194038.py +++ b/examples/v2/incidents/UpdateIncident_1009194038.py @@ -10,7 +10,6 @@ from datadog_api_client.v2.model.incident_update_relationships import IncidentUpdateRelationships from datadog_api_client.v2.model.incident_update_request import IncidentUpdateRequest from datadog_api_client.v2.model.nullable_relationship_to_user import NullableRelationshipToUser -from datadog_api_client.v2.model.nullable_relationship_to_user_data import NullableRelationshipToUserData # there is a valid "incident" in the system INCIDENT_DATA_ID = environ["INCIDENT_DATA_ID"] @@ -21,7 +20,7 @@ type=IncidentType("incidents"), relationships=IncidentUpdateRelationships( commander_user=NullableRelationshipToUser( - data=NullableRelationshipToUserData(None), + data=None, ), ), ),