[AAWF-463] Fix github merge script

.apigentools-info

@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2025-06-09 14:45:37.430557",
-            "spec_repo_commit": "79e7c933"
+            "regenerated": "2025-06-10 18:30:43.274891",
+            "spec_repo_commit": "ce39f017"
         },
         "v2": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2025-06-09 14:45:37.519358",
-            "spec_repo_commit": "79e7c933"
+            "regenerated": "2025-06-10 18:30:43.297080",
+            "spec_repo_commit": "ce39f017"
         }
     }
 }

tests/v2/cassettes/test_scenarios/test_create_a_monitor_notification_rule_returns_bad_request_response.frozen

@@ -1 +1 @@
-2025-04-03T20:58:02.871Z
+2025-04-10T10:29:43.940Z

tests/v2/cassettes/test_scenarios/test_create_a_monitor_notification_rule_returns_bad_request_response.yaml

@@ -1,6 +1,6 @@
 interactions:
 - request:
-    body: '{"data":{"attributes":{"filter":{"tags":["test:test-create_a_monitor_notification_rule_returns_bad_request_response-1743713882","host:abc"]},"name":"test
+    body: '{"data":{"attributes":{"filter":{"tags":["test:test-create_a_monitor_notification_rule_returns_bad_request_response-1744280983","host:abc"]},"name":"test
       rule","recipients":["@slack-test-channel","@jira-test"]},"type":"monitor-notification-rule"}}'
     headers:
       accept:

tests/v2/cassettes/test_scenarios/test_create_a_monitor_notification_rule_returns_ok_response.frozen

@@ -1 +1 @@
-2025-04-03T20:58:03.005Z
+2025-04-10T10:29:44.273Z

tests/v2/cassettes/test_scenarios/test_create_a_monitor_notification_rule_returns_ok_response.yaml

@@ -1,6 +1,6 @@
 interactions:
 - request:
-    body: '{"data":{"attributes":{"filter":{"tags":["test:test-create_a_monitor_notification_rule_returns_ok_response-1743713883"]},"name":"test
+    body: '{"data":{"attributes":{"filter":{"tags":["test:test-create_a_monitor_notification_rule_returns_ok_response-1744280984"]},"name":"test
       rule","recipients":["slack-test-channel","jira-test"]},"type":"monitor-notification-rule"}}'
     headers:
       accept:
@@ -11,8 +11,8 @@ interactions:
     uri: https://api.datadoghq.com/api/v2/monitor/notification_rule
   response:
     body:
-      string: '{"data":{"type":"monitor-notification-rule","id":"55959a04-463a-4579-8386-8c2ca120aa52","attributes":{"creator_uuid":"3ad549bf-eba0-11e9-a77a-0705486660d0","filter":{"tags":["test:test-create_a_monitor_notification_rule_returns_ok_response-1743713883"]},"created_at":"2025-04-03T20:58:03.137650+00:00","recipients":["slack-test-channel","jira-test"],"name":"test
-        rule","modified_at":"1970-01-01T00:00:00+00:00"}}}
+      string: '{"data":{"type":"monitor-notification-rule","attributes":{"filter":{"tags":["test:test-create_a_monitor_notification_rule_returns_ok_response-1744280984"]},"recipients":["slack-test-channel","jira-test"],"name":"test
+        rule","created_at":"2025-04-10T10:29:44.595607+00:00","modified_at":"1970-01-01T00:00:00+00:00"},"id":"a3323ef6-2a04-4ef9-8de8-cbcff5c3c203","relationships":{"created_by":{"data":{"type":"users","id":"3ad549bf-eba0-11e9-a77a-0705486660d0"}}}},"included":[{"type":"users","id":"3ad549bf-eba0-11e9-a77a-0705486660d0","attributes":{"name":"frog","handle":"frog@datadoghq.com","created_at":"2019-10-02T08:15:39.795051+00:00","modified_at":"2025-04-07T20:19:46.118466+00:00","email":"frog@datadoghq.com","icon":"https://secure.gravatar.com/avatar/28a16dfe36e73b60c1d55872cb0f1172?s=48&d=retro","title":null,"verified":true,"service_account":false,"disabled":false,"allowed_login_methods":[],"status":"Active"}}]}
 
         '
     headers:
@@ -27,7 +27,7 @@ interactions:
       accept:
       - '*/*'
     method: DELETE
-    uri: https://api.datadoghq.com/api/v2/monitor/notification_rule/55959a04-463a-4579-8386-8c2ca120aa52
+    uri: https://api.datadoghq.com/api/v2/monitor/notification_rule/a3323ef6-2a04-4ef9-8de8-cbcff5c3c203
   response:
     body:
       string: ''

tests/v2/cassettes/test_scenarios/test_delete_a_monitor_notification_rule_returns_not_found_response.frozen

@@ -1 +1 @@
-2025-04-03T20:58:03.324Z
+2025-04-10T10:29:46.694Z

tests/v2/cassettes/test_scenarios/test_delete_a_monitor_notification_rule_returns_not_found_response.yaml

@@ -8,7 +8,7 @@ interactions:
     uri: https://api.datadoghq.com/api/v2/monitor/notification_rule/00000000-0000-1234-0000-000000000000
   response:
     body:
-      string: '{"errors":["Monitor notification rule not found"]}'
+      string: '{"errors":["Monitor Notification Rule not found"]}'
     headers:
       content-type:
       - application/json

tests/v2/cassettes/test_scenarios/test_delete_a_monitor_notification_rule_returns_ok_response.frozen

@@ -1 +1 @@
-2025-04-03T20:58:03.428Z
+2025-04-10T10:29:47.053Z

tests/v2/cassettes/test_scenarios/test_delete_a_monitor_notification_rule_returns_ok_response.yaml

@@ -1,6 +1,6 @@
 interactions:
 - request:
-    body: '{"data":{"attributes":{"filter":{"tags":["app:test-delete_a_monitor_notification_rule_returns_ok_response-1743713883"]},"name":"test
+    body: '{"data":{"attributes":{"filter":{"tags":["app:test-delete_a_monitor_notification_rule_returns_ok_response-1744280987"]},"name":"test
       rule","recipients":["slack-monitor-app"]},"type":"monitor-notification-rule"}}'
     headers:
       accept:
@@ -11,8 +11,8 @@ interactions:
     uri: https://api.datadoghq.com/api/v2/monitor/notification_rule
   response:
     body:
-      string: '{"data":{"type":"monitor-notification-rule","id":"cef4c2c7-27b3-4259-9bdd-ec434b4a8a0e","attributes":{"creator_uuid":"3ad549bf-eba0-11e9-a77a-0705486660d0","name":"test
-        rule","created_at":"2025-04-03T20:58:03.555501+00:00","modified_at":"1970-01-01T00:00:00+00:00","filter":{"tags":["app:test-delete_a_monitor_notification_rule_returns_ok_response-1743713883"]},"recipients":["slack-monitor-app"]}}}
+      string: '{"data":{"type":"monitor-notification-rule","relationships":{"created_by":{"data":{"type":"users","id":"3ad549bf-eba0-11e9-a77a-0705486660d0"}}},"attributes":{"filter":{"tags":["app:test-delete_a_monitor_notification_rule_returns_ok_response-1744280987"]},"created_at":"2025-04-10T10:29:47.326243+00:00","name":"test
+        rule","recipients":["slack-monitor-app"],"modified_at":"1970-01-01T00:00:00+00:00"},"id":"66e399af-c07e-414d-b4f2-93e196d7b7b7"},"included":[{"type":"users","id":"3ad549bf-eba0-11e9-a77a-0705486660d0","attributes":{"name":"frog","handle":"frog@datadoghq.com","created_at":"2019-10-02T08:15:39.795051+00:00","modified_at":"2025-04-07T20:19:46.118466+00:00","email":"frog@datadoghq.com","icon":"https://secure.gravatar.com/avatar/28a16dfe36e73b60c1d55872cb0f1172?s=48&d=retro","title":null,"verified":true,"service_account":false,"disabled":false,"allowed_login_methods":[],"status":"Active"}}]}
 
         '
     headers:
@@ -27,7 +27,7 @@ interactions:
       accept:
       - '*/*'
     method: DELETE
