[formulas and functions ] Change group_by from object -> list of obje…

…cts (#259) * Remove test that cannot pass anymore * Remove test that cannot pass anymore * Regenerate client from commit f02c467 of spec repo Co-authored-by: david.leonard <david.leonard@datadoghq.com> 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 <packages@datadoghq.com>
DataDog · Feb 3, 2021 · da7f071 · da7f071
1 parent d5b53e2
commit da7f071
Show file tree

Hide file tree

Showing 14 changed files with 65 additions and 64 deletions.
diff --git a/.apigentools-info b/.apigentools-info
@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.4.1.dev2",
-            "regenerated": "2021-02-02 08:32:00.975246",
-            "spec_repo_commit": "b631cfe"
+            "regenerated": "2021-02-03 08:38:50.447684",
+            "spec_repo_commit": "f02c467"
         },
         "v2": {
             "apigentools_version": "1.4.1.dev2",
-            "regenerated": "2021-02-02 08:32:31.680506",
-            "spec_repo_commit": "b631cfe"
+            "regenerated": "2021-02-03 08:39:28.168476",
+            "spec_repo_commit": "f02c467"
         }
     }
 }
diff --git a/docs/v1/FormulaAndFunctionQueryDefinition.md b/docs/v1/FormulaAndFunctionQueryDefinition.md
@@ -10,7 +10,7 @@ Name | Type | Description | Notes
 **metric** | **str** | Process metric name. | defaults to nulltype.Null
 **aggregator** | [**FormulaAndFunctionMetricAggregation**](FormulaAndFunctionMetricAggregation.md) |  | [optional] 
 **name** | **str** | Name of query for use in formulas. | [optional] 
-**group_by** | [**TimeSeriesFormulaAndFunctionEventQueryDefinitionGroupBy**](TimeSeriesFormulaAndFunctionEventQueryDefinitionGroupBy.md) |  | [optional] 
+**group_by** | [**[TimeSeriesFormulaAndFunctionEventQueryDefinitionGroupBy]**](TimeSeriesFormulaAndFunctionEventQueryDefinitionGroupBy.md) | Group by options. | [optional] 
 **indexes** | **[str]** | An array of index names to query in the stream. Omit or use &#x60;[]&#x60; to query all indexes at once. | [optional] 
 **search** | [**TimeSeriesFormulaAndFunctionEventQueryDefinitionSearch**](TimeSeriesFormulaAndFunctionEventQueryDefinitionSearch.md) |  | [optional] 
 **is_normalized_cpu** | **bool** | Whether to normalize the CPU percentages. | [optional] 

diff --git a/docs/v1/README.md b/docs/v1/README.md
@@ -629,8 +629,8 @@ Class | Method | HTTP request | Description
  - [TimeSeriesFormulaAndFunctionEventQueryDefinition](TimeSeriesFormulaAndFunctionEventQueryDefinition.md)
  - [TimeSeriesFormulaAndFunctionEventQueryDefinitionCompute](TimeSeriesFormulaAndFunctionEventQueryDefinitionCompute.md)
  - [TimeSeriesFormulaAndFunctionEventQueryDefinitionGroupBy](TimeSeriesFormulaAndFunctionEventQueryDefinitionGroupBy.md)
- - [TimeSeriesFormulaAndFunctionEventQueryDefinitionGroupBySort](TimeSeriesFormulaAndFunctionEventQueryDefinitionGroupBySort.md)
  - [TimeSeriesFormulaAndFunctionEventQueryDefinitionSearch](TimeSeriesFormulaAndFunctionEventQueryDefinitionSearch.md)
+ - [TimeSeriesFormulaAndFunctionEventQueryDefinitionSort](TimeSeriesFormulaAndFunctionEventQueryDefinitionSort.md)
  - [TimeSeriesFormulaAndFunctionMetricQueryDefinition](TimeSeriesFormulaAndFunctionMetricQueryDefinition.md)
  - [TimeSeriesFormulaAndFunctionProcessQueryDefinition](TimeSeriesFormulaAndFunctionProcessQueryDefinition.md)
  - [TimeseriesWidgetDefinition](TimeseriesWidgetDefinition.md)

diff --git a/docs/v1/TimeSeriesFormulaAndFunctionEventQueryDefinition.md b/docs/v1/TimeSeriesFormulaAndFunctionEventQueryDefinition.md
@@ -6,7 +6,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **compute** | [**TimeSeriesFormulaAndFunctionEventQueryDefinitionCompute**](TimeSeriesFormulaAndFunctionEventQueryDefinitionCompute.md) |  | 
 **data_source** | [**FormulaAndFunctionEventsDataSource**](FormulaAndFunctionEventsDataSource.md) |  | 
