Regenerate client from commit a82be8f8 of spec repo (#1085)

api-clients-generation-pipeline[bot] · ci.datadog-api-spec · web-flow · commit 49666cbbb8cb · 2022-07-20T12:09:38.000Z
Co-authored-by: ci.datadog-api-spec &lt;packages@datadoghq.com&gt;
Co-authored-by: api-clients-generation-pipeline[bot] &lt;54105614+api-clients-generation-pipeline[bot]@users.noreply.github.com&gt;
diff --git a/.apigentools-info b/.apigentools-info
@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.2",
-            "regenerated": "2022-07-19 16:28:26.812126",
-            "spec_repo_commit": "448d6aae"
+            "regenerated": "2022-07-20 11:53:31.747156",
+            "spec_repo_commit": "a82be8f8"
         },
         "v2": {
             "apigentools_version": "1.6.2",
-            "regenerated": "2022-07-19 16:28:26.832274",
-            "spec_repo_commit": "448d6aae"
+            "regenerated": "2022-07-20 11:53:31.792513",
+            "spec_repo_commit": "a82be8f8"
         }
     }
 }
diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml
@@ -6669,6 +6669,13 @@ components:
 
             aggregations.'
           type: string
+        metrics:
+          description: Group of target fields to aggregate over when using the new
+            value aggregations.
+          items:
+            description: Field.
+            type: string
+          type: array
         name:
           description: Name of the query.
           type: string
@@ -6715,6 +6722,13 @@ components:
 
             aggregations.'
           type: string
+        metrics:
+          description: Group of target fields to aggregate over when using the new
+            value aggregations.
+          items:
+            description: Field.
+            type: string
+          type: array
         name:
           description: Name of the query.
           type: string
diff --git a/examples/v2/security-monitoring/UpdateSecurityMonitoringRule.py b/examples/v2/security-monitoring/UpdateSecurityMonitoringRule.py
@@ -77,6 +77,7 @@
             aggregation=SecurityMonitoringRuleQueryAggregation("count"),
             distinct_fields=[],
             group_by_fields=[],
+            metrics=[],
         ),
     ],
     tags=[],
diff --git a/src/datadog_api_client/v2/model/security_monitoring_rule_query.py b/src/datadog_api_client/v2/model/security_monitoring_rule_query.py
@@ -21,6 +21,7 @@ def openapi_types(_):
             "distinct_fields": ([str],),
             "group_by_fields": ([str],),
             "metric": (str,),
+            "metrics": ([str],),
             "name": (str,),
             "query": (str,),
         }
@@ -30,6 +31,7 @@ def openapi_types(_):
         "distinct_fields": "distinctFields",
         "group_by_fields": "groupByFields",
         "metric": "metric",
+        "metrics": "metrics",
         "name": "name",
         "query": "query",
     }
@@ -51,6 +53,9 @@ def __init__(self, *args, **kwargs):
             aggregations.
         :type metric: str, optional
 
+        :param metrics: Group of target fields to aggregate over when using the new value aggregations.
+        :type metrics: [str], optional
+
         :param name: Name of the query.
         :type name: str, optional
 
diff --git a/src/datadog_api_client/v2/model/security_monitoring_rule_query_create.py b/src/datadog_api_client/v2/model/security_monitoring_rule_query_create.py
@@ -21,6 +21,7 @@ def openapi_types(_):
             "distinct_fields": ([str],),
             "group_by_fields": ([str],),
             "metric": (str,),
+            "metrics": ([str],),
             "name": (str,),
             "query": (str,),
         }
@@ -30,6 +31,7 @@ def openapi_types(_):
         "distinct_fields": "distinctFields",
         "group_by_fields": "groupByFields",
         "metric": "metric",
+        "metrics": "metrics",
         "name": "name",
         "query": "query",
     }
@@ -51,6 +53,9 @@ def __init__(self, query, *args, **kwargs):
             aggregations.
         :type metric: str, optional
 
+        :param metrics: Group of target fields to aggregate over when using the new value aggregations.
+        :type metrics: [str], optional
+
         :param name: Name of the query.
         :type name: str, optional
 
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -42,7 +42,6 @@ def pytest_terminal_summary(terminalreporter, exitstatus, config):
                 "%40test.service%3A{}%20%40ci.pipeline.id%3A{}&index=citest".format(dd_service, ci_pipeline_id)
             )
 
-
 except ImportError:
     if os.getenv("CI", "false") == "true" and RECORD == "none":
         raise
diff --git a/tests/v2/features/security_monitoring.feature b/tests/v2/features/security_monitoring.feature
@@ -298,22 +298,22 @@ Feature: Security Monitoring
   Scenario: Update an existing rule returns "Bad Request" response
     Given new "UpdateSecurityMonitoringRule" request
     And request contains "rule_id" parameter from "REPLACE.ME"