-    uri: https://api.datadoghq.com/api/v2/monitor/notification_rule/cef4c2c7-27b3-4259-9bdd-ec434b4a8a0e
+    uri: https://api.datadoghq.com/api/v2/monitor/notification_rule/66e399af-c07e-414d-b4f2-93e196d7b7b7
   response:
     body:
       string: ''
@@ -43,10 +43,10 @@ interactions:
       accept:
       - '*/*'
     method: DELETE
-    uri: https://api.datadoghq.com/api/v2/monitor/notification_rule/cef4c2c7-27b3-4259-9bdd-ec434b4a8a0e
+    uri: https://api.datadoghq.com/api/v2/monitor/notification_rule/66e399af-c07e-414d-b4f2-93e196d7b7b7
   response:
     body:
-      string: '{"errors":["Monitor notification rule not found"]}'
+      string: '{"errors":["Monitor Notification Rule not found"]}'
     headers:
       content-type:
       - application/json

tests/v2/cassettes/test_scenarios/test_get_a_monitor_notification_rule_returns_not_found_response.frozen

@@ -1 +1 @@
-2025-04-03T20:58:03.884Z
+2025-04-10T10:29:52.213Z

tests/v2/cassettes/test_scenarios/test_get_a_monitor_notification_rule_returns_not_found_response.yaml

@@ -8,7 +8,7 @@ interactions:
     uri: https://api.datadoghq.com/api/v2/monitor/notification_rule/00000000-0000-1234-0000-000000000000
   response:
     body:
-      string: '{"errors":["Monitor notification rule not found"]}'
+      string: '{"errors":["Monitor Notification Rule not found"]}'
     headers:
       content-type:
       - application/json

tests/v2/cassettes/test_scenarios/test_get_a_monitor_notification_rule_returns_ok_response.frozen

@@ -1 +1 @@
-2025-04-03T20:58:04.007Z
+2025-04-10T10:29:52.537Z

tests/v2/cassettes/test_scenarios/test_get_a_monitor_notification_rule_returns_ok_response.yaml

@@ -1,6 +1,6 @@
 interactions:
 - request:
-    body: '{"data":{"attributes":{"filter":{"tags":["app:test-get_a_monitor_notification_rule_returns_ok_response-1743713884"]},"name":"test
+    body: '{"data":{"attributes":{"filter":{"tags":["app:test-get_a_monitor_notification_rule_returns_ok_response-1744280992"]},"name":"test
       rule","recipients":["slack-monitor-app"]},"type":"monitor-notification-rule"}}'
     headers:
       accept:
@@ -11,8 +11,8 @@ interactions:
     uri: https://api.datadoghq.com/api/v2/monitor/notification_rule
   response:
     body:
-      string: '{"data":{"type":"monitor-notification-rule","attributes":{"filter":{"tags":["app:test-get_a_monitor_notification_rule_returns_ok_response-1743713884"]},"created_at":"2025-04-03T20:58:04.156763+00:00","recipients":["slack-monitor-app"],"modified_at":"1970-01-01T00:00:00+00:00","creator_uuid":"3ad549bf-eba0-11e9-a77a-0705486660d0","name":"test
-        rule"},"id":"8e0ab047-d891-476c-8fb1-da4d80ddc129"}}
+      string: '{"data":{"type":"monitor-notification-rule","attributes":{"created_at":"2025-04-10T10:29:52.938158+00:00","filter":{"tags":["app:test-get_a_monitor_notification_rule_returns_ok_response-1744280992"]},"recipients":["slack-monitor-app"],"name":"test
+        rule","modified_at":"1970-01-01T00:00:00+00:00"},"id":"97afb4ac-6953-445f-9a0a-d225673449a6","relationships":{"created_by":{"data":{"type":"users","id":"3ad549bf-eba0-11e9-a77a-0705486660d0"}}}},"included":[{"type":"users","id":"3ad549bf-eba0-11e9-a77a-0705486660d0","attributes":{"name":"frog","handle":"frog@datadoghq.com","created_at":"2019-10-02T08:15:39.795051+00:00","modified_at":"2025-04-07T20:19:46.118466+00:00","email":"frog@datadoghq.com","icon":"https://secure.gravatar.com/avatar/28a16dfe36e73b60c1d55872cb0f1172?s=48&d=retro","title":null,"verified":true,"service_account":false,"disabled":false,"allowed_login_methods":[],"status":"Active"}}]}
 
         '
     headers:
@@ -27,11 +27,11 @@ interactions:
       accept:
       - application/json
     method: GET
-    uri: https://api.datadoghq.com/api/v2/monitor/notification_rule/8e0ab047-d891-476c-8fb1-da4d80ddc129
+    uri: https://api.datadoghq.com/api/v2/monitor/notification_rule/97afb4ac-6953-445f-9a0a-d225673449a6
   response:
     body:
-      string: '{"data":{"type":"monitor-notification-rule","attributes":{"creator_uuid":"3ad549bf-eba0-11e9-a77a-0705486660d0","name":"test
-        rule","created_at":"2025-04-03T20:58:04.156763+00:00","recipients":["slack-monitor-app"],"modified_at":"2025-04-03T20:58:04.164001+00:00","filter":{"tags":["app:test-get_a_monitor_notification_rule_returns_ok_response-1743713884"]}},"id":"8e0ab047-d891-476c-8fb1-da4d80ddc129"}}
+      string: '{"data":{"type":"monitor-notification-rule","attributes":{"name":"test
+        rule","created_at":"2025-04-10T10:29:52.938158+00:00","recipients":["slack-monitor-app"],"filter":{"tags":["app:test-get_a_monitor_notification_rule_returns_ok_response-1744280992"]},"modified_at":"2025-04-10T10:29:52.948837+00:00"},"id":"97afb4ac-6953-445f-9a0a-d225673449a6"}}
 
         '
     headers:
@@ -46,7 +46,7 @@ interactions:
       accept:
       - '*/*'
     method: DELETE
-    uri: https://api.datadoghq.com/api/v2/monitor/notification_rule/8e0ab047-d891-476c-8fb1-da4d80ddc129
+    uri: https://api.datadoghq.com/api/v2/monitor/notification_rule/97afb4ac-6953-445f-9a0a-d225673449a6
   response:
     body:
       string: ''

tests/v2/cassettes/test_scenarios/test_get_all_monitor_notification_rules_returns_ok_response.frozen

@@ -1 +1 @@
-2025-04-03T20:58:04.487Z
+2025-04-10T10:29:54.937Z

tests/v2/cassettes/test_scenarios/test_get_all_monitor_notification_rules_returns_ok_response.yaml

@@ -1,6 +1,6 @@
 interactions:
 - request:
-    body: '{"data":{"attributes":{"filter":{"tags":["app:test-get_all_monitor_notification_rules_returns_ok_response-1743713884"]},"name":"test
+    body: '{"data":{"attributes":{"filter":{"tags":["app:test-get_all_monitor_notification_rules_returns_ok_response-1744280994"]},"name":"test
       rule","recipients":["slack-monitor-app"]},"type":"monitor-notification-rule"}}'
     headers:
       accept:
@@ -11,8 +11,8 @@ interactions:
     uri: https://api.datadoghq.com/api/v2/monitor/notification_rule
   response:
     body:
-      string: '{"data":{"type":"monitor-notification-rule","attributes":{"filter":{"tags":["app:test-get_all_monitor_notification_rules_returns_ok_response-1743713884"]},"recipients":["slack-monitor-app"],"creator_uuid":"3ad549bf-eba0-11e9-a77a-0705486660d0","modified_at":"1970-01-01T00:00:00+00:00","name":"test
-        rule","created_at":"2025-04-03T20:58:04.604345+00:00"},"id":"6e5b7a93-37b5-44b8-9098-2d31b6dd84b6"}}
+      string: '{"data":{"type":"monitor-notification-rule","attributes":{"name":"test
+        rule","filter":{"tags":["app:test-get_all_monitor_notification_rules_returns_ok_response-1744280994"]},"recipients":["slack-monitor-app"],"modified_at":"1970-01-01T00:00:00+00:00","created_at":"2025-04-10T10:29:55.362004+00:00"},"relationships":{"created_by":{"data":{"type":"users","id":"3ad549bf-eba0-11e9-a77a-0705486660d0"}}},"id":"b7122864-6517-45d3-8dc1-f226a08dd8f4"},"included":[{"type":"users","id":"3ad549bf-eba0-11e9-a77a-0705486660d0","attributes":{"name":"frog","handle":"frog@datadoghq.com","created_at":"2019-10-02T08:15:39.795051+00:00","modified_at":"2025-04-07T20:19:46.118466+00:00","email":"frog@datadoghq.com","icon":"https://secure.gravatar.com/avatar/28a16dfe36e73b60c1d55872cb0f1172?s=48&d=retro","title":null,"verified":true,"service_account":false,"disabled":false,"allowed_login_methods":[],"status":"Active"}}]}
 
         '
     headers:
@@ -30,8 +30,8 @@ interactions:
     uri: https://api.datadoghq.com/api/v2/monitor/notification_rule
   response:
     body:
-      string: '{"data":[{"type":"monitor-notification-rule","id":"6e5b7a93-37b5-44b8-9098-2d31b6dd84b6","attributes":{"creator_uuid":"3ad549bf-eba0-11e9-a77a-0705486660d0","name":"test
-        rule","recipients":["slack-monitor-app"],"created_at":"2025-04-03T20:58:04.604345+00:00","filter":{"tags":["app:test-get_all_monitor_notification_rules_returns_ok_response-1743713884"]},"modified_at":"2025-04-03T20:58:04.616893+00:00"}}]}
+      string: '{"data":[{"type":"monitor-notification-rule","attributes":{"filter":{"tags":["app:test-get_all_monitor_notification_rules_returns_ok_response-1744280994"]},"name":"test
+        rule","recipients":["slack-monitor-app"],"modified_at":"2025-04-10T10:29:55.373154+00:00","created_at":"2025-04-10T10:29:55.362004+00:00"},"id":"b7122864-6517-45d3-8dc1-f226a08dd8f4"}]}
 
         '
     headers:
@@ -46,7 +46,7 @@ interactions:
       accept:
       - '*/*'
     method: DELETE
-    uri: https://api.datadoghq.com/api/v2/monitor/notification_rule/6e5b7a93-37b5-44b8-9098-2d31b6dd84b6
+    uri: https://api.datadoghq.com/api/v2/monitor/notification_rule/b7122864-6517-45d3-8dc1-f226a08dd8f4
   response:
     body:
       string: ''

tests/v2/cassettes/test_scenarios/test_update_a_monitor_notification_rule_returns_bad_request_response.frozen

@@ -1 +1 @@
-2025-04-03T20:58:04.953Z
+2025-04-10T10:29:56.210Z

tests/v2/cassettes/test_scenarios/test_update_a_monitor_notification_rule_returns_bad_request_response.yaml

@@ -1,6 +1,6 @@
 interactions:
 - request:
-    body: '{"data":{"attributes":{"filter":{"tags":["app:test-update_a_monitor_notification_rule_returns_bad_request_response-1743713884"]},"name":"test
+    body: '{"data":{"attributes":{"filter":{"tags":["app:test-update_a_monitor_notification_rule_returns_bad_request_response-1744280996"]},"name":"test
       rule","recipients":["slack-monitor-app"]},"type":"monitor-notification-rule"}}'
     headers:
       accept:
@@ -11,8 +11,8 @@ interactions:
     uri: https://api.datadoghq.com/api/v2/monitor/notification_rule
   response:
     body:
-      string: '{"data":{"type":"monitor-notification-rule","attributes":{"filter":{"tags":["app:test-update_a_monitor_notification_rule_returns_bad_request_response-1743713884"]},"recipients":["slack-monitor-app"],"creator_uuid":"3ad549bf-eba0-11e9-a77a-0705486660d0","modified_at":"1970-01-01T00:00:00+00:00","name":"test
-        rule","created_at":"2025-04-03T20:58:05.080336+00:00"},"id":"30523422-5ed5-477d-b310-211ab89031dc"}}
+      string: '{"data":{"type":"monitor-notification-rule","attributes":{"filter":{"tags":["app:test-update_a_monitor_notification_rule_returns_bad_request_response-1744280996"]},"created_at":"2025-04-10T10:29:56.523436+00:00","recipients":["slack-monitor-app"],"name":"test
+        rule","modified_at":"1970-01-01T00:00:00+00:00"},"id":"f26ba0a6-1e84-4984-b061-4172a25a1332","relationships":{"created_by":{"data":{"type":"users","id":"3ad549bf-eba0-11e9-a77a-0705486660d0"}}}},"included":[{"type":"users","id":"3ad549bf-eba0-11e9-a77a-0705486660d0","attributes":{"name":"frog","handle":"frog@datadoghq.com","created_at":"2019-10-02T08:15:39.795051+00:00","modified_at":"2025-04-07T20:19:46.118466+00:00","email":"frog@datadoghq.com","icon":"https://secure.gravatar.com/avatar/28a16dfe36e73b60c1d55872cb0f1172?s=48&d=retro","title":null,"verified":true,"service_account":false,"disabled":false,"allowed_login_methods":[],"status":"Active"}}]}
 
         '
     headers:
@@ -22,15 +22,15 @@ interactions:
       code: 200
       message: OK
 - request:
-    body: '{"data":{"attributes":{"filter":{"tags":["test:test-update_a_monitor_notification_rule_returns_bad_request_response-1743713884","host:abc"]},"name":"updated
-      rule","recipients":["@slack-test-channel"]},"id":"30523422-5ed5-477d-b310-211ab89031dc","type":"monitor-notification-rule"}}'
+    body: '{"data":{"attributes":{"filter":{"tags":["test:test-update_a_monitor_notification_rule_returns_bad_request_response-1744280996","host:abc"]},"name":"updated
+      rule","recipients":["@slack-test-channel"]},"id":"f26ba0a6-1e84-4984-b061-4172a25a1332","type":"monitor-notification-rule"}}'
     headers:
       accept:
       - application/json
       content-type:
       - application/json
     method: PATCH
-    uri: https://api.datadoghq.com/api/v2/monitor/notification_rule/30523422-5ed5-477d-b310-211ab89031dc
+    uri: https://api.datadoghq.com/api/v2/monitor/notification_rule/f26ba0a6-1e84-4984-b061-4172a25a1332
   response:
     body:
       string: '{"errors":["Invalid recipients: Recipient handle should not start with
@@ -47,7 +47,7 @@ interactions:
       accept:
       - '*/*'
     method: DELETE
-    uri: https://api.datadoghq.com/api/v2/monitor/notification_rule/30523422-5ed5-477d-b310-211ab89031dc
+    uri: https://api.datadoghq.com/api/v2/monitor/notification_rule/f26ba0a6-1e84-4984-b061-4172a25a1332
   response:
     body:
       string: ''

tests/v2/cassettes/test_scenarios/test_update_a_monitor_notification_rule_returns_not_found_response.frozen

@@ -1 +1 @@
-2025-04-03T20:58:05.447Z
+2025-04-10T10:29:57.263Z

tests/v2/cassettes/test_scenarios/test_update_a_monitor_notification_rule_returns_not_found_response.yaml

@@ -1,6 +1,6 @@
 interactions:
 - request:
-    body: '{"data":{"attributes":{"filter":{"tags":["test:test-update_a_monitor_notification_rule_returns_not_found_response-1743713885","host:abc"]},"name":"updated
+    body: '{"data":{"attributes":{"filter":{"tags":["test:test-update_a_monitor_notification_rule_returns_not_found_response-1744280997","host:abc"]},"name":"updated
       rule","recipients":["slack-test-channel","jira-test"]},"id":"00000000-0000-1234-0000-000000000000","type":"monitor-notification-rule"}}'
     headers:
       accept:
@@ -11,7 +11,7 @@ interactions:
     uri: https://api.datadoghq.com/api/v2/monitor/notification_rule/00000000-0000-1234-0000-000000000000
   response:
     body:
-      string: '{"errors":["Monitor notification rule not found"]}'
+      string: '{"errors":["Monitor Notification Rule not found"]}'
     headers:
       content-type:
       - application/json

tests/v2/cassettes/test_scenarios/test_update_a_monitor_notification_rule_returns_ok_response.frozen

@@ -1 +1 @@
-2025-04-03T20:58:05.597Z
+2025-04-10T10:29:57.629Z