-**group_by** | [**TimeSeriesFormulaAndFunctionEventQueryDefinitionGroupBy**](TimeSeriesFormulaAndFunctionEventQueryDefinitionGroupBy.md) |  | [optional] 
+**group_by** | [**[TimeSeriesFormulaAndFunctionEventQueryDefinitionGroupBy]**](TimeSeriesFormulaAndFunctionEventQueryDefinitionGroupBy.md) | Group by options. | [optional] 
 **indexes** | **[str]** | An array of index names to query in the stream. Omit or use &#x60;[]&#x60; to query all indexes at once. | [optional] 
 **name** | **str** | Name of the query for use in formulas. | [optional] 
 **search** | [**TimeSeriesFormulaAndFunctionEventQueryDefinitionSearch**](TimeSeriesFormulaAndFunctionEventQueryDefinitionSearch.md) |  | [optional] 

diff --git a/docs/v1/TimeSeriesFormulaAndFunctionEventQueryDefinitionGroupBy.md b/docs/v1/TimeSeriesFormulaAndFunctionEventQueryDefinitionGroupBy.md
@@ -1,12 +1,12 @@
 # TimeSeriesFormulaAndFunctionEventQueryDefinitionGroupBy
 
-Group by options.
+List of objects used to group by.
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **facet** | **str** | Event facet. | 
 **limit** | **int** | Number of groups to return. | [optional] 
-**sort** | [**TimeSeriesFormulaAndFunctionEventQueryDefinitionGroupBySort**](TimeSeriesFormulaAndFunctionEventQueryDefinitionGroupBySort.md) |  | [optional] 
+**sort** | [**TimeSeriesFormulaAndFunctionEventQueryDefinitionSort**](TimeSeriesFormulaAndFunctionEventQueryDefinitionSort.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)
 

diff --git a/...unctionEventQueryDefinitionGroupBySort.md → ...ulaAndFunctionEventQueryDefinitionSort.md b/...unctionEventQueryDefinitionGroupBySort.md → ...ulaAndFunctionEventQueryDefinitionSort.md
@@ -1,4 +1,4 @@
-# TimeSeriesFormulaAndFunctionEventQueryDefinitionGroupBySort
+# TimeSeriesFormulaAndFunctionEventQueryDefinitionSort
 
 Options for sorting group by results.
 ## Properties

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
@@ -190,7 +190,7 @@ def __init__(self, *args, **kwargs):  # noqa: E501
                                 _visited_composed_classes = (Animal,)
             aggregator (FormulaAndFunctionMetricAggregation): [optional]  # noqa: E501
             name (str): Name of query for use in formulas.. [optional]  # noqa: E501
-            group_by (TimeSeriesFormulaAndFunctionEventQueryDefinitionGroupBy): [optional]  # noqa: E501
+            group_by ([TimeSeriesFormulaAndFunctionEventQueryDefinitionGroupBy]): 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 (TimeSeriesFormulaAndFunctionEventQueryDefinitionSearch): [optional]  # noqa: E501
             is_normalized_cpu (bool): Whether to normalize the CPU percentages.. [optional]  # noqa: E501

