Merge master into datadog-api-spec/test/d.marin/oncall-api

api-clients-generation-pipeline[bot] · web-flow · commit bae74f35ab66 · 2025-04-07T01:57:14.000Z
diff --git a/.apigentools-info b/.apigentools-info
@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2025-04-03 16:27:55.129965",
-            "spec_repo_commit": "4468962d"
+            "regenerated": "2025-04-04 20:19:29.358542",
+            "spec_repo_commit": "3909ab62"
         },
         "v2": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2025-04-03 16:27:55.144771",
-            "spec_repo_commit": "4468962d"
+            "regenerated": "2025-04-04 20:19:29.373801",
+            "spec_repo_commit": "3909ab62"
         }
     }
 }
diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml
@@ -654,8 +654,8 @@ components:
         type: string
     ResourceID:
       description: 'Identifier, formatted as `type:id`. Supported types: `connection`,
-        `dashboard`, `notebook`, `reference-table`, `security-rule`, `slo`, `workflow`,
-        `app-builder-app`, `connection`, `connection-group`.'
+        `dashboard`, `integration-account`, `integration-webhook`, `notebook`, `reference-table`,
+        `security-rule`, `slo`, `workflow`, `app-builder-app`, `connection`, `connection-group`.'
       example: dashboard:abc-def-ghi
       in: path
       name: resource_id
@@ -2864,13 +2864,13 @@ components:
       enum:
       - attack_attempt
       - business_logic
-      - security_responses
+      - security_response
       example: business_logic
       type: string
       x-enum-varnames:
       - ATTACK_ATTEMPT
       - BUSINESS_LOGIC
-      - SECURITY_RESPONSES
+      - SECURITY_RESPONSE
     ApplicationSecurityWafCustomRuleType:
       default: custom_rule
       description: The type of the resource. The value should always be `custom_rule`.
@@ -45734,6 +45734,10 @@ paths:
 
         - Dashboards: `dashboard`
 
+        - Integration Accounts: `integration-account`
+
+        - Integration Webhooks: `integration-webhook`
+
         - Notebooks: `notebook`
 
         - Powerpacks: `powerpack`
@@ -45769,6 +45773,10 @@ paths:
 
         Dashboards                  | `viewer`, `editor`
 
+        Integration Accounts        | `viewer`, `editor`
+
+        Integration Webhooks        | `viewer`, `editor`
+
         Notebooks                   | `viewer`, `editor`
 
         Powerpacks                  | `viewer`, `editor`
