[formulas and functions] Make query name required

.apigentools-info

@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.4.1.dev8",
-            "regenerated": "2021-03-08 08:27:26.096501",
-            "spec_repo_commit": "317577f"
+            "regenerated": "2021-03-08 11:24:06.929024",
+            "spec_repo_commit": "a75da1e"
         },
         "v2": {
             "apigentools_version": "1.4.1.dev8",
-            "regenerated": "2021-03-08 08:27:59.020071",
-            "spec_repo_commit": "317577f"
+            "regenerated": "2021-03-08 11:24:44.205548",
+            "spec_repo_commit": "a75da1e"
         }
     }
 }

docs/v1/FormulaAndFunctionEventQueryDefinition.md

@@ -6,9 +6,9 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **compute** | [**FormulaAndFunctionEventQueryDefinitionCompute**](FormulaAndFunctionEventQueryDefinitionCompute.md) |  | 
 **data_source** | [**FormulaAndFunctionEventsDataSource**](FormulaAndFunctionEventsDataSource.md) |  | 
+**name** | **str** | Name of the query for use in formulas. | 
 **group_by** | [**[FormulaAndFunctionEventQueryGroupBy]**](FormulaAndFunctionEventQueryGroupBy.md) | Group by options. | [optional] 
 **indexes** | **[str]** | An array of index names to query in the stream. Omit or use `[]` to query all indexes at once. | [optional] 