diff --git a/src/datadog_api_client/v1/model/time_series_formula_and_function_event_query_definition.py b/src/datadog_api_client/v1/model/time_series_formula_and_function_event_query_definition.py
@@ -94,7 +94,7 @@ def openapi_types():
         return {
             "compute": (TimeSeriesFormulaAndFunctionEventQueryDefinitionCompute,),  # noqa: E501
             "data_source": (FormulaAndFunctionEventsDataSource,),  # noqa: E501
-            "group_by": (TimeSeriesFormulaAndFunctionEventQueryDefinitionGroupBy,),  # noqa: E501
+            "group_by": ([TimeSeriesFormulaAndFunctionEventQueryDefinitionGroupBy],),  # noqa: E501
             "indexes": ([str],),  # noqa: E501
             "name": (str,),  # noqa: E501
             "search": (TimeSeriesFormulaAndFunctionEventQueryDefinitionSearch,),  # noqa: E501
@@ -165,7 +165,7 @@ def __init__(self, compute, data_source, *args, **kwargs):  # noqa: E501
                                 Animal class but this time we won't travel
                                 through its discriminator because we passed in
                                 _visited_composed_classes = (Animal,)
-            group_by (TimeSeriesFormulaAndFunctionEventQueryDefinitionGroupBy): [optional]  # noqa: E501
+            group_by ([TimeSeriesFormulaAndFunctionEventQueryDefinitionGroupBy]): 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 (TimeSeriesFormulaAndFunctionEventQueryDefinitionSearch): [optional]  # noqa: E501

diff --git a/...g_api_client/v1/model/time_series_formula_and_function_event_query_definition_group_by.py b/...g_api_client/v1/model/time_series_formula_and_function_event_query_definition_group_by.py
@@ -25,13 +25,13 @@
 
 
 def lazy_import():
-    from datadog_api_client.v1.model.time_series_formula_and_function_event_query_definition_group_by_sort import (
-        TimeSeriesFormulaAndFunctionEventQueryDefinitionGroupBySort,
+    from datadog_api_client.v1.model.time_series_formula_and_function_event_query_definition_sort import (
+        TimeSeriesFormulaAndFunctionEventQueryDefinitionSort,
     )
 
     globals()[
-        "TimeSeriesFormulaAndFunctionEventQueryDefinitionGroupBySort"
-    ] = TimeSeriesFormulaAndFunctionEventQueryDefinitionGroupBySort
+        "TimeSeriesFormulaAndFunctionEventQueryDefinitionSort"
+    ] = TimeSeriesFormulaAndFunctionEventQueryDefinitionSort
 
 
 class TimeSeriesFormulaAndFunctionEventQueryDefinitionGroupBy(ModelNormal):
@@ -80,7 +80,7 @@ def openapi_types():
         return {
             "facet": (str,),  # noqa: E501
             "limit": (int,),  # noqa: E501
-            "sort": (TimeSeriesFormulaAndFunctionEventQueryDefinitionGroupBySort,),  # noqa: E501
+            "sort": (TimeSeriesFormulaAndFunctionEventQueryDefinitionSort,),  # noqa: E501
         }
 
     @cached_property
@@ -145,7 +145,7 @@ def __init__(self, facet, *args, **kwargs):  # noqa: E501
                                 through its discriminator because we passed in
                                 _visited_composed_classes = (Animal,)
             limit (int): Number of groups to return.. [optional]  # noqa: E501
-            sort (TimeSeriesFormulaAndFunctionEventQueryDefinitionGroupBySort): [optional]  # noqa: E501
+            sort (TimeSeriesFormulaAndFunctionEventQueryDefinitionSort): [optional]  # noqa: E501
         """
 
         _check_type = kwargs.pop("_check_type", True)

diff --git a/...n_event_query_definition_group_by_sort.py → ...d_function_event_query_definition_sort.py b/...n_event_query_definition_group_by_sort.py → ...d_function_event_query_definition_sort.py
@@ -34,7 +34,7 @@ def lazy_import():
     globals()["QuerySortOrder"] = QuerySortOrder
 
 
-class TimeSeriesFormulaAndFunctionEventQueryDefinitionGroupBySort(ModelNormal):
+class TimeSeriesFormulaAndFunctionEventQueryDefinitionSort(ModelNormal):
     """NOTE: This class is auto generated by OpenAPI Generator.
     Ref: https://openapi-generator.tech
 
@@ -110,7 +110,7 @@ def discriminator():
 
     @convert_js_args_to_python_args
     def __init__(self, aggregation, *args, **kwargs):  # noqa: E501
-        """TimeSeriesFormulaAndFunctionEventQueryDefinitionGroupBySort - a model defined in OpenAPI
+        """TimeSeriesFormulaAndFunctionEventQueryDefinitionSort - a model defined in OpenAPI
 
         Args:
             aggregation (FormulaAndFunctionEventAggregation):

diff --git a/src/datadog_api_client/v1/models/__init__.py b/src/datadog_api_client/v1/models/__init__.py
@@ -406,12 +406,12 @@
 from datadog_api_client.v1.model.time_series_formula_and_function_event_query_definition_group_by import (
     TimeSeriesFormulaAndFunctionEventQueryDefinitionGroupBy,
 )
-from datadog_api_client.v1.model.time_series_formula_and_function_event_query_definition_group_by_sort import (
-    TimeSeriesFormulaAndFunctionEventQueryDefinitionGroupBySort,
-)
 from datadog_api_client.v1.model.time_series_formula_and_function_event_query_definition_search import (
     TimeSeriesFormulaAndFunctionEventQueryDefinitionSearch,
 )
+from datadog_api_client.v1.model.time_series_formula_and_function_event_query_definition_sort import (
+    TimeSeriesFormulaAndFunctionEventQueryDefinitionSort,
+)
 from datadog_api_client.v1.model.time_series_formula_and_function_metric_query_definition import (
     TimeSeriesFormulaAndFunctionMetricQueryDefinition,
 )

diff --git a/src/datadog_api_client/v1/openapi.yaml b/src/datadog_api_client/v1/openapi.yaml
@@ -7605,34 +7605,37 @@ components:
           $ref: '#/components/schemas/FormulaAndFunctionEventsDataSource'
         group_by:
           description: Group by options.
-          properties:
-            facet:
-              description: Event facet.
-              example: status.
-              type: string
-            limit:
-              description: Number of groups to return.
-              example: 10
-              format: int64
-              type: integer
-            sort:
-              description: Options for sorting group by results.
-              properties:
-                aggregation:
-                  $ref: '#/components/schemas/FormulaAndFunctionEventAggregation'
-                metric:
-                  description: Metric used for sorting group by results.
-                  type: string
-                order:
-                  $ref: '#/components/schemas/QuerySortOrder'
-                type:
-                  $ref: '#/components/schemas/FormulaAndFunctionEventsSortType'
-              required:
-              - aggregation
-              type: object
-          required:
-          - facet
-          type: object
+          items:
+            description: List of objects used to group by.
+            properties:
+              facet:
+                description: Event facet.
+                example: status.
+                type: string
+              limit:
+                description: Number of groups to return.
+                example: 10
+                format: int64
+                type: integer
+              sort:
+                description: Options for sorting group by results.
+                properties:
+                  aggregation:
+                    $ref: '#/components/schemas/FormulaAndFunctionEventAggregation'
+                  metric:
+                    description: Metric used for sorting group by results.
+                    type: string
+                  order:
+                    $ref: '#/components/schemas/QuerySortOrder'
+                  type:
+                    $ref: '#/components/schemas/FormulaAndFunctionEventsSortType'
+                required:
+                - aggregation
+                type: object
+            required:
+            - facet
+            type: object
+          type: array
         indexes:
           description: An array of index names to query in the stream. Omit or use
             `[]` to query all indexes at once.

diff --git a/tests/v1/test_time_series_formula_and_function_event_query_definition_group_by.py b/tests/v1/test_time_series_formula_and_function_event_query_definition_group_by.py
@@ -7,13 +7,11 @@
 import unittest
 
 import datadog_api_client.v1
-from datadog_api_client.v1.model.time_series_formula_and_function_event_query_definition_group_by_sort import (
-    TimeSeriesFormulaAndFunctionEventQueryDefinitionGroupBySort,
+from datadog_api_client.v1.model.time_series_formula_and_function_event_query_definition_sort import (
+    TimeSeriesFormulaAndFunctionEventQueryDefinitionSort,
 )
 
-globals()[
-    "TimeSeriesFormulaAndFunctionEventQueryDefinitionGroupBySort"
-] = TimeSeriesFormulaAndFunctionEventQueryDefinitionGroupBySort
+globals()["TimeSeriesFormulaAndFunctionEventQueryDefinitionSort"] = TimeSeriesFormulaAndFunctionEventQueryDefinitionSort
 from datadog_api_client.v1.model.time_series_formula_and_function_event_query_definition_group_by import (
     TimeSeriesFormulaAndFunctionEventQueryDefinitionGroupBy,
 )

diff --git a/...n_event_query_definition_group_by_sort.py → ...d_function_event_query_definition_sort.py b/...n_event_query_definition_group_by_sort.py → ...d_function_event_query_definition_sort.py
@@ -14,24 +14,24 @@
 globals()["FormulaAndFunctionEventAggregation"] = FormulaAndFunctionEventAggregation
 globals()["FormulaAndFunctionEventsSortType"] = FormulaAndFunctionEventsSortType
 globals()["QuerySortOrder"] = QuerySortOrder
-from datadog_api_client.v1.model.time_series_formula_and_function_event_query_definition_group_by_sort import (
-    TimeSeriesFormulaAndFunctionEventQueryDefinitionGroupBySort,
+from datadog_api_client.v1.model.time_series_formula_and_function_event_query_definition_sort import (
+    TimeSeriesFormulaAndFunctionEventQueryDefinitionSort,
 )
 
 
-class TestTimeSeriesFormulaAndFunctionEventQueryDefinitionGroupBySort(unittest.TestCase):
-    """TimeSeriesFormulaAndFunctionEventQueryDefinitionGroupBySort unit test stubs"""
+class TestTimeSeriesFormulaAndFunctionEventQueryDefinitionSort(unittest.TestCase):
+    """TimeSeriesFormulaAndFunctionEventQueryDefinitionSort unit test stubs"""
 
     def setUp(self):
         pass
 
     def tearDown(self):
         pass
 
-    def testTimeSeriesFormulaAndFunctionEventQueryDefinitionGroupBySort(self):
-        """Test TimeSeriesFormulaAndFunctionEventQueryDefinitionGroupBySort"""
+    def testTimeSeriesFormulaAndFunctionEventQueryDefinitionSort(self):
+        """Test TimeSeriesFormulaAndFunctionEventQueryDefinitionSort"""
         # FIXME: construct object with mandatory attributes with example values
-        # model = TimeSeriesFormulaAndFunctionEventQueryDefinitionGroupBySort()  # noqa: E501
+        # model = TimeSeriesFormulaAndFunctionEventQueryDefinitionSort()  # noqa: E501
         pass