Merge master into datadog-api-spec/test/bruce.tu/DBNBK-116-Extend-Widget.TIME-schema

Author: api-clients-generation-pipeline[bot]

.apigentools-info

@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2024-08-27 12:12:27.969266",
-            "spec_repo_commit": "09daef2e"
+            "regenerated": "2024-08-29 20:02:03.124770",
+            "spec_repo_commit": "518ca9df"
         },
         "v2": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2024-08-27 12:12:27.987178",
-            "spec_repo_commit": "09daef2e"
+            "regenerated": "2024-08-29 20:02:03.141872",
+            "spec_repo_commit": "518ca9df"
         }
     }
 }

.generator/schemas/v1/openapi.yaml

@@ -6725,9 +6725,10 @@ components:
             be pulled from the [Roles API](https://docs.datadoghq.com/api/latest/roles/#list-roles)
             and are located in the `data.id` field. Editing a monitor includes any
             updates to the monitor configuration, monitor deletion, and muting of
-            the monitor for any amount of time. `restricted_roles` is the successor
-            of `locked`. For more information about `locked` and `restricted_roles`,
-            see the [monitor options docs](https://docs.datadoghq.com/monitors/guide/monitor_api_options/#permissions-options).
+            the monitor for any amount of time. You can use the [Restriction Policies
+            API](https://docs.datadoghq.com/api/latest/restriction-policies/) to manage
+            write authorization for individual monitors by teams and users, in addition
+            to roles.
           items:
             description: A role UUID.
             type: string

.generator/src/generator/templates/model_utils.j2

@@ -1373,8 +1373,11 @@ def model_to_dict(model_instance, serialize=True):
     result = {}
 
     model_instances = [model_instance]
-    if model_instance._composed_schemas:
-        model_instances.extend(model_instance._composed_instances)
+    model = model_instance
+    while model._composed_schemas:
+        model_instances.extend(model._composed_instances)
+        model = model.get_oneof_instance()
+
     seen_json_attribute_names = set()
     used_fallback_python_attribute_names = set()
     py_to_json_map = {}

examples/v2/service-level-objectives/CreateSLOReportJob.py

@@ -2,6 +2,8 @@
 Create a new SLO report returns "OK" response
 """
 
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
 from datadog_api_client import ApiClient, Configuration
 from datadog_api_client.v2.api.service_level_objectives_api import ServiceLevelObjectivesApi
 from datadog_api_client.v2.model.slo_report_create_request import SloReportCreateRequest
@@ -12,8 +14,8 @@
 body = SloReportCreateRequest(
     data=SloReportCreateRequestData(
         attributes=SloReportCreateRequestAttributes(
-            from_ts=1690901870,
-            to_ts=1706803070,
+            from_ts=int((datetime.now() + relativedelta(days=-40)).timestamp()),
+            to_ts=int(datetime.now().timestamp()),
             query='slo_type:metric "SLO Reporting Test"',
             interval=SLOReportInterval.MONTHLY,
             timezone="America/New_York",

src/datadog_api_client/model_utils.py

@@ -1387,8 +1387,11 @@ def model_to_dict(model_instance, serialize=True):
     result = {}
 
     model_instances = [model_instance]
-    if model_instance._composed_schemas:
-        model_instances.extend(model_instance._composed_instances)
+    model = model_instance
+    while model._composed_schemas:
+        model_instances.extend(model._composed_instances)
+        model = model.get_oneof_instance()
+
     seen_json_attribute_names = set()
     used_fallback_python_attribute_names = set()
     py_to_json_map = {}

src/datadog_api_client/v1/model/monitor.py

@@ -147,7 +147,7 @@ def __init__(
         :param query: The monitor query.
         :type query: str
 
-        :param restricted_roles: A list of unique role identifiers to define which roles are allowed to edit the monitor. The unique identifiers for all roles can be pulled from the `Roles API <https://docs.datadoghq.com/api/latest/roles/#list-roles>`_ and are located in the ``data.id`` field. Editing a monitor includes any updates to the monitor configuration, monitor deletion, and muting of the monitor for any amount of time. ``restricted_roles`` is the successor of ``locked``. For more information about ``locked`` and ``restricted_roles`` , see the `monitor options docs <https://docs.datadoghq.com/monitors/guide/monitor_api_options/#permissions-options>`_.
+        :param restricted_roles: A list of unique role identifiers to define which roles are allowed to edit the monitor. The unique identifiers for all roles can be pulled from the `Roles API <https://docs.datadoghq.com/api/latest/roles/#list-roles>`_ and are located in the ``data.id`` field. Editing a monitor includes any updates to the monitor configuration, monitor deletion, and muting of the monitor for any amount of time. You can use the `Restriction Policies API <https://docs.datadoghq.com/api/latest/restriction-policies/>`_ to manage write authorization for individual monitors by teams and users, in addition to roles.
         :type restricted_roles: [str], none_type, optional
 
         :param state: Wrapper object with the different monitor states.

tests/v2/cassettes/test_scenarios/test_create_a_new_slo_report_returns_bad_request_response.frozen

@@ -1 +1 @@
-2024-04-18T20:09:43.575Z
+2024-08-29T19:53:50.818Z

tests/v2/cassettes/test_scenarios/test_create_a_new_slo_report_returns_bad_request_response.yaml

@@ -1,7 +1,7 @@
 interactions:
 - request:
-    body: '{"data":{"attributes":{"from_ts":1690901870,"interval":"bad-interval","query":"slo_type:metric
-      \"SLO Reporting Test\"","to_ts":1706803070}}}'
+    body: '{"data":{"attributes":{"from_ts":1721505230,"interval":"bad-interval","query":"slo_type:metric
+      \"SLO Reporting Test\"","to_ts":1724961230}}}'
     headers:
       accept:
       - application/json

tests/v2/cassettes/test_scenarios/test_create_a_new_slo_report_returns_ok_response.frozen

@@ -1 +1 @@
-2024-04-18T20:09:43.729Z
+2024-08-29T19:53:50.962Z

tests/v2/cassettes/test_scenarios/test_create_a_new_slo_report_returns_ok_response.yaml

@@ -1,7 +1,7 @@
 interactions:
 - request:
-    body: '{"data":{"attributes":{"from_ts":1690901870,"interval":"monthly","query":"slo_type:metric
-      \"SLO Reporting Test\"","timezone":"America/New_York","to_ts":1706803070}}}'
+    body: '{"data":{"attributes":{"from_ts":1721505230,"interval":"monthly","query":"slo_type:metric
+      \"SLO Reporting Test\"","timezone":"America/New_York","to_ts":1724961230}}}'
     headers:
       accept:
       - application/json
@@ -11,7 +11,7 @@ interactions:
     uri: https://api.datadoghq.com/api/v2/slo/report
   response:
     body:
-      string: '{"data":{"id":"98c67bea-fdbf-11ee-8a01-bfd37432018b","type":"report_id"}}'
+      string: '{"data":{"id":"69cfaa02-6640-11ef-8501-33b2b403f044","type":"report_id"}}'
     headers:
       content-type:
       - application/vnd.api+json