-    And body with value {"cases": [{"notifications": [], "status": "critical"}], "filters": [{"action": "require"}], "hasExtendedTitle": true, "options": {"decreaseCriticalityBasedOnEnv": false, "detectionMethod": "threshold", "evaluationWindow": 0, "hardcodedEvaluatorType": "log4shell", "impossibleTravelOptions": {"baselineUserLocations": true}, "keepAlive": 0, "maxSignalDuration": 0, "newValueOptions": {"forgetAfter": 1, "learningDuration": 0, "learningMethod": "duration", "learningThreshold": 0}}, "queries": [{"aggregation": "count", "distinctFields": [], "groupByFields": []}], "tags": [], "version": 1}
+    And body with value {"cases": [{"notifications": [], "status": "critical"}], "filters": [{"action": "require"}], "hasExtendedTitle": true, "options": {"decreaseCriticalityBasedOnEnv": false, "detectionMethod": "threshold", "evaluationWindow": 0, "hardcodedEvaluatorType": "log4shell", "impossibleTravelOptions": {"baselineUserLocations": true}, "keepAlive": 0, "maxSignalDuration": 0, "newValueOptions": {"forgetAfter": 1, "learningDuration": 0, "learningMethod": "duration", "learningThreshold": 0}}, "queries": [{"aggregation": "count", "distinctFields": [], "groupByFields": [], "metrics": []}], "tags": [], "version": 1}
     When the request is sent
     Then the response status is 400 Bad Request
 
   @generated @skip @team:DataDog/k9-cloud-security-platform
   Scenario: Update an existing rule returns "Not Found" response
     Given new "UpdateSecurityMonitoringRule" request
     And request contains "rule_id" parameter from "REPLACE.ME"
-    And body with value {"cases": [{"notifications": [], "status": "critical"}], "filters": [{"action": "require"}], "hasExtendedTitle": true, "options": {"decreaseCriticalityBasedOnEnv": false, "detectionMethod": "threshold", "evaluationWindow": 0, "hardcodedEvaluatorType": "log4shell", "impossibleTravelOptions": {"baselineUserLocations": true}, "keepAlive": 0, "maxSignalDuration": 0, "newValueOptions": {"forgetAfter": 1, "learningDuration": 0, "learningMethod": "duration", "learningThreshold": 0}}, "queries": [{"aggregation": "count", "distinctFields": [], "groupByFields": []}], "tags": [], "version": 1}
+    And body with value {"cases": [{"notifications": [], "status": "critical"}], "filters": [{"action": "require"}], "hasExtendedTitle": true, "options": {"decreaseCriticalityBasedOnEnv": false, "detectionMethod": "threshold", "evaluationWindow": 0, "hardcodedEvaluatorType": "log4shell", "impossibleTravelOptions": {"baselineUserLocations": true}, "keepAlive": 0, "maxSignalDuration": 0, "newValueOptions": {"forgetAfter": 1, "learningDuration": 0, "learningMethod": "duration", "learningThreshold": 0}}, "queries": [{"aggregation": "count", "distinctFields": [], "groupByFields": [], "metrics": []}], "tags": [], "version": 1}
     When the request is sent
     Then the response status is 404 Not Found
 
   @generated @skip @team:DataDog/k9-cloud-security-platform
   Scenario: Update an existing rule returns "OK" response
     Given new "UpdateSecurityMonitoringRule" request
     And request contains "rule_id" parameter from "REPLACE.ME"
-    And body with value {"cases": [{"notifications": [], "status": "critical"}], "filters": [{"action": "require"}], "hasExtendedTitle": true, "options": {"decreaseCriticalityBasedOnEnv": false, "detectionMethod": "threshold", "evaluationWindow": 0, "hardcodedEvaluatorType": "log4shell", "impossibleTravelOptions": {"baselineUserLocations": true}, "keepAlive": 0, "maxSignalDuration": 0, "newValueOptions": {"forgetAfter": 1, "learningDuration": 0, "learningMethod": "duration", "learningThreshold": 0}}, "queries": [{"aggregation": "count", "distinctFields": [], "groupByFields": []}], "tags": [], "version": 1}
+    And body with value {"cases": [{"notifications": [], "status": "critical"}], "filters": [{"action": "require"}], "hasExtendedTitle": true, "options": {"decreaseCriticalityBasedOnEnv": false, "detectionMethod": "threshold", "evaluationWindow": 0, "hardcodedEvaluatorType": "log4shell", "impossibleTravelOptions": {"baselineUserLocations": true}, "keepAlive": 0, "maxSignalDuration": 0, "newValueOptions": {"forgetAfter": 1, "learningDuration": 0, "learningMethod": "duration", "learningThreshold": 0}}, "queries": [{"aggregation": "count", "distinctFields": [], "groupByFields": [], "metrics": []}], "tags": [], "version": 1}
     When the request is sent
     Then the response status is 200 OK

Original file line number	Diff line number	Diff line change
`@@ -4,13 +4,13 @@`
`4`	`4`	`"spec_versions": {`
`5`	`5`	`"v1": {`
`6`	`6`	`"apigentools_version": "1.6.2",`
`7`		`- "regenerated": "2022-07-19 16:28:26.812126",`
`8`		`- "spec_repo_commit": "448d6aae"`
	`7`	`+ "regenerated": "2022-07-20 11:53:31.747156",`
	`8`	`+ "spec_repo_commit": "a82be8f8"`
`9`	`9`	`},`
`10`	`10`	`"v2": {`
`11`	`11`	`"apigentools_version": "1.6.2",`
`12`		`- "regenerated": "2022-07-19 16:28:26.832274",`
`13`		`- "spec_repo_commit": "448d6aae"`
	`12`	`+ "regenerated": "2022-07-20 11:53:31.792513",`
	`13`	`+ "spec_repo_commit": "a82be8f8"`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,6 @@ def pytest_terminal_summary(terminalreporter, exitstatus, config):`
`42`	`42`	`"%40test.service%3A{}%20%40ci.pipeline.id%3A{}&index=citest".format(dd_service, ci_pipeline_id)`
`43`	`43`	`)`
`44`	`44`
`45`		`-`
`46`	`45`	`except ImportError:`
`47`	`46`	`if os.getenv("CI", "false") == "true" and RECORD == "none":`
`48`	`47`	`raise`