diff --git a/examples/v2/action-connection/CreateActionConnection.py b/examples/v2/action-connection/CreateActionConnection.py
@@ -17,7 +17,7 @@
     data=ActionConnectionData(
         type=ActionConnectionDataType.ACTION_CONNECTION,
         attributes=ActionConnectionAttributes(
-            name="Cassette Connection DELETE_ME",
+            name="Cassette Connection exampleactionconnection",
             integration=AWSIntegration(
                 type=AWSIntegrationType.AWS,
                 credentials=AWSAssumeRole(
diff --git a/examples/v2/action-connection/DeleteActionConnection.py b/examples/v2/action-connection/DeleteActionConnection.py
@@ -2,12 +2,16 @@
 Delete an existing Action Connection returns "The resource was deleted successfully." response
 """
 
+from os import environ
 from datadog_api_client import ApiClient, Configuration
 from datadog_api_client.v2.api.action_connection_api import ActionConnectionApi
 
+# there is a valid "action_connection" in the system
+ACTION_CONNECTION_DATA_ID = environ["ACTION_CONNECTION_DATA_ID"]
+
 configuration = Configuration()
 with ApiClient(configuration) as api_client:
     api_instance = ActionConnectionApi(api_client)
     api_instance.delete_action_connection(
-        connection_id="connection_id",
+        connection_id=ACTION_CONNECTION_DATA_ID,
     )
diff --git a/examples/v2/action-connection/DeleteActionConnection_2142905164.py b/examples/v2/action-connection/DeleteActionConnection_2142905164.py
diff --git a/src/datadog_api_client/v2/api/restriction_policies_api.py b/src/datadog_api_client/v2/api/restriction_policies_api.py
@@ -112,7 +112,7 @@ def delete_restriction_policy(
 
         Deletes the restriction policy associated with a specified resource.
 
-        :param resource_id: Identifier, formatted as ``type:id``. Supported types: ``connection`` , ``dashboard`` , ``notebook`` , ``reference-table`` , ``security-rule`` , ``slo`` , ``workflow`` , ``app-builder-app`` , ``connection`` , ``connection-group``.
+        :param resource_id: Identifier, formatted as ``type:id``. Supported types: ``connection`` , ``dashboard`` , ``integration-account`` , ``integration-webhook`` , ``notebook`` , ``reference-table`` , ``security-rule`` , ``slo`` , ``workflow`` , ``app-builder-app`` , ``connection`` , ``connection-group``.
         :type resource_id: str
         :rtype: None
         """
@@ -129,7 +129,7 @@ def get_restriction_policy(
 
         Retrieves the restriction policy associated with a specified resource.
 
-        :param resource_id: Identifier, formatted as ``type:id``. Supported types: ``connection`` , ``dashboard`` , ``notebook`` , ``reference-table`` , ``security-rule`` , ``slo`` , ``workflow`` , ``app-builder-app`` , ``connection`` , ``connection-group``.
+        :param resource_id: Identifier, formatted as ``type:id``. Supported types: ``connection`` , ``dashboard`` , ``integration-account`` , ``integration-webhook`` , ``notebook`` , ``reference-table`` , ``security-rule`` , ``slo`` , ``workflow`` , ``app-builder-app`` , ``connection`` , ``connection-group``.
         :type resource_id: str
         :rtype: RestrictionPolicyResponse
         """
@@ -154,6 +154,8 @@ def update_restriction_policy(
         Restriction policies can be applied to the following resources:
 
         * Dashboards: ``dashboard``
+        * Integration Accounts: ``integration-account``
+        * Integration Webhooks: ``integration-webhook``
         * Notebooks: ``notebook``
         * Powerpacks: ``powerpack``
         * Reference Tables: ``reference-table``
@@ -177,6 +179,10 @@ def update_restriction_policy(
              - Supported Relations
            * - Dashboards
              - ``viewer`` , ``editor``
+           * - Integration Accounts
+             - ``viewer`` , ``editor``
+           * - Integration Webhooks
+             - ``viewer`` , ``editor``
            * - Notebooks
              - ``viewer`` , ``editor``
            * - Powerpacks
@@ -205,7 +211,7 @@ def update_restriction_policy(
              - ``viewer`` , ``editor``
 
 
-        :param resource_id: Identifier, formatted as ``type:id``. Supported types: ``connection`` , ``dashboard`` , ``notebook`` , ``reference-table`` , ``security-rule`` , ``slo`` , ``workflow`` , ``app-builder-app`` , ``connection`` , ``connection-group``.
+        :param resource_id: Identifier, formatted as ``type:id``. Supported types: ``connection`` , ``dashboard`` , ``integration-account`` , ``integration-webhook`` , ``notebook`` , ``reference-table`` , ``security-rule`` , ``slo`` , ``workflow`` , ``app-builder-app`` , ``connection`` , ``connection-group``.
         :type resource_id: str
         :param body: Restriction policy payload
         :type body: RestrictionPolicyUpdateRequest
diff --git a/src/datadog_api_client/v2/model/application_security_waf_custom_rule_tags_category.py b/src/datadog_api_client/v2/model/application_security_waf_custom_rule_tags_category.py
@@ -16,18 +16,18 @@ class ApplicationSecurityWafCustomRuleTagsCategory(ModelSimple):
     """
     The category of the WAF Rule, can be either `business_logic`, `attack_attempt` or `security_response`.
 
-    :param value: Must be one of ["attack_attempt", "business_logic", "security_responses"].
+    :param value: Must be one of ["attack_attempt", "business_logic", "security_response"].
     :type value: str
     """
 
     allowed_values = {
         "attack_attempt",
         "business_logic",
-        "security_responses",
+        "security_response",
     }
     ATTACK_ATTEMPT: ClassVar["ApplicationSecurityWafCustomRuleTagsCategory"]
     BUSINESS_LOGIC: ClassVar["ApplicationSecurityWafCustomRuleTagsCategory"]
-    SECURITY_RESPONSES: ClassVar["ApplicationSecurityWafCustomRuleTagsCategory"]
+    SECURITY_RESPONSE: ClassVar["ApplicationSecurityWafCustomRuleTagsCategory"]
 
     @cached_property
     def openapi_types(_):
@@ -42,6 +42,6 @@ def openapi_types(_):
 ApplicationSecurityWafCustomRuleTagsCategory.BUSINESS_LOGIC = ApplicationSecurityWafCustomRuleTagsCategory(
     "business_logic"
 )
-ApplicationSecurityWafCustomRuleTagsCategory.SECURITY_RESPONSES = ApplicationSecurityWafCustomRuleTagsCategory(
-    "security_responses"
+ApplicationSecurityWafCustomRuleTagsCategory.SECURITY_RESPONSE = ApplicationSecurityWafCustomRuleTagsCategory(
+    "security_response"
 )
diff --git a/tests/v2/cassettes/test_scenarios/test_create_a_new_action_connection_returns_bad_request_response.frozen b/tests/v2/cassettes/test_scenarios/test_create_a_new_action_connection_returns_bad_request_response.frozen
@@ -1 +1 @@
-2025-01-06T22:02:35.383Z
+2025-03-26T20:24:59.622Z
diff --git a/tests/v2/cassettes/test_scenarios/test_create_a_new_action_connection_returns_successfully_created_action_connection_response.frozen b/tests/v2/cassettes/test_scenarios/test_create_a_new_action_connection_returns_successfully_created_action_connection_response.frozen
@@ -1 +1 @@
-2025-01-06T22:02:35.598Z
+2025-03-26T20:24:59.727Z
diff --git a/tests/v2/cassettes/test_scenarios/test_create_a_new_action_connection_returns_successfully_created_action_connection_response.yaml b/tests/v2/cassettes/test_scenarios/test_create_a_new_action_connection_returns_successfully_created_action_connection_response.yaml
@@ -1,7 +1,7 @@
 interactions:
 - request:
     body: '{"data":{"attributes":{"integration":{"credentials":{"account_id":"123456789123","role":"MyRoleUpdated","type":"AWSAssumeRole"},"type":"AWS"},"name":"Cassette
-      Connection DELETE_ME"},"type":"action_connection"}}'
+      Connection testcreateanewactionconnectionreturnssuccessfullycreatedactionconnectionresponse1743020699"},"type":"action_connection"}}'
     headers:
       accept:
       - application/json
@@ -11,8 +11,8 @@ interactions:
     uri: https://api.datadoghq.com/api/v2/actions/connections
   response:
     body:
-      string: '{"data":{"id":"db41b6cb-ef93-45bd-9857-548e9474737c","type":"action_connection","attributes":{"integration":{"credentials":{"account_id":"123456789123","role":"MyRoleUpdated","external_id":"c6f62d439f14423b963e4dd4246af4a7","principal_id":"464622532012","type":"AWSAssumeRole"},"type":"AWS"},"name":"Cassette
-        Connection DELETE_ME"}}}'
+      string: '{"data":{"id":"67aa2f61-266d-48d1-a1ee-cf7c3acc6b20","type":"action_connection","attributes":{"integration":{"credentials":{"account_id":"123456789123","external_id":"70f4660c99684420821b0c13a67eb4d1","principal_id":"464622532012","role":"MyRoleUpdated","type":"AWSAssumeRole"},"type":"AWS"},"name":"Cassette
+        Connection testcreateanewactionconnectionreturnssuccessfullycreatedactionconnectionresponse1743020699"}}}'
     headers:
       content-type:
       - application/vnd.api+json
@@ -25,7 +25,7 @@ interactions:
       accept:
       - '*/*'
     method: DELETE
-    uri: https://api.datadoghq.com/api/v2/actions/connections/db41b6cb-ef93-45bd-9857-548e9474737c
+    uri: https://api.datadoghq.com/api/v2/actions/connections/67aa2f61-266d-48d1-a1ee-cf7c3acc6b20
   response:
     body:
       string: ''
diff --git a/tests/v2/cassettes/test_scenarios/test_delete_an_existing_action_connection_returns_not_found_response.frozen b/tests/v2/cassettes/test_scenarios/test_delete_an_existing_action_connection_returns_not_found_response.frozen
@@ -1 +1 @@
-2025-01-06T22:02:36.467Z
+2025-03-26T20:25:00.311Z
diff --git a/tests/v2/cassettes/test_scenarios/test_delete_an_existing_action_connection_returns_the_resource_was_deleted_successfully_response.frozen b/tests/v2/cassettes/test_scenarios/test_delete_an_existing_action_connection_returns_the_resource_was_deleted_successfully_response.frozen
@@ -0,0 +1 @@
+2025-03-26T20:25:00.458Z
diff --git a/tests/v2/cassettes/test_scenarios/test_delete_an_existing_action_connection_returns_the_resource_was_deleted_successfully_response.yaml b/tests/v2/cassettes/test_scenarios/test_delete_an_existing_action_connection_returns_the_resource_was_deleted_successfully_response.yaml
@@ -0,0 +1,53 @@
+interactions:
+- request:
+    body: '{"data":{"attributes":{"integration":{"credentials":{"account_id":"123456789123","role":"MyRole","type":"AWSAssumeRole"},"type":"AWS"},"name":"Cassette
+      Connection testdeleteanexistingactionconnectionreturnstheresourcewasdeletedsuccessfullyresponse1743020700"},"type":"action_connection"}}'
+    headers:
+      accept:
+      - application/json
+      content-type:
+      - application/json
+    method: POST
+    uri: https://api.datadoghq.com/api/v2/actions/connections
+  response:
+    body:
+      string: '{"data":{"id":"c3c3d83b-c495-4c1b-bb1d-592825d21db0","type":"action_connection","attributes":{"integration":{"credentials":{"account_id":"123456789123","external_id":"6183670d1ceb4278808cf2df9aa03a07","principal_id":"464622532012","role":"MyRole","type":"AWSAssumeRole"},"type":"AWS"},"name":"Cassette
+        Connection testdeleteanexistingactionconnectionreturnstheresourcewasdeletedsuccessfullyresponse1743020700"}}}'
+    headers:
+      content-type:
+      - application/vnd.api+json
+    status:
+      code: 201
+      message: Created
+- request:
+    body: null
+    headers:
+      accept:
+      - '*/*'
+    method: DELETE
+    uri: https://api.datadoghq.com/api/v2/actions/connections/c3c3d83b-c495-4c1b-bb1d-592825d21db0
+  response:
+    body:
+      string: ''
+    headers: {}
+    status:
+      code: 204
+      message: No Content
+- request:
+    body: null
+    headers:
+      accept:
+      - '*/*'
+    method: DELETE
+    uri: https://api.datadoghq.com/api/v2/actions/connections/c3c3d83b-c495-4c1b-bb1d-592825d21db0
+  response:
+    body:
+      string: '{"errors":[{"title":"Generic Error","detail":"error deleting connection:
+        rpc error: code = NotFound desc = connection not found"}]}'
+    headers:
+      content-type:
+      - application/vnd.api+json
+    status:
+      code: 404
+      message: Not Found
+version: 1
diff --git a/tests/v2/cassettes/test_scenarios/test_get_an_existing_action_connection_returns_bad_request_response.frozen b/tests/v2/cassettes/test_scenarios/test_get_an_existing_action_connection_returns_bad_request_response.frozen
@@ -1 +1 @@
-2025-01-06T22:02:37.403Z
+2025-03-26T20:25:01.150Z
diff --git a/tests/v2/cassettes/test_scenarios/test_get_an_existing_action_connection_returns_not_found_response.frozen b/tests/v2/cassettes/test_scenarios/test_get_an_existing_action_connection_returns_not_found_response.frozen
@@ -1 +1 @@
-2025-01-06T22:02:37.563Z
+2025-03-26T20:25:01.247Z
diff --git a/tests/v2/cassettes/test_scenarios/test_get_an_existing_action_connection_returns_successfully_get_action_connection_response.frozen b/tests/v2/cassettes/test_scenarios/test_get_an_existing_action_connection_returns_successfully_get_action_connection_response.frozen
@@ -1 +1 @@
-2025-01-06T22:02:37.743Z
+2025-03-26T20:25:01.398Z
diff --git a/tests/v2/cassettes/test_scenarios/test_get_an_existing_action_connection_returns_successfully_get_action_connection_response.yaml b/tests/v2/cassettes/test_scenarios/test_get_an_existing_action_connection_returns_successfully_get_action_connection_response.yaml
@@ -8,7 +8,7 @@ interactions:
     uri: https://api.datadoghq.com/api/v2/actions/connections/cb460d51-3c88-4e87-adac-d47131d0423d
   response:
     body:
-      string: '{"data":{"id":"cb460d51-3c88-4e87-adac-d47131d0423d","type":"action_connection","attributes":{"integration":{"credentials":{"account_id":"123456789123","role":"MyRoleUpdated","external_id":"909b33b1242748cfbef42f20011e2fa0","principal_id":"464622532012","type":"AWSAssumeRole"},"type":"AWS"},"name":"Cassette
+      string: '{"data":{"id":"cb460d51-3c88-4e87-adac-d47131d0423d","type":"action_connection","attributes":{"integration":{"credentials":{"account_id":"123456789123","external_id":"909b33b1242748cfbef42f20011e2fa0","principal_id":"464622532012","role":"MyRoleUpdated","type":"AWSAssumeRole"},"type":"AWS"},"name":"Cassette
         Connection"}}}'
     headers:
       content-type:
diff --git a/tests/v2/cassettes/test_scenarios/test_update_an_existing_action_connection_returns_bad_request_response.frozen b/tests/v2/cassettes/test_scenarios/test_update_an_existing_action_connection_returns_bad_request_response.frozen
@@ -1 +1 @@
-2025-01-06T22:02:38.001Z
+2025-03-26T20:25:01.521Z
diff --git a/tests/v2/cassettes/test_scenarios/test_update_an_existing_action_connection_returns_not_found_response.frozen b/tests/v2/cassettes/test_scenarios/test_update_an_existing_action_connection_returns_not_found_response.frozen
@@ -1 +1 @@
-2025-01-06T22:02:38.092Z
+2025-03-26T20:25:01.625Z
diff --git a/tests/v2/cassettes/test_scenarios/test_update_an_existing_action_connection_returns_successfully_updated_action_connection_response.frozen b/tests/v2/cassettes/test_scenarios/test_update_an_existing_action_connection_returns_successfully_updated_action_connection_response.frozen
@@ -1 +1 @@
-2025-01-06T22:02:38.186Z
+2025-03-26T20:25:01.719Z
diff --git a/tests/v2/cassettes/test_scenarios/test_update_an_existing_action_connection_returns_successfully_updated_action_connection_response.yaml b/tests/v2/cassettes/test_scenarios/test_update_an_existing_action_connection_returns_successfully_updated_action_connection_response.yaml
@@ -11,7 +11,7 @@ interactions:
     uri: https://api.datadoghq.com/api/v2/actions/connections/cb460d51-3c88-4e87-adac-d47131d0423d
   response:
     body:
-      string: '{"data":{"id":"cb460d51-3c88-4e87-adac-d47131d0423d","type":"action_connection","attributes":{"integration":{"credentials":{"account_id":"123456789123","role":"MyRoleUpdated","external_id":"909b33b1242748cfbef42f20011e2fa0","principal_id":"464622532012","type":"AWSAssumeRole"},"type":"AWS"},"name":"Cassette
+      string: '{"data":{"id":"cb460d51-3c88-4e87-adac-d47131d0423d","type":"action_connection","attributes":{"integration":{"credentials":{"account_id":"123456789123","external_id":"909b33b1242748cfbef42f20011e2fa0","principal_id":"464622532012","role":"MyRoleUpdated","type":"AWSAssumeRole"},"type":"AWS"},"name":"Cassette
         Connection"}}}'
     headers:
       content-type:
diff --git a/tests/v2/features/action_connection.feature b/tests/v2/features/action_connection.feature
@@ -24,7 +24,7 @@ Feature: Action Connection
   @team:DataDog/workflow-automation-dev
   Scenario: Create a new Action Connection returns "Successfully created Action Connection" response
     Given new "CreateActionConnection" request
-    And body with value {"data":{"type":"action_connection","attributes":{"name":"Cassette Connection DELETE_ME","integration":{"type":"AWS","credentials":{"type":"AWSAssumeRole","role":"MyRoleUpdated","account_id":"123456789123"}}}}}
+    And body with value {"data":{"type":"action_connection","attributes":{"name":"Cassette Connection {{ unique_lower_alnum }}","integration":{"type":"AWS","credentials":{"type":"AWSAssumeRole","role":"MyRoleUpdated","account_id":"123456789123"}}}}}
     When the request is sent
     Then the response status is 201 Successfully created Action Connection
 
@@ -36,20 +36,13 @@ Feature: Action Connection
     Then the response status is 404 Not Found
 
   @team:DataDog/workflow-automation-dev
-  Scenario: Delete an existing Action Connection returns "Successfully deleted Action Connection" response
+  Scenario: Delete an existing Action Connection returns "The resource was deleted successfully." response
     Given there is a valid "action_connection" in the system
     And new "DeleteActionConnection" request
     And request contains "connection_id" parameter from "action_connection.data.id"
     When the request is sent
     Then the response status is 204 The resource was deleted successfully.
 
-  @generated @skip @team:DataDog/workflow-automation-dev
-  Scenario: Delete an existing Action Connection returns "The resource was deleted successfully." response
-    Given new "DeleteActionConnection" request
-    And request contains "connection_id" parameter from "REPLACE.ME"
-    When the request is sent
-    Then the response status is 204 The resource was deleted successfully.
-
   @team:DataDog/workflow-automation-dev
   Scenario: Get an existing Action Connection returns "Bad Request" response
     Given new "GetActionConnection" request
diff --git a/tests/v2/features/given.json b/tests/v2/features/given.json
@@ -3,7 +3,7 @@
     "parameters": [
       {
         "name": "body",
-        "value": "{\n  \"data\": {\n    \"type\": \"action_connection\",\n    \"attributes\": {\n        \"name\": \"Cassette Connection DELETE\",\n        \"integration\": {\n            \"type\": \"AWS\",\n            \"credentials\": {\n                \"type\": \"AWSAssumeRole\",\n                \"role\": \"MyRole\",\n                \"account_id\": \"123456789123\"\n            }\n        }\n    }\n  }\n}"
+        "value": "{\n  \"data\": {\n    \"type\": \"action_connection\",\n    \"attributes\": {\n        \"name\": \"Cassette Connection {{ unique_lower_alnum }}\",\n        \"integration\": {\n            \"type\": \"AWS\",\n            \"credentials\": {\n                \"type\": \"AWSAssumeRole\",\n                \"role\": \"MyRole\",\n                \"account_id\": \"123456789123\"\n            }\n        }\n    }\n  }\n}"
       }
     ],
     "step": "there is a valid \"action_connection\" in the system",

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.6",`
`7`		`- "regenerated": "2025-04-03 16:27:55.129965",`
`8`		`- "spec_repo_commit": "4468962d"`
	`7`	`+ "regenerated": "2025-04-04 20:19:29.358542",`
	`8`	`+ "spec_repo_commit": "3909ab62"`
`9`	`9`	`},`
`10`	`10`	`"v2": {`
`11`	`11`	`"apigentools_version": "1.6.6",`
`12`		`- "regenerated": "2025-04-03 16:27:55.144771",`
`13`		`- "spec_repo_commit": "4468962d"`
	`12`	`+ "regenerated": "2025-04-04 20:19:29.373801",`
	`13`	`+ "spec_repo_commit": "3909ab62"`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-2025-01-06T22:02:35.383Z`
	`1`	`+2025-03-26T20:24:59.622Z`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-2025-01-06T22:02:35.598Z`
	`1`	`+2025-03-26T20:24:59.727Z`