Remove unused facilities (#1109)

therve · web-flow · commit cf4baf0145e1 · 2022-07-26T15:36:19.000+02:00
* Remove unused facilities

We don't support discriminator or allOf/anyOf for now, let's remove
support code for it.

* Fix doc build
diff --git a/.generator/src/generator/templates/model_oneof.j2 b/.generator/src/generator/templates/model_oneof.j2
@@ -44,8 +44,6 @@ class {{ name }}(ModelComposed):
 {%- endfor %}
 {%- endif %}
         return {
-            "anyOf": [],
-            "allOf": [],
             "oneOf": [
             {%- for ref in get_oneof_types(model) %}
                 {{ ref }},
diff --git a/.generator/src/generator/templates/model_utils.j2 b/.generator/src/generator/templates/model_utils.j2
diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -1,3 +1,4 @@
 Sphinx
 sphinx_material
 m2r2
+docutils<0.19
diff --git a/src/datadog_api_client/model_utils.py b/src/datadog_api_client/model_utils.py
diff --git a/src/datadog_api_client/v1/model/distribution_widget_histogram_request_query.py b/src/datadog_api_client/v1/model/distribution_widget_histogram_request_query.py
@@ -93,8 +93,6 @@ def _composed_schemas(_):
         )
 
         return {
-            "anyOf": [],
-            "allOf": [],
             "oneOf": [
                 FormulaAndFunctionMetricQueryDefinition,
                 FormulaAndFunctionEventQueryDefinition,
diff --git a/src/datadog_api_client/v1/model/formula_and_function_query_definition.py b/src/datadog_api_client/v1/model/formula_and_function_query_definition.py
@@ -120,8 +120,6 @@ def _composed_schemas(_):
         )
 
         return {
-            "anyOf": [],
-            "allOf": [],
             "oneOf": [
                 FormulaAndFunctionMetricQueryDefinition,
                 FormulaAndFunctionEventQueryDefinition,
diff --git a/src/datadog_api_client/v1/model/logs_processor.py b/src/datadog_api_client/v1/model/logs_processor.py
@@ -128,8 +128,6 @@ def _composed_schemas(_):
         from datadog_api_client.v1.model.logs_trace_remapper import LogsTraceRemapper
 
         return {
-            "anyOf": [],
-            "allOf": [],
             "oneOf": [
                 LogsGrokParser,
                 LogsDateRemapper,
diff --git a/src/datadog_api_client/v1/model/monitor_formula_and_function_query_definition.py b/src/datadog_api_client/v1/model/monitor_formula_and_function_query_definition.py
@@ -60,8 +60,6 @@ def _composed_schemas(_):
         )
 
         return {
-            "anyOf": [],
-            "allOf": [],
             "oneOf": [
                 MonitorFormulaAndFunctionEventQueryDefinition,
             ],
diff --git a/src/datadog_api_client/v1/model/notebook_cell_create_request_attributes.py b/src/datadog_api_client/v1/model/notebook_cell_create_request_attributes.py
@@ -58,8 +58,6 @@ def _composed_schemas(_):
         from datadog_api_client.v1.model.notebook_log_stream_cell_attributes import NotebookLogStreamCellAttributes
 
         return {
-            "anyOf": [],
-            "allOf": [],
             "oneOf": [
                 NotebookMarkdownCellAttributes,
                 NotebookTimeseriesCellAttributes,
diff --git a/src/datadog_api_client/v1/model/notebook_cell_response_attributes.py b/src/datadog_api_client/v1/model/notebook_cell_response_attributes.py
@@ -58,8 +58,6 @@ def _composed_schemas(_):
         from datadog_api_client.v1.model.notebook_log_stream_cell_attributes import NotebookLogStreamCellAttributes
 
         return {
-            "anyOf": [],
-            "allOf": [],
             "oneOf": [
                 NotebookMarkdownCellAttributes,
                 NotebookTimeseriesCellAttributes,
diff --git a/src/datadog_api_client/v1/model/notebook_cell_time.py b/src/datadog_api_client/v1/model/notebook_cell_time.py
@@ -56,8 +56,6 @@ def _composed_schemas(_):
         from datadog_api_client.v1.model.notebook_absolute_time import NotebookAbsoluteTime
 
         return {
-            "anyOf": [],
-            "allOf": [],
             "oneOf": [
                 NotebookRelativeTime,
                 NotebookAbsoluteTime,
diff --git a/src/datadog_api_client/v1/model/notebook_cell_update_request_attributes.py b/src/datadog_api_client/v1/model/notebook_cell_update_request_attributes.py
@@ -58,8 +58,6 @@ def _composed_schemas(_):
         from datadog_api_client.v1.model.notebook_log_stream_cell_attributes import NotebookLogStreamCellAttributes
 
         return {
-            "anyOf": [],
-            "allOf": [],
             "oneOf": [
                 NotebookMarkdownCellAttributes,
                 NotebookTimeseriesCellAttributes,
diff --git a/src/datadog_api_client/v1/model/notebook_global_time.py b/src/datadog_api_client/v1/model/notebook_global_time.py
@@ -53,8 +53,6 @@ def _composed_schemas(_):
         from datadog_api_client.v1.model.notebook_absolute_time import NotebookAbsoluteTime
 
         return {
-            "anyOf": [],
-            "allOf": [],
             "oneOf": [
                 NotebookRelativeTime,
                 NotebookAbsoluteTime,
diff --git a/src/datadog_api_client/v1/model/notebook_update_cell.py b/src/datadog_api_client/v1/model/notebook_update_cell.py
@@ -52,8 +52,6 @@ def _composed_schemas(_):
         from datadog_api_client.v1.model.notebook_cell_update_request import NotebookCellUpdateRequest
 
         return {
-            "anyOf": [],
-            "allOf": [],
             "oneOf": [
                 NotebookCellCreateRequest,
                 NotebookCellUpdateRequest,
diff --git a/src/datadog_api_client/v1/model/sunburst_widget_legend.py b/src/datadog_api_client/v1/model/sunburst_widget_legend.py
@@ -52,8 +52,6 @@ def _composed_schemas(_):
         )
 
         return {
-            "anyOf": [],
-            "allOf": [],
             "oneOf": [
                 SunburstWidgetLegendTable,
                 SunburstWidgetLegendInlineAutomatic,
diff --git a/src/datadog_api_client/v1/model/synthetics_assertion.py b/src/datadog_api_client/v1/model/synthetics_assertion.py
@@ -54,8 +54,6 @@ def _composed_schemas(_):
         from datadog_api_client.v1.model.synthetics_assertion_json_path_target import SyntheticsAssertionJSONPathTarget
 
         return {
-            "anyOf": [],
-            "allOf": [],
             "oneOf": [
                 SyntheticsAssertionTarget,
                 SyntheticsAssertionJSONPathTarget,
diff --git a/src/datadog_api_client/v1/model/synthetics_basic_auth.py b/src/datadog_api_client/v1/model/synthetics_basic_auth.py
@@ -72,8 +72,6 @@ def _composed_schemas(_):
         from datadog_api_client.v1.model.synthetics_basic_auth_ntlm import SyntheticsBasicAuthNTLM
 
         return {
-            "anyOf": [],
-            "allOf": [],
             "oneOf": [
                 SyntheticsBasicAuthWeb,
                 SyntheticsBasicAuthSigv4,
diff --git a/src/datadog_api_client/v1/model/widget_definition.py b/src/datadog_api_client/v1/model/widget_definition.py
@@ -364,8 +364,6 @@ def _composed_schemas(_):
         from datadog_api_client.v1.model.funnel_widget_definition import FunnelWidgetDefinition
 
         return {
-            "anyOf": [],
-            "allOf": [],
             "oneOf": [
                 AlertGraphWidgetDefinition,
                 AlertValueWidgetDefinition,
diff --git a/src/datadog_api_client/v2/model/api_key_response_included_item.py b/src/datadog_api_client/v2/model/api_key_response_included_item.py
@@ -52,8 +52,6 @@ def _composed_schemas(_):
         from datadog_api_client.v2.model.user import User
 
         return {
-            "anyOf": [],
-            "allOf": [],
             "oneOf": [
                 User,
             ],
diff --git a/src/datadog_api_client/v2/model/application_key_response_included_item.py b/src/datadog_api_client/v2/model/application_key_response_included_item.py
@@ -53,8 +53,6 @@ def _composed_schemas(_):
         from datadog_api_client.v2.model.role import Role
 
         return {
-            "anyOf": [],
-            "allOf": [],
             "oneOf": [
                 User,
                 Role,
diff --git a/src/datadog_api_client/v2/model/authn_mapping_included.py b/src/datadog_api_client/v2/model/authn_mapping_included.py
@@ -53,8 +53,6 @@ def _composed_schemas(_):
         from datadog_api_client.v2.model.role import Role
 
         return {
-            "anyOf": [],
-            "allOf": [],
             "oneOf": [
                 SAMLAssertionAttribute,
                 Role,
diff --git a/src/datadog_api_client/v2/model/incident_field_attributes.py b/src/datadog_api_client/v2/model/incident_field_attributes.py
@@ -51,8 +51,6 @@ def _composed_schemas(_):
         )
 
         return {
-            "anyOf": [],
-            "allOf": [],
             "oneOf": [
                 IncidentFieldAttributesSingleValue,
                 IncidentFieldAttributesMultipleValue,
diff --git a/src/datadog_api_client/v2/model/incident_response_included_item.py b/src/datadog_api_client/v2/model/incident_response_included_item.py
@@ -52,8 +52,6 @@ def _composed_schemas(_):
         from datadog_api_client.v2.model.user import User
 
         return {
-            "anyOf": [],
-            "allOf": [],
             "oneOf": [
                 User,
             ],
diff --git a/src/datadog_api_client/v2/model/incident_service_included_items.py b/src/datadog_api_client/v2/model/incident_service_included_items.py
@@ -52,8 +52,6 @@ def _composed_schemas(_):
         from datadog_api_client.v2.model.user import User
 
         return {
-            "anyOf": [],
-            "allOf": [],
             "oneOf": [
                 User,
             ],
diff --git a/src/datadog_api_client/v2/model/incident_team_included_items.py b/src/datadog_api_client/v2/model/incident_team_included_items.py
@@ -52,8 +52,6 @@ def _composed_schemas(_):
         from datadog_api_client.v2.model.user import User
 
         return {
-            "anyOf": [],
-            "allOf": [],
             "oneOf": [
                 User,
             ],
diff --git a/src/datadog_api_client/v2/model/incident_timeline_cell_create_attributes.py b/src/datadog_api_client/v2/model/incident_timeline_cell_create_attributes.py
@@ -51,8 +51,6 @@ def _composed_schemas(_):
         )
 
         return {
-            "anyOf": [],
-            "allOf": [],
             "oneOf": [
                 IncidentTimelineCellMarkdownCreateAttributes,
             ],
diff --git a/src/datadog_api_client/v2/model/logs_aggregate_bucket_value.py b/src/datadog_api_client/v2/model/logs_aggregate_bucket_value.py
@@ -42,8 +42,6 @@ def _composed_schemas(_):
         )
 
         return {
-            "anyOf": [],
-            "allOf": [],
             "oneOf": [
                 str,
                 float,
diff --git a/src/datadog_api_client/v2/model/logs_archive_create_request_destination.py b/src/datadog_api_client/v2/model/logs_archive_create_request_destination.py
@@ -63,8 +63,6 @@ def _composed_schemas(_):
         from datadog_api_client.v2.model.logs_archive_destination_s3 import LogsArchiveDestinationS3
 
         return {
-            "anyOf": [],
-            "allOf": [],
             "oneOf": [
                 LogsArchiveDestinationAzure,
                 LogsArchiveDestinationGCS,
diff --git a/src/datadog_api_client/v2/model/logs_archive_destination.py b/src/datadog_api_client/v2/model/logs_archive_destination.py
@@ -66,8 +66,6 @@ def _composed_schemas(_):
         from datadog_api_client.v2.model.logs_archive_destination_s3 import LogsArchiveDestinationS3
 
         return {
-            "anyOf": [],
-            "allOf": [],
             "oneOf": [
                 LogsArchiveDestinationAzure,
                 LogsArchiveDestinationGCS,
diff --git a/src/datadog_api_client/v2/model/logs_group_by_missing.py b/src/datadog_api_client/v2/model/logs_group_by_missing.py
@@ -38,8 +38,6 @@ def _composed_schemas(_):
         # classes don't exist yet because their module has not finished
         # loading
         return {
-            "anyOf": [],
-            "allOf": [],
             "oneOf": [
                 str,
                 float,
diff --git a/src/datadog_api_client/v2/model/logs_group_by_total.py b/src/datadog_api_client/v2/model/logs_group_by_total.py
@@ -38,8 +38,6 @@ def _composed_schemas(_):
         # classes don't exist yet because their module has not finished
         # loading
         return {
-            "anyOf": [],
-            "allOf": [],
             "oneOf": [
                 bool,
                 str,
diff --git a/src/datadog_api_client/v2/model/metric_volumes.py b/src/datadog_api_client/v2/model/metric_volumes.py
@@ -50,8 +50,6 @@ def _composed_schemas(_):
         from datadog_api_client.v2.model.metric_ingested_indexed_volume import MetricIngestedIndexedVolume
 
         return {
-            "anyOf": [],
-            "allOf": [],
             "oneOf": [
                 MetricDistinctVolume,
                 MetricIngestedIndexedVolume,
diff --git a/src/datadog_api_client/v2/model/metrics_and_metric_tag_configurations.py b/src/datadog_api_client/v2/model/metrics_and_metric_tag_configurations.py
@@ -50,8 +50,6 @@ def _composed_schemas(_):
         from datadog_api_client.v2.model.metric_tag_configuration import MetricTagConfiguration
 
         return {
-            "anyOf": [],
-            "allOf": [],
             "oneOf": [
                 Metric,
                 MetricTagConfiguration,
diff --git a/src/datadog_api_client/v2/model/rum_aggregate_bucket_value.py b/src/datadog_api_client/v2/model/rum_aggregate_bucket_value.py
@@ -40,8 +40,6 @@ def _composed_schemas(_):
         from datadog_api_client.v2.model.rum_aggregate_bucket_value_timeseries import RUMAggregateBucketValueTimeseries
 
         return {
-            "anyOf": [],
-            "allOf": [],
             "oneOf": [
                 str,
                 float,
diff --git a/src/datadog_api_client/v2/model/rum_group_by_missing.py b/src/datadog_api_client/v2/model/rum_group_by_missing.py
@@ -38,8 +38,6 @@ def _composed_schemas(_):
         # classes don't exist yet because their module has not finished
         # loading
         return {
-            "anyOf": [],
-            "allOf": [],
             "oneOf": [
                 str,
                 float,
diff --git a/src/datadog_api_client/v2/model/rum_group_by_total.py b/src/datadog_api_client/v2/model/rum_group_by_total.py
@@ -38,8 +38,6 @@ def _composed_schemas(_):
         # classes don't exist yet because their module has not finished
         # loading
         return {
-            "anyOf": [],
-            "allOf": [],
             "oneOf": [
                 bool,
                 str,
diff --git a/src/datadog_api_client/v2/model/user_response_included_item.py b/src/datadog_api_client/v2/model/user_response_included_item.py
@@ -54,8 +54,6 @@ def _composed_schemas(_):
         from datadog_api_client.v2.model.role import Role
 
         return {
-            "anyOf": [],
-            "allOf": [],
             "oneOf": [
                 Organization,
                 Permission,

-Original file line number
+Diff line change
@@ @@ -1,3 +1,4 @@ @@
 Sphinx
 sphinx_material
 m2r2
 +docutils<0.19
Original file line number	Diff line number	Diff line change
`@@ -93,8 +93,6 @@ def _composed_schemas(_):`
`93`	`93`	`)`
`94`	`94`
`95`	`95`	`return {`
`96`		`- "anyOf": [],`
`97`		`- "allOf": [],`
`98`	`96`	`"oneOf": [`
`99`	`97`	`FormulaAndFunctionMetricQueryDefinition,`
`100`	`98`	`FormulaAndFunctionEventQueryDefinition,`
Original file line number	Diff line number	Diff line change
`@@ -120,8 +120,6 @@ def _composed_schemas(_):`
`120`	`120`	`)`
`121`	`121`
`122`	`122`	`return {`
`123`		`- "anyOf": [],`
`124`		`- "allOf": [],`
`125`	`123`	`"oneOf": [`
`126`	`124`	`FormulaAndFunctionMetricQueryDefinition,`
`127`	`125`	`FormulaAndFunctionEventQueryDefinition,`
Original file line number	Diff line number	Diff line change
`@@ -60,8 +60,6 @@ def _composed_schemas(_):`
`60`	`60`	`)`
`61`	`61`
`62`	`62`	`return {`
`63`		`- "anyOf": [],`
`64`		`- "allOf": [],`
`65`	`63`	`"oneOf": [`
`66`	`64`	`MonitorFormulaAndFunctionEventQueryDefinition,`
`67`	`65`	`],`