Skip to content

[AAWF-463] Fix github merge script #2910

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
api-clients-generation-pipeline wants to merge 1 commit into from
Closed

[AAWF-463] Fix github merge script #2910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .apigentools-info
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
"spec_versions": {
"v1": {
"apigentools_version": "1.6.6",
"regenerated": "2025-06-09 14:45:35.688547",
"spec_repo_commit": "79e7c933"
"regenerated": "2025-06-10 18:08:45.535720",
"spec_repo_commit": "047c32a5"
},
"v2": {
"apigentools_version": "1.6.6",
"regenerated": "2025-06-09 14:45:35.704920",
"spec_repo_commit": "79e7c933"
"regenerated": "2025-06-10 18:08:45.559343",
"spec_repo_commit": "047c32a5"
}
}
}
2 changes: 1 addition & 1 deletion ...est/resources/cassettes/features/v1/Create_a_user_returns_User_created_response_test.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,6 @@
"timeToLive": {
"unlimited": true
},
"id": "af617072-2860-ba27-e045-b00c8baf0188"
"id": "af617072-2860-ba27-e045-b00c8baf0187"
}
]
2 changes: 1 addition & 1 deletion src/test/resources/cassettes/features/v1/Create_a_user_returns_null_access_role.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,6 @@
"timeToLive": {
"unlimited": true
},
"id": "af617072-2860-ba27-e045-b00c8baf0187"
"id": "af617072-2860-ba27-e045-b00c8baf0188"
}
]
2 changes: 1 addition & 1 deletion ...esources/cassettes/features/v1/Get_all_hosts_with_metadata_deserializes_successfully.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@
"timeToLive": {
"unlimited": true
},
"id": "d5bade64-6ebb-4f4d-903d-8069b52bb31d"
"id": "d5bade64-6ebb-4f4d-903d-8069b52bb31e"
}
]
2 changes: 1 addition & 1 deletion ...es/features/v1/Get_all_hosts_with_metadata_for_your_organization_returns_OK_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@
"timeToLive": {
"unlimited": true
},
"id": "d5bade64-6ebb-4f4d-903d-8069b52bb31e"
"id": "d5bade64-6ebb-4f4d-903d-8069b52bb31d"
}
]
2 changes: 1 addition & 1 deletion ...eatures/v2/AWS_Integration_Create_account_config_returns_AWS_Account_object_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"timeToLive": {
"unlimited": true
},
"id": "c206b9cd-771e-14f0-5d18-42a3a48556d1"
"id": "c206b9cd-771e-14f0-5d18-42a3a48556cf"
},
{
"httpRequest": {
Expand Down
2 changes: 1 addition & 1 deletion ...ettes/features/v2/AWS_Integration_Create_account_config_returns_Bad_Request_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@
"timeToLive": {
"unlimited": true
},
"id": "f1ca6244-e46c-b3a2-86bf-65d4e9044ba4"
"id": "f1ca6244-e46c-b3a2-86bf-65d4e9044ba5"
}
]
2 changes: 1 addition & 1 deletion ...assettes/features/v2/AWS_Integration_Create_account_config_returns_Conflict_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"timeToLive": {
"unlimited": true
},
"id": "c206b9cd-771e-14f0-5d18-42a3a48556cf"
"id": "c206b9cd-771e-14f0-5d18-42a3a48556d0"
},
{
"httpRequest": {
Expand Down
2 changes: 1 addition & 1 deletion ...ssettes/features/v2/AWS_Integration_Delete_account_config_returns_Not_Found_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"timeToLive": {
"unlimited": true
},
"id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9ee9"
"id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eea"
},
{
"httpRequest": {
Expand Down
2 changes: 1 addition & 1 deletion .../v2/AWS_Integration_Generate_new_external_ID_returns_AWS_External_ID_object_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@
"timeToLive": {
"unlimited": true
},
"id": "a3ebb722-60eb-fa89-589a-ff3630e3a2cc"
"id": "a3ebb722-60eb-fa89-589a-ff3630e3a2ce"
}
]
2 changes: 1 addition & 1 deletion ...s/features/v2/AWS_Integration_Get_account_config_returns_AWS_Account_object_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"timeToLive": {
"unlimited": true
},
"id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eea"
"id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eec"
},
{
"httpRequest": {
Expand Down
2 changes: 1 addition & 1 deletion ...v2/AWS_Integration_Get_all_account_configs_returns_AWS_Accounts_List_object_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@
"timeToLive": {
"unlimited": true
},
"id": "101a55f5-5a26-d616-5fb4-8d0451d83d11"
"id": "101a55f5-5a26-d616-5fb4-8d0451d83d10"
}
]
2 changes: 1 addition & 1 deletion .../v2/AWS_Integration_List_log_services_returns_AWS_Logs_Services_List_object_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@
"timeToLive": {
"unlimited": true
},
"id": "03c3c0d9-a62f-5ac6-398b-e22a05d14d7b"
"id": "03c3c0d9-a62f-5ac6-398b-e22a05d14d7a"
}
]
2 changes: 1 addition & 1 deletion ...tures/v2/AWS_Integration_List_namespaces_returns_AWS_Namespaces_List_object_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@
"timeToLive": {
"unlimited": true
},
"id": "d0ec7736-ef6c-d071-3390-4a5c3a301d11"
"id": "d0ec7736-ef6c-d071-3390-4a5c3a301d0e"
}
]
2 changes: 1 addition & 1 deletion ...features/v2/AWS_Integration_Patch_account_config_returns_AWS_Account_object_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"timeToLive": {
"unlimited": true
},
"id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eec"
"id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eeb"
},
{
"httpRequest": {
Expand Down
2 changes: 1 addition & 1 deletion ...settes/features/v2/AWS_Integration_Patch_account_config_returns_Bad_Request_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"timeToLive": {
"unlimited": true
},
"id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eeb"
"id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9ee9"
},
{
"httpRequest": {
Expand Down
2 changes: 1 addition & 1 deletion ...assettes/features/v2/AWS_Integration_Patch_account_config_returns_Not_Found_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@
"timeToLive": {
"unlimited": true
},
"id": "6796bfb2-5496-6f6a-d702-4bc629b25991"
"id": "6796bfb2-5496-6f6a-d702-4bc629b25992"
}
]
2 changes: 1 addition & 1 deletion src/test/resources/cassettes/features/v2/Archive_case_returns_Bad_Request_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"timeToLive": {
"unlimited": true
},
"id": "0a6534d0-42f2-5075-64f8-7ab28f449a8f"
"id": "0a6534d0-42f2-5075-64f8-7ab28f449a93"
},
{
"httpRequest": {
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/cassettes/features/v2/Archive_case_returns_OK_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"timeToLive": {
"unlimited": true
},
"id": "0a6534d0-42f2-5075-64f8-7ab28f449a93"
"id": "0a6534d0-42f2-5075-64f8-7ab28f449a8e"
},
{
"httpRequest": {
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/cassettes/features/v2/Assign_case_returns_Bad_Request_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"timeToLive": {
"unlimited": true
},
"id": "0a6534d0-42f2-5075-64f8-7ab28f449a8d"
"id": "0a6534d0-42f2-5075-64f8-7ab28f449a90"
},
{
"httpRequest": {
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/cassettes/features/v2/Assign_case_returns_OK_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"timeToLive": {
"unlimited": true
},
"id": "0a6534d0-42f2-5075-64f8-7ab28f449a92"
"id": "0a6534d0-42f2-5075-64f8-7ab28f449a95"
},
{
"httpRequest": {
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/cassettes/features/v2/Cancel_a_historical_job_returns_OK_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"timeToLive": {
"unlimited": true
},
"id": "6bb82102-e994-f0d1-ee96-e1e3f1d80fff"
"id": "6bb82102-e994-f0d1-ee96-e1e3f1d80ffd"
},
{
"httpRequest": {
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/cassettes/features/v2/Create_App_returns_Created_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"timeToLive": {
"unlimited": true
},
"id": "c782b1f3-1b03-d50f-8fcd-12e51226c511"
"id": "c782b1f3-1b03-d50f-8fcd-12e51226c513"
},
{
"httpRequest": {
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/cassettes/features/v2/Create_Scanning_Group_returns_OK_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"timeToLive": {
"unlimited": true
},
"id": "01611a93-5e74-0630-3c51-f707c3b51e83"
"id": "01611a93-5e74-0630-3c51-f707c3b51e78"
},
{
"httpRequest": {
Expand Down
2 changes: 1 addition & 1 deletion ...st/resources/cassettes/features/v2/Create_Scanning_Rule_returns_Bad_Request_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"timeToLive": {
"unlimited": true
},
"id": "33fa4a39-57ef-afdd-007a-0db82f7ed160"
"id": "33fa4a39-57ef-afdd-007a-0db82f7ed15f"
},
{
"httpRequest": {
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/cassettes/features/v2/Create_Scanning_Rule_returns_OK_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"timeToLive": {
"unlimited": true
},
"id": "01611a93-5e74-0630-3c51-f707c3b51e7c"
"id": "01611a93-5e74-0630-3c51-f707c3b51e7f"
},
{
"httpRequest": {
Expand Down Expand Up @@ -53,7 +53,7 @@
"timeToLive": {
"unlimited": true
},
"id": "33fa4a39-57ef-afdd-007a-0db82f7ed15c"
"id": "33fa4a39-57ef-afdd-007a-0db82f7ed15d"
},
{
"httpRequest": {
Expand Down
6 changes: 3 additions & 3 deletions .../resources/cassettes/features/v2/Create_a_custom_framework_returns_Conflict_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"timeToLive": {
"unlimited": true
},
"id": "13fe9685-b072-5fe0-c841-4499a9e71c71"
"id": "13fe9685-b072-5fe0-c841-4499a9e71c73"
},
{
"httpRequest": {
Expand Down Expand Up @@ -57,7 +57,7 @@
"timeToLive": {
"unlimited": true
},
"id": "13fe9685-b072-5fe0-c841-4499a9e71c72"
"id": "13fe9685-b072-5fe0-c841-4499a9e71c74"
},
{
"httpRequest": {
Expand All @@ -83,6 +83,6 @@
"timeToLive": {
"unlimited": true
},
"id": "e535722a-99e3-30cf-49f7-2d093bd78b3a"
"id": "e535722a-99e3-30cf-49f7-2d093bd78b3c"
}
]
2 changes: 1 addition & 1 deletion ...settes/features/v2/Create_a_monitor_notification_rule_returns_Bad_Request_response.freeze
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-04-03T20:58:02.871Z
2025-04-10T10:29:43.940Z
4 changes: 2 additions & 2 deletions ...assettes/features/v2/Create_a_monitor_notification_rule_returns_Bad_Request_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"httpRequest": {
"body": {
"type": "JSON",
"json": "{\"data\":{\"attributes\":{\"filter\":{\"tags\":[\"test:test-create_a_monitor_notification_rule_returns_bad_request_response-1743713882\",\"host:abc\"]},\"name\":\"test rule\",\"recipients\":[\"@slack-test-channel\",\"@jira-test\"]},\"type\":\"monitor-notification-rule\"}}"
"json": "{\"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": {},
"method": "POST",
Expand All @@ -27,6 +27,6 @@
"timeToLive": {
"unlimited": true
},
"id": "91ecd173-4dcb-846d-34f5-1fa07a268817"
"id": "ca715863-18d9-8dab-d956-c3de955ebfc6"
}
]
2 changes: 1 addition & 1 deletion ...urces/cassettes/features/v2/Create_a_monitor_notification_rule_returns_OK_response.freeze
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-04-03T20:58:03.005Z
2025-04-10T10:29:44.273Z
10 changes: 5 additions & 5 deletions ...sources/cassettes/features/v2/Create_a_monitor_notification_rule_returns_OK_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"httpRequest": {
"body": {
"type": "JSON",
"json": "{\"data\":{\"attributes\":{\"filter\":{\"tags\":[\"test:test-create_a_monitor_notification_rule_returns_ok_response-1743713883\"]},\"name\":\"test rule\",\"recipients\":[\"slack-test-channel\",\"jira-test\"]},\"type\":\"monitor-notification-rule\"}}"
"json": "{\"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": {},
"method": "POST",
Expand All @@ -12,7 +12,7 @@
"secure": true
},
"httpResponse": {
"body": "{\"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\"}}}\n",
"body": "{\"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\"}}]}\n",
"headers": {
"Content-Type": [
"application/json"
Expand All @@ -27,13 +27,13 @@
"timeToLive": {
"unlimited": true
},
"id": "e2497b65-0461-9eaa-5eeb-36c854d59233"
"id": "662b9e66-b48e-20b0-3233-13a039dcef82"
},
{
"httpRequest": {
"headers": {},
"method": "DELETE",
"path": "/api/v2/monitor/notification_rule/55959a04-463a-4579-8386-8c2ca120aa52",
"path": "/api/v2/monitor/notification_rule/a3323ef6-2a04-4ef9-8de8-cbcff5c3c203",
"keepAlive": false,
"secure": true
},
Expand All @@ -52,6 +52,6 @@
"timeToLive": {
"unlimited": true
},
"id": "279a9a1e-d299-a6cc-4bf4-2d7bc46bd358"
"id": "2f4a98e8-f9f9-ea2f-a8b4-a9806400e47d"
}
]
2 changes: 1 addition & 1 deletion src/test/resources/cassettes/features/v2/Create_a_new_pipeline_returns_OK_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"timeToLive": {
"unlimited": true
},
"id": "ccedcb24-9a42-7cb7-5505-c852f00f431e"
"id": "ccedcb24-9a42-7cb7-5505-c852f00f431d"
},
{
"httpRequest": {
Expand Down
2 changes: 1 addition & 1 deletion ...rces/cassettes/features/v2/Create_an_AWS_account_returns_AWS_Account_object_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"timeToLive": {
"unlimited": true
},
"id": "c206b9cd-771e-14f0-5d18-42a3a48556ce"
"id": "c206b9cd-771e-14f0-5d18-42a3a48556d1"
},
{
"httpRequest": {
Expand Down
2 changes: 1 addition & 1 deletion ...sources/cassettes/features/v2/Create_an_AWS_integration_returns_Bad_Request_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@
"timeToLive": {
"unlimited": true
},
"id": "f1ca6244-e46c-b3a2-86bf-65d4e9044ba5"
"id": "f1ca6244-e46c-b3a2-86bf-65d4e9044ba4"
}
]
4 changes: 2 additions & 2 deletions .../resources/cassettes/features/v2/Create_an_AWS_integration_returns_Conflict_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"timeToLive": {
"unlimited": true
},
"id": "cd59362c-7df2-d349-9880-5b5536151a0a"
"id": "cd59362c-7df2-d349-9880-5b5536151a06"
},
{
"httpRequest": {
Expand Down Expand Up @@ -57,7 +57,7 @@
"timeToLive": {
"unlimited": true
},
"id": "c206b9cd-771e-14f0-5d18-42a3a48556d0"
"id": "c206b9cd-771e-14f0-5d18-42a3a48556ce"
},
{
"httpRequest": {
Expand Down
Loading
Loading