-**name** | **str** | Name of the query for use in formulas. | [optional] 
 **search** | [**FormulaAndFunctionEventQueryDefinitionSearch**](FormulaAndFunctionEventQueryDefinitionSearch.md) |  | [optional] 
 
 [[Back to Model list]](README.md#documentation-for-models) [[Back to API list]](README.md#documentation-for-api-endpoints) [[Back to README]](README.md)

docs/v1/FormulaAndFunctionMetricQueryDefinition.md

@@ -5,9 +5,9 @@ A formula and functions metrics query.
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **data_source** | [**FormulaAndFunctionMetricDataSource**](FormulaAndFunctionMetricDataSource.md) |  | 
+**name** | **str** | Name of the query for use in formulas. | 
 **query** | **str** | Metrics query definition. | 
 **aggregator** | [**FormulaAndFunctionMetricAggregation**](FormulaAndFunctionMetricAggregation.md) |  | [optional] 
-**name** | **str** | Name of the query for use in formulas. | [optional] 
 
 [[Back to Model list]](README.md#documentation-for-models) [[Back to API list]](README.md#documentation-for-api-endpoints) [[Back to README]](README.md)
 

docs/v1/FormulaAndFunctionProcessQueryDefinition.md

@@ -6,10 +6,10 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **data_source** | [**FormulaAndFunctionProcessQueryDataSource**](FormulaAndFunctionProcessQueryDataSource.md) |  | 
 **metric** | **str** | Process metric name. | 
+**name** | **str** | Name of query for use in formulas. | 
 **aggregator** | [**FormulaAndFunctionMetricAggregation**](FormulaAndFunctionMetricAggregation.md) |  | [optional] 
 **is_normalized_cpu** | **bool** | Whether to normalize the CPU percentages. | [optional] 
 **limit** | **int** | Number of hits to return. | [optional] 
-**name** | **str** | Name of query for use in formulas. | [optional] 
 **sort** | [**QuerySortOrder**](QuerySortOrder.md) |  | [optional] 
 **tag_filters** | **[str]** | An array of tags to filter by. | [optional] 
 **text_filter** | **str** | Text to use as filter. | [optional] 

docs/v1/FormulaAndFunctionQueryDefinition.md

@@ -5,7 +5,6 @@ A formula and function query.
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **aggregator** | [**FormulaAndFunctionMetricAggregation**](FormulaAndFunctionMetricAggregation.md) |  | [optional] 
-**name** | **str** | Name of query for use in formulas. | [optional] 
 **group_by** | [**[FormulaAndFunctionEventQueryGroupBy]**](FormulaAndFunctionEventQueryGroupBy.md) | Group by options. | [optional] 
 **indexes** | **[str]** | An array of index names to query in the stream. Omit or use `[]` to query all indexes at once. | [optional] 
 **search** | [**FormulaAndFunctionEventQueryDefinitionSearch**](FormulaAndFunctionEventQueryDefinitionSearch.md) |  | [optional] 
@@ -15,6 +14,7 @@ Name | Type | Description | Notes
 **tag_filters** | **[str]** | An array of tags to filter by. | [optional] 
 **text_filter** | **str** | Text to use as filter. | [optional] 
 **data_source** | [**FormulaAndFunctionProcessQueryDataSource**](FormulaAndFunctionProcessQueryDataSource.md) |  | [optional] 
+**name** | **str** | Name of query for use in formulas. | [optional] 
 **query** | **str** | Metrics query definition. | [optional] 
 **compute** | [**FormulaAndFunctionEventQueryDefinitionCompute**](FormulaAndFunctionEventQueryDefinitionCompute.md) |  | [optional] 
 **metric** | **str** | Process metric name. | [optional] 

src/datadog_api_client/v1/model/formula_and_function_event_query_definition.py

@@ -86,9 +86,9 @@ def openapi_types():
         return {
             "compute": (FormulaAndFunctionEventQueryDefinitionCompute,),  # noqa: E501
             "data_source": (FormulaAndFunctionEventsDataSource,),  # noqa: E501
+            "name": (str,),  # noqa: E501
             "group_by": ([FormulaAndFunctionEventQueryGroupBy],),  # noqa: E501
             "indexes": ([str],),  # noqa: E501
-            "name": (str,),  # noqa: E501
             "search": (FormulaAndFunctionEventQueryDefinitionSearch,),  # noqa: E501
         }
 
@@ -99,9 +99,9 @@ def discriminator():
     attribute_map = {
         "compute": "compute",  # noqa: E501
         "data_source": "data_source",  # noqa: E501
+        "name": "name",  # noqa: E501
         "group_by": "group_by",  # noqa: E501
         "indexes": "indexes",  # noqa: E501
-        "name": "name",  # noqa: E501
         "search": "search",  # noqa: E501
     }
 
@@ -119,12 +119,13 @@ def discriminator():
     )
 
     @convert_js_args_to_python_args
-    def __init__(self, compute, data_source, *args, **kwargs):  # noqa: E501
+    def __init__(self, compute, data_source, name, *args, **kwargs):  # noqa: E501
         """FormulaAndFunctionEventQueryDefinition - a model defined in OpenAPI
 
         Args:
             compute (FormulaAndFunctionEventQueryDefinitionCompute):
             data_source (FormulaAndFunctionEventsDataSource):
+            name (str): Name of the query for use in formulas.
 
         Keyword Args:
             _check_type (bool): if True, values for parameters in openapi_types
@@ -159,7 +160,6 @@ def __init__(self, compute, data_source, *args, **kwargs):  # noqa: E501
                                 _visited_composed_classes = (Animal,)
             group_by ([FormulaAndFunctionEventQueryGroupBy]): Group by options.. [optional]  # noqa: E501
             indexes ([str]): An array of index names to query in the stream. Omit or use `[]` to query all indexes at once.. [optional]  # noqa: E501
-            name (str): Name of the query for use in formulas.. [optional]  # noqa: E501
             search (FormulaAndFunctionEventQueryDefinitionSearch): [optional]  # noqa: E501
         """
 
@@ -189,6 +189,7 @@ def __init__(self, compute, data_source, *args, **kwargs):  # noqa: E501
 
         self.compute = compute
         self.data_source = data_source
+        self.name = name
         for var_name, var_value in kwargs.items():
             if (
                 var_name not in self.attribute_map

src/datadog_api_client/v1/model/formula_and_function_metric_query_definition.py

@@ -75,9 +75,9 @@ def openapi_types():
         lazy_import()
         return {
             "data_source": (FormulaAndFunctionMetricDataSource,),  # noqa: E501
+            "name": (str,),  # noqa: E501
             "query": (str,),  # noqa: E501
             "aggregator": (FormulaAndFunctionMetricAggregation,),  # noqa: E501
-            "name": (str,),  # noqa: E501
         }
 
     @cached_property
@@ -86,9 +86,9 @@ def discriminator():
 
     attribute_map = {
         "data_source": "data_source",  # noqa: E501
+        "name": "name",  # noqa: E501
         "query": "query",  # noqa: E501
         "aggregator": "aggregator",  # noqa: E501
-        "name": "name",  # noqa: E501
     }
 
     _composed_schemas = {}
@@ -105,11 +105,12 @@ def discriminator():
     )
 
     @convert_js_args_to_python_args
-    def __init__(self, data_source, query, *args, **kwargs):  # noqa: E501
+    def __init__(self, data_source, name, query, *args, **kwargs):  # noqa: E501
         """FormulaAndFunctionMetricQueryDefinition - a model defined in OpenAPI
 
         Args:
             data_source (FormulaAndFunctionMetricDataSource):
+            name (str): Name of the query for use in formulas.
             query (str): Metrics query definition.
 
         Keyword Args:
@@ -144,7 +145,6 @@ def __init__(self, data_source, query, *args, **kwargs):  # noqa: E501
                                 through its discriminator because we passed in
                                 _visited_composed_classes = (Animal,)
             aggregator (FormulaAndFunctionMetricAggregation): [optional]  # noqa: E501
-            name (str): Name of the query for use in formulas.. [optional]  # noqa: E501
         """
 
         _check_type = kwargs.pop("_check_type", True)
@@ -172,6 +172,7 @@ def __init__(self, data_source, query, *args, **kwargs):  # noqa: E501
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
 
         self.data_source = data_source
+        self.name = name
         self.query = query
         for var_name, var_value in kwargs.items():
             if (

src/datadog_api_client/v1/model/formula_and_function_process_query_definition.py

@@ -80,10 +80,10 @@ def openapi_types():
         return {
             "data_source": (FormulaAndFunctionProcessQueryDataSource,),  # noqa: E501
             "metric": (str,),  # noqa: E501
+            "name": (str,),  # noqa: E501
             "aggregator": (FormulaAndFunctionMetricAggregation,),  # noqa: E501
             "is_normalized_cpu": (bool,),  # noqa: E501
             "limit": (int,),  # noqa: E501
-            "name": (str,),  # noqa: E501
             "sort": (QuerySortOrder,),  # noqa: E501
             "tag_filters": ([str],),  # noqa: E501
             "text_filter": (str,),  # noqa: E501
@@ -96,10 +96,10 @@ def discriminator():
     attribute_map = {
         "data_source": "data_source",  # noqa: E501
         "metric": "metric",  # noqa: E501
+        "name": "name",  # noqa: E501
         "aggregator": "aggregator",  # noqa: E501
         "is_normalized_cpu": "is_normalized_cpu",  # noqa: E501
         "limit": "limit",  # noqa: E501
-        "name": "name",  # noqa: E501
         "sort": "sort",  # noqa: E501
         "tag_filters": "tag_filters",  # noqa: E501
         "text_filter": "text_filter",  # noqa: E501
@@ -119,12 +119,13 @@ def discriminator():
     )
 
     @convert_js_args_to_python_args
-    def __init__(self, data_source, metric, *args, **kwargs):  # noqa: E501
+    def __init__(self, data_source, metric, name, *args, **kwargs):  # noqa: E501
         """FormulaAndFunctionProcessQueryDefinition - a model defined in OpenAPI
 
         Args:
             data_source (FormulaAndFunctionProcessQueryDataSource):
             metric (str): Process metric name.
+            name (str): Name of query for use in formulas.
 
         Keyword Args:
             _check_type (bool): if True, values for parameters in openapi_types
@@ -160,7 +161,6 @@ def __init__(self, data_source, metric, *args, **kwargs):  # noqa: E501
             aggregator (FormulaAndFunctionMetricAggregation): [optional]  # noqa: E501
             is_normalized_cpu (bool): Whether to normalize the CPU percentages.. [optional]  # noqa: E501
             limit (int): Number of hits to return.. [optional]  # noqa: E501
-            name (str): Name of query for use in formulas.. [optional]  # noqa: E501
             sort (QuerySortOrder): [optional]  # noqa: E501
             tag_filters ([str]): An array of tags to filter by.. [optional]  # noqa: E501
             text_filter (str): Text to use as filter.. [optional]  # noqa: E501
@@ -192,6 +192,7 @@ def __init__(self, data_source, metric, *args, **kwargs):  # noqa: E501
 
         self.data_source = data_source
         self.metric = metric
+        self.name = name
         for var_name, var_value in kwargs.items():
             if (
                 var_name not in self.attribute_map

src/datadog_api_client/v1/model/formula_and_function_query_definition.py

@@ -175,7 +175,6 @@ def __init__(self, *args, **kwargs):  # noqa: E501
                                 through its discriminator because we passed in
                                 _visited_composed_classes = (Animal,)
             aggregator (FormulaAndFunctionMetricAggregation): [optional]  # noqa: E501
-            name (str): Name of query for use in formulas.. [optional]  # noqa: E501
             group_by ([FormulaAndFunctionEventQueryGroupBy]): Group by options.. [optional]  # noqa: E501
             indexes ([str]): An array of index names to query in the stream. Omit or use `[]` to query all indexes at once.. [optional]  # noqa: E501
             search (FormulaAndFunctionEventQueryDefinitionSearch): [optional]  # noqa: E501
@@ -185,6 +184,7 @@ def __init__(self, *args, **kwargs):  # noqa: E501
             tag_filters ([str]): An array of tags to filter by.. [optional]  # noqa: E501
             text_filter (str): Text to use as filter.. [optional]  # noqa: E501
             data_source (FormulaAndFunctionProcessQueryDataSource): [optional]  # noqa: E501
+            name (str): Name of query for use in formulas.. [optional]  # noqa: E501
             query (str): Metrics query definition.. [optional]  # noqa: E501
             compute (FormulaAndFunctionEventQueryDefinitionCompute): [optional]  # noqa: E501
             metric (str): Process metric name.. [optional]  # noqa: E501

src/datadog_api_client/v1/openapi.yaml

@@ -1657,6 +1657,7 @@ components:
       required:
       - data_source
       - compute
+      - name
       type: object
     FormulaAndFunctionEventQueryGroupBy:
       description: List of objects used to group by.
@@ -1753,6 +1754,7 @@ components:
       required:
       - data_source
       - query
+      - name
       type: object
     FormulaAndFunctionProcessQueryDataSource:
       description: Data sources that rely on the process backend.
@@ -1783,6 +1785,7 @@ components:
           type: string
         name:
           description: Name of query for use in formulas.
+          example: query_errors
           type: string
         sort:
           $ref: '#/components/schemas/QuerySortOrder'
@@ -1798,6 +1801,7 @@ components:
       required:
       - data_source
       - metric
+      - name
       type: object
     FormulaAndFunctionQueryDefinition:
       description: A formula and function query.