From c538ed71c77785aa17b9b2a5a95db00ed86fe50b Mon Sep 17 00:00:00 2001
From: "ci.datadog-api-spec" <packages@datadoghq.com>
Date: Thu, 28 May 2026 02:08:09 +0000
Subject: [PATCH] Regenerate client from commit 7f9bfc5 of spec repo

---
 .generator/schemas/v2/openapi.yaml            | 298 ++++++++---
 .../aws-integration/ValidateAWSCCMConfig.java |  42 ++
 .../com/datadog/api/client/ApiClient.java     |   1 +
 .../api/client/v2/api/AwsIntegrationApi.java  | 161 ++++++
 .../v2/model/AWSCcmConfigValidationIssue.java | 184 +++++++
 .../AWSCcmConfigValidationIssueCode.java      | 110 ++++
 .../model/AWSCcmConfigValidationRequest.java  | 147 ++++++
 ...SCcmConfigValidationRequestAttributes.java | 260 +++++++++
 .../AWSCcmConfigValidationRequestData.java    | 184 +++++++
 .../model/AWSCcmConfigValidationResponse.java | 148 ++++++
 ...CcmConfigValidationResponseAttributes.java | 190 +++++++
 .../AWSCcmConfigValidationResponseData.java   | 212 ++++++++
 .../v2/model/AWSCcmConfigValidationType.java  |  57 ++
 ...vabilityPipelineConfigDestinationItem.java |  96 +---
 ...tyPipelineSplunkHecMetricsDestination.java | 499 ------------------
 ...plunkHecMetricsDestinationCompression.java |  66 ---
 ...pelineSplunkHecMetricsDestinationType.java |  63 ---
 ...er_returns_User_created_response_test.json |   2 +-
 ...reate_a_user_returns_null_access_role.json |   2 +-
 ...t_config_returns_Bad_Request_response.json |   2 +-
 ...nt_config_returns_No_Content_response.json |   2 +-
 ...unt_config_returns_Not_Found_response.json |   2 +-
 ...g_returns_AWS_Account_object_response.json |   2 +-
 ...unt_config_returns_Not_Found_response.json |   2 +-
 ...rns_AWS_Accounts_List_object_response.json |   2 +-
 ...s_AWS_Namespaces_List_object_response.json |   2 +-
 ...WS_Logs_Services_List_object_response.json |   2 +-
 ...t_config_returns_Bad_Request_response.json |   2 +-
 ...ive_case_returns_Bad_Request_response.json |   2 +-
 .../v2/Archive_case_returns_OK_response.json  |   2 +-
 .../v2/Assign_case_returns_OK_response.json   |   2 +-
 ...re_items_returns_Bad_Request_response.json |   2 +-
 ...e_datastore_items_returns_OK_response.json |   2 +-
 ...re_items_returns_Bad_Request_response.json |   2 +-
 ...e_datastore_items_returns_OK_response.json |   2 +-
 ..._a_historical_job_returns_OK_response.json |   2 +-
 ..._deletion_request_returns_OK_response.json |   2 +-
 ...ent_case_returns_Bad_Request_response.json |   2 +-
 ...eturns_AWS_CCM_Config_object_response.json |   2 +-
 ..._CCM_config_returns_Conflict_response.json |   4 +-
 ...and_task_returns_Bad_Request_response.json |   2 +-
 .../Create_App_returns_Created_response.json  |   2 +-
 ...options_enabled_successfully_response.json |   4 +-
 ..._options_returns_Bad_Request_response.json |   2 +-
 ..._Connection_returns_Conflict_response.json |   4 +-
 ...te_Scanning_Group_returns_OK_response.json |   2 +-
 ...ate_Scanning_Rule_returns_OK_response.json |   4 +-
 ...should_save_match_returns_OK_response.json |   4 +-
 ...m_framework_returns_Conflict_response.json |   6 +-
 ..._custom_framework_returns_OK_response.json |   4 +-
 ...e_a_dataset_returns_Conflict_response.json |   4 +-
 .../Create_a_dataset_returns_OK_response.json |   2 +-
 ...restriction_query_returns_OK_response.json |   2 +-
 ...integration_returns_Conflict_response.json |   2 +-
 ...ncident_type_returns_CREATED_response.json |   2 +-
 ...ase_type_returns_Bad_Request_response.json |   2 +-
 ..._a_case_type_returns_CREATED_response.json |   2 +-
 ...ication_rule_returns_Created_response.json |   2 +-
 ...ion_template_returns_Created_response.json |   2 +-
 ...with_a_permission_returns_OK_response.json |   2 +-
 ..._deletion_request_returns_OK_response.json |   2 +-
 .../v2/Delete_App_returns_OK_response.json    |   2 +-
 ...ete_Multiple_Apps_returns_OK_response.json |   2 +-
 ...te_Scanning_Group_returns_OK_response.json |   4 +-
 ...ete_Scanning_Rule_returns_OK_response.json |   2 +-
 ..._exclusion_filter_returns_OK_response.json |   2 +-
 ...case_type_returns_NotContent_response.json |   2 +-
 ...elete_a_case_type_returns_OK_response.json |   2 +-
 ..._custom_framework_returns_OK_response.json |   6 +-
 ...a_dataset_returns_No_Content_response.json |   2 +-
 ...restriction_query_returns_OK_response.json |   2 +-
 ..._retention_filter_returns_OK_response.json |   2 +-
 ...egration_returns_Bad_Request_response.json |   2 +-
 ...tegration_returns_No_Content_response.json |   2 +-
 ...ntegration_returns_Not_Found_response.json |   2 +-
 ...cessfully_deleted_a_workflow_response.json |   2 +-
 ..._an_incident_type_returns_OK_response.json |   2 +-
 ..._comment_returns_Bad_Request_response.json |   2 +-
 ...e_comment_returns_No_Content_response.json |   2 +-
 ...se_comment_returns_Not_Found_response.json |   2 +-
 ..._from_case_returns_Not_Found_response.json |   2 +-
 ...s_config_returns_Bad_Request_response.json |   2 +-
 ...te_datastore_item_returns_OK_response.json |   2 +-
 .../Delete_datastore_returns_OK_response.json |   2 +-
 ...tion_rule_returns_No_Content_response.json |   2 +-
 ..._template_returns_No_Content_response.json |   2 +-
 .../Edit_a_dataset_returns_OK_response.json   |   2 +-
 ...turns_AWS_External_ID_object_response.json |   2 +-
 ...turns_AWS_External_ID_object_response.json |   2 +-
 ...sk_by_id_returns_Bad_Request_response.json |   2 +-
 ...and_task_returns_Bad_Request_response.json |   2 +-
 .../v2/Get_App_returns_Gone_response.json     |   2 +-
 ..._a_critical_asset_returns_OK_response.json |   2 +-
 ..._custom_framework_returns_OK_response.json |   4 +-
 ..._retention_filter_returns_OK_response.json |   2 +-
 ...gle_dataset_by_ID_returns_OK_response.json |   2 +-
 ...nfig_of_case_type_returns_OK_response.json |   2 +-
 .../Get_all_datasets_returns_OK_response.json |   2 +-
 ...D_returns_AWS_Account_object_response.json |   2 +-
 ..._config_ID_returns_Not_Found_response.json |   2 +-
 ..._Successfully_got_a_workflow_response.json |   2 +-
 .../v2/Get_datastore_returns_OK_response.json |   2 +-
 ...notification_rule_returns_OK_response.json |   2 +-
 ...fication_template_returns_OK_response.json |   2 +-
 ...WS_Logs_Services_List_object_response.json |   2 +-
 ...details_of_a_case_returns_OK_response.json |   2 +-
 ...deletion_requests_returns_OK_response.json |   2 +-
 ...mission_to_a_role_returns_OK_response.json |   2 +-
 ...List_App_Versions_returns_OK_response.json |   2 +-
 ...t_Scanning_Groups_returns_OK_response.json |   6 +-
 ...retention_filters_returns_OK_response.json |   2 +-
 ...rns_AWS_Accounts_List_object_response.json |   2 +-
 ...s_AWS_Namespaces_List_object_response.json |   2 +-
 ...t_datastore_items_returns_OK_response.json |   2 +-
 ...otification_rules_returns_OK_response.json |   2 +-
 ...WS_Logs_Services_List_object_response.json |   2 +-
 ...ssions_for_a_role_returns_OK_response.json |   2 +-
 .../List_permissions_returns_OK_response.json |   2 +-
 .../List_pipelines_returns_OK_response.json   |   2 +-
 ...p_Version_returns_No_Content_response.json |   2 +-
 ...ptions_returns_Bad_Request_response_2.json |   2 +-
 ..._AWS_Scan_Options_returns_OK_response.json |   2 +-
 ..._Options_returns_Bad_Request_response.json |   2 +-
 ...l_Lab_run_returns_No_Content_response.json |   2 +-
 ...options_enabled_successfully_response.json |   2 +-
 ..._AWS_Scan_Options_returns_OK_response.json |   2 +-
 ...options_enabled_successfully_response.json |   4 +-
 ..._Options_returns_Bad_Request_response.json |   2 +-
 ...and_task_returns_Bad_Request_response.json |   2 +-
 .../Publish_App_returns_Created_response.json |   2 +-
 ...r_Groups_returns_Bad_Request_response.json |   4 +-
 .../Reorder_Groups_returns_OK_response.json   |   6 +-
 ...permission_returns_Not_found_response.json |   2 +-
 ...Revoke_permission_returns_OK_response.json |   2 +-
 ...l_job_returns_Status_created_response.json |   2 +-
 ...ive_case_returns_Bad_Request_response.json |   2 +-
 .../Unarchive_case_returns_OK_response.json   |   2 +-
 ...ign_case_returns_Bad_Request_response.json |   2 +-
 .../v2/Unassign_case_returns_OK_response.json |   2 +-
 ...l_Lab_run_returns_No_Content_response.json |   2 +-
 .../v2/Unpublish_App_returns_OK_response.json |   2 +-
 ...ptions_returns_Bad_Request_response_2.json |   2 +-
 ...n_options_returns_No_Content_response.json |   2 +-
 ...te_Status_returns_No_Content_response.json |   2 +-
 ..._Protection_Level_returns_OK_response.json |   2 +-
 ...ce_Status_returns_No_Content_response.json |   2 +-
 ..._App_Tags_returns_No_Content_response.json |   2 +-
 ...date_App_returns_Bad_Request_response.json |   2 +-
 .../v2/Update_App_returns_OK_response.json    |   2 +-
 ..._options_returns_Bad_Request_response.json |   2 +-
 ...nnection_returns_Bad_Request_response.json |   2 +-
 ...Connection_returns_Not_Found_response.json |   2 +-
 ...te_Org_Connection_returns_OK_response.json |   2 +-
 ...te_Scanning_Group_returns_OK_response.json |   4 +-
 ...ing_Rule_returns_Bad_Request_response.json |   4 +-
 ...ate_Scanning_Rule_returns_OK_response.json |   4 +-
 ..._exclusion_filter_returns_OK_response.json |   2 +-
 ..._a_critical_asset_returns_OK_response.json |   2 +-
 ..._custom_framework_returns_OK_response.json |   4 +-
 ...Update_a_pipeline_returns_OK_response.json |   2 +-
 ...n_filter_returns_Bad_Request_response.json |   2 +-
 ...ion_filter_returns_Not_Found_response.json |   2 +-
 ..._retention_filter_returns_OK_response.json |   2 +-
 ...r_with_trace_rate_returns_OK_response.json |   2 +-
 ..._filters_returns_Bad_Request_response.json |   2 +-
 ...on_filters_returns_Not_Found_response.json |   2 +-
 ...retention_filters_returns_OK_response.json |   2 +-
 ...e_a_role_returns_Bad_Request_response.json |   2 +-
 ...ate_a_role_returns_Not_found_response.json |   2 +-
 .../v2/Update_a_role_returns_OK_response.json |   2 +-
 ...n_returns_AWS_Account_object_response.json |   2 +-
 ...egration_returns_Bad_Request_response.json |   2 +-
 ...cessfully_updated_a_workflow_response.json |   2 +-
 ..._an_incident_type_returns_OK_response.json |   2 +-
 ...e_case_attributes_returns_OK_response.json |   2 +-
 ...ttribute_returns_Bad_Request_response.json |   2 +-
 ..._attribute_returns_Not_Found_response.json |   2 +-
 ..._custom_attribute_returns_OK_response.json |   2 +-
 ..._case_description_returns_OK_response.json |   2 +-
 ...priority_returns_Bad_Request_response.json |   2 +-
 ...ate_case_priority_returns_OK_response.json |   2 +-
 ...e_status_returns_Bad_Request_response.json |   2 +-
 ...pdate_case_status_returns_OK_response.json |   2 +-
 ...se_title_returns_Bad_Request_response.json |   2 +-
 ...Update_case_title_returns_OK_response.json |   2 +-
 ...te_datastore_item_returns_OK_response.json |   2 +-
 .../Update_datastore_returns_OK_response.json |   2 +-
 ...fication_template_returns_OK_response.json |   2 +-
 ...an_issue_returns_Bad_Request_response.json |   2 +-
 ...state_of_an_issue_returns_OK_response.json |   2 +-
 .../api/client/v2/api/aws_integration.feature |  16 +
 .../com/datadog/api/client/v2/api/undo.json   |   6 +
 192 files changed, 2140 insertions(+), 992 deletions(-)
 create mode 100644 examples/v2/aws-integration/ValidateAWSCCMConfig.java
 create mode 100644 src/main/java/com/datadog/api/client/v2/model/AWSCcmConfigValidationIssue.java
 create mode 100644 src/main/java/com/datadog/api/client/v2/model/AWSCcmConfigValidationIssueCode.java
 create mode 100644 src/main/java/com/datadog/api/client/v2/model/AWSCcmConfigValidationRequest.java
 create mode 100644 src/main/java/com/datadog/api/client/v2/model/AWSCcmConfigValidationRequestAttributes.java
 create mode 100644 src/main/java/com/datadog/api/client/v2/model/AWSCcmConfigValidationRequestData.java
 create mode 100644 src/main/java/com/datadog/api/client/v2/model/AWSCcmConfigValidationResponse.java
 create mode 100644 src/main/java/com/datadog/api/client/v2/model/AWSCcmConfigValidationResponseAttributes.java
 create mode 100644 src/main/java/com/datadog/api/client/v2/model/AWSCcmConfigValidationResponseData.java
 create mode 100644 src/main/java/com/datadog/api/client/v2/model/AWSCcmConfigValidationType.java
 delete mode 100644 src/main/java/com/datadog/api/client/v2/model/ObservabilityPipelineSplunkHecMetricsDestination.java
 delete mode 100644 src/main/java/com/datadog/api/client/v2/model/ObservabilityPipelineSplunkHecMetricsDestinationCompression.java
 delete mode 100644 src/main/java/com/datadog/api/client/v2/model/ObservabilityPipelineSplunkHecMetricsDestinationType.java

diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml
index 4afc8ca399d..554173ef1da 100644
--- a/.generator/schemas/v2/openapi.yaml
+++ b/.generator/schemas/v2/openapi.yaml
@@ -2437,6 +2437,158 @@ components:
       type: string
       x-enum-varnames:
         - CCM_CONFIG
+    AWSCcmConfigValidationIssue:
+      description: A single validation issue found while validating an AWS Cost and Usage Report (CUR) 2.0 configuration.
+      properties:
+        code:
+          $ref: "#/components/schemas/AWSCcmConfigValidationIssueCode"
+        description:
+          description: Human-readable description of the validation issue.
+          example: 'no CUR 2.0 export named "cost-and-usage-report" found'
+          type: string
+      required:
+        - code
+        - description
+      type: object
+    AWSCcmConfigValidationIssueCode:
+      description: Identifies the specific reason a Cost and Usage Report (CUR) 2.0 configuration failed validation.
+      enum:
+        - ISSUE_CODE_UNSPECIFIED
+        - CREDENTIAL_ERROR
+        - BUCKET_NAME_INVALID_GOVCLOUD
+        - S3_LIST_PERMISSION_MISSING
+        - S3_GET_PERMISSION_MISSING
+        - S3_BUCKET_REGION_MISMATCH
+        - S3_BUCKET_NOT_ACCESSIBLE
+        - EXPORT_LIST_PERMISSION_MISSING
+        - EXPORT_GET_PERMISSION_MISSING
+        - EXPORT_NOT_FOUND
+        - EXPORT_STATUS_UNHEALTHY
+        - TIME_GRANULARITY_INVALID
+        - FILE_FORMAT_INVALID
+        - INCLUDE_RESOURCES_DISABLED
+        - REFRESH_CADENCE_INVALID
+        - OVERWRITE_MODE_INVALID
+        - QUERY_STATEMENT_INVALID
+      example: "EXPORT_NOT_FOUND"
+      type: string
+      x-enum-varnames:
+        - ISSUE_CODE_UNSPECIFIED
+        - CREDENTIAL_ERROR
+        - BUCKET_NAME_INVALID_GOVCLOUD
+        - S3_LIST_PERMISSION_MISSING
+        - S3_GET_PERMISSION_MISSING
+        - S3_BUCKET_REGION_MISMATCH
+        - S3_BUCKET_NOT_ACCESSIBLE
+        - EXPORT_LIST_PERMISSION_MISSING
+        - EXPORT_GET_PERMISSION_MISSING
+        - EXPORT_NOT_FOUND
+        - EXPORT_STATUS_UNHEALTHY
+        - TIME_GRANULARITY_INVALID
+        - FILE_FORMAT_INVALID
+        - INCLUDE_RESOURCES_DISABLED
+        - REFRESH_CADENCE_INVALID
+        - OVERWRITE_MODE_INVALID
+        - QUERY_STATEMENT_INVALID
+    AWSCcmConfigValidationIssues:
+      description: List of validation issues found for the Cost and Usage Report (CUR) 2.0 configuration. Empty when the configuration is valid.
+      items:
+        $ref: "#/components/schemas/AWSCcmConfigValidationIssue"
+      type: array
+    AWSCcmConfigValidationRequest:
+      description: AWS CCM config validation request body.
+      properties:
+        data:
+          $ref: "#/components/schemas/AWSCcmConfigValidationRequestData"
+      required:
+        - data
+      type: object
+    AWSCcmConfigValidationRequestAttributes:
+      description: Attributes for an AWS CCM config validation request.
+      properties:
+        account_id:
+          description: Your AWS Account ID without dashes.
+          example: "123456789012"
+          type: string
+        bucket_name:
+          description: Name of the S3 bucket where the Cost and Usage Report is stored.
+          example: "billing"
+          type: string
+        bucket_region:
+          description: AWS region of the S3 bucket.
+          example: "us-east-1"
+          type: string
+        report_name:
+          description: Name of the Cost and Usage Report.
+          example: "cost-and-usage-report"
+          type: string
+        report_prefix:
+          description: S3 prefix where the Cost and Usage Report is stored.
+          example: "reports"
+          type: string
+      required:
+        - account_id
+        - bucket_name
+        - bucket_region
+        - report_name
+      type: object
+    AWSCcmConfigValidationRequestData:
+      description: AWS CCM config validation request data.
+      properties:
+        attributes:
+          $ref: "#/components/schemas/AWSCcmConfigValidationRequestAttributes"
+        type:
+          $ref: "#/components/schemas/AWSCcmConfigValidationType"
+      required:
+        - attributes
+        - type
+      type: object
+    AWSCcmConfigValidationResponse:
+      description: AWS CCM config validation response body.
+      properties:
+        data:
+          $ref: "#/components/schemas/AWSCcmConfigValidationResponseData"
+      required:
+        - data
+      type: object
+    AWSCcmConfigValidationResponseAttributes:
+      description: Attributes for an AWS CCM config validation response.
+      properties:
+        account_id:
+          description: Your AWS Account ID without dashes.
+          example: "123456789012"
+          type: string
+        issues:
+          $ref: "#/components/schemas/AWSCcmConfigValidationIssues"
+      required:
+        - account_id
+        - issues
+      type: object
+    AWSCcmConfigValidationResponseData:
+      description: AWS CCM config validation response data.
+      properties:
+        attributes:
+          $ref: "#/components/schemas/AWSCcmConfigValidationResponseAttributes"
+        id:
+          description: AWS CCM config validation resource identifier.
+          example: "ccm_config_validation"
+          type: string
+        type:
+          $ref: "#/components/schemas/AWSCcmConfigValidationType"
+      required:
+        - attributes
+        - id
+        - type
+      type: object
+    AWSCcmConfigValidationType:
+      default: "ccm_config_validation"
+      description: AWS CCM config validation resource type.
+      enum:
+        - ccm_config_validation
+      example: "ccm_config_validation"
+      type: string
+      x-enum-varnames:
+        - CCM_CONFIG_VALIDATION
     AWSCloudAuthPersonaMappingAttributesResponse:
       description: Attributes for AWS cloud authentication persona mapping response
       properties:
@@ -55624,7 +55776,6 @@ components:
         - $ref: "#/components/schemas/ObservabilityPipelineSyslogNgDestination"
         - $ref: "#/components/schemas/ObservabilityPipelineDatabricksZerobusDestination"
         - $ref: "#/components/schemas/ObservabilityPipelineDatadogMetricsDestination"
-        - $ref: "#/components/schemas/ObservabilityPipelineSplunkHecMetricsDestination"
     ObservabilityPipelineConfigPipelineType:
       default: logs
       description: The type of data being ingested. Defaults to `logs` if not specified.
@@ -59746,81 +59897,6 @@ components:
       type: string
       x-enum-varnames:
         - SPLUNK_HEC
-    ObservabilityPipelineSplunkHecMetricsDestination:
-      description: |-
-        The `splunk_hec_metrics` destination forwards metrics to Splunk using the HTTP Event Collector (HEC).
-
-        **Supported pipeline types:** metrics
-      properties:
-        buffer:
-          $ref: "#/components/schemas/ObservabilityPipelineBufferOptions"
-        compression:
-          $ref: "#/components/schemas/ObservabilityPipelineSplunkHecMetricsDestinationCompression"
-        default_namespace:
-          description: Optional default namespace for metrics sent to Splunk HEC.
-          example: "custom_namespace"
-          type: string
-        endpoint_url_key:
-          description: Name of the environment variable or secret that holds the Splunk HEC endpoint URL.
-          example: SPLUNK_HEC_ENDPOINT_URL
-          type: string
-        id:
-          description: The unique identifier for this component. Used in other parts of the pipeline to reference this component (for example, as the `input` to downstream components).
-          example: splunk-hec-metrics-destination
-          type: string
-        index:
-          description: Optional name of the Splunk index where metrics are written.
-          example: "metrics"
-          type: string
-        inputs:
-          description: A list of component IDs whose output is used as the `input` for this component.
-          example: ["metrics-filter-processor"]
-          items:
-            description: The ID of a component whose output is used as input for this destination.
-            type: string
-          type: array
-        source:
-          description: The Splunk source field value for metric events.
-          example: "observability_pipelines"
-          type: string
-        sourcetype:
-          description: The Splunk sourcetype to assign to metric events.
-          example: "custom_sourcetype"
-          type: string
-        tls:
-          $ref: "#/components/schemas/ObservabilityPipelineTls"
-        token_key:
-          description: Name of the environment variable or secret that holds the Splunk HEC token.
-          example: SPLUNK_HEC_TOKEN
-          type: string
-        type:
-          $ref: "#/components/schemas/ObservabilityPipelineSplunkHecMetricsDestinationType"
-      required:
-        - id
-        - type
-        - inputs
-      type: object
-      x-pipeline-types: [metrics]
-    ObservabilityPipelineSplunkHecMetricsDestinationCompression:
-      default: none
-      description: Compression algorithm applied when sending metrics to Splunk HEC.
-      enum:
-        - none
-        - gzip
-      example: none
-      type: string
-      x-enum-varnames:
-        - NONE
-        - GZIP
-    ObservabilityPipelineSplunkHecMetricsDestinationType:
-      default: splunk_hec_metrics
-      description: The destination type. Always `splunk_hec_metrics`.
-      enum:
-        - splunk_hec_metrics
-      example: splunk_hec_metrics
-      type: string
-      x-enum-varnames:
-        - SPLUNK_HEC_METRICS
     ObservabilityPipelineSplunkHecSource:
       description: |-
         The `splunk_hec` source implements the Splunk HTTP Event Collector (HEC) API.
@@ -121645,6 +121721,76 @@ paths:
         operator: OR
         permissions:
           - aws_configuration_read
+  /api/v2/integration/aws/validate_ccm_config:
+    post:
+      description: |-
+        Validate a Cloud Cost Management config for an AWS account using Cost and Usage Report
+        (CUR) 2.0 against Datadog's ingest requirements without persisting it.
+      operationId: ValidateAWSCCMConfig
+      requestBody:
+        content:
+          application/json:
+            examples:
+              default:
+                value:
+                  data:
+                    attributes:
+                      account_id: "123456789012"
+                      bucket_name: billing
+                      bucket_region: us-east-1
+                      report_name: cost-and-usage-report
+                      report_prefix: reports
+                    type: ccm_config_validation
+            schema:
+              $ref: "#/components/schemas/AWSCcmConfigValidationRequest"
+        description: Validate a Cloud Cost Management config for an AWS account integration config.
+        required: true
+      responses:
+        "200":
+          content:
+            application/json:
+              examples:
+                default:
+                  value:
+                    data:
+                      attributes:
+                        account_id: "123456789012"
+                        issues:
+                          - code: EXPORT_NOT_FOUND
+                            description: 'no CUR 2.0 export named "cost-and-usage-report" found'
+                      id: ccm_config_validation
+                      type: ccm_config_validation
+              schema:
+                $ref: "#/components/schemas/AWSCcmConfigValidationResponse"
+          description: AWS CCM Config validation result
+        "400":
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/JSONAPIErrorResponse"
+          description: Bad Request
+        "403":
+          $ref: "#/components/responses/ForbiddenResponse"
+        "429":
+          $ref: "#/components/responses/TooManyRequestsResponse"
+        "503":
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/JSONAPIErrorResponse"
+          description: Service Unavailable
+      summary: Validate AWS CCM config
+      tags:
+        - AWS Integration
+      x-codegen-request-body-name: body
+      "x-permission":
+        operator: OR
+        permissions:
+          - cloud_cost_management_read
+          - cloud_cost_management_write
+      x-unstable: |-
+        **Note**: This endpoint is in Preview and may be subject to change.
+        If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
   /api/v2/integration/gcp/accounts:
     get:
       description: List all GCP STS-enabled service accounts configured in your Datadog account.
diff --git a/examples/v2/aws-integration/ValidateAWSCCMConfig.java b/examples/v2/aws-integration/ValidateAWSCCMConfig.java
new file mode 100644
index 00000000000..941fa4435d0
--- /dev/null
+++ b/examples/v2/aws-integration/ValidateAWSCCMConfig.java
@@ -0,0 +1,42 @@
+// Validate AWS CCM config returns "AWS CCM Config validation result" response
+
+import com.datadog.api.client.ApiClient;
+import com.datadog.api.client.ApiException;
+import com.datadog.api.client.v2.api.AwsIntegrationApi;
+import com.datadog.api.client.v2.model.AWSCcmConfigValidationRequest;
+import com.datadog.api.client.v2.model.AWSCcmConfigValidationRequestAttributes;
+import com.datadog.api.client.v2.model.AWSCcmConfigValidationRequestData;
+import com.datadog.api.client.v2.model.AWSCcmConfigValidationResponse;
+import com.datadog.api.client.v2.model.AWSCcmConfigValidationType;
+
+public class Example {
+  public static void main(String[] args) {
+    ApiClient defaultClient = ApiClient.getDefaultApiClient();
+    defaultClient.setUnstableOperationEnabled("v2.validateAWSCCMConfig", true);
+    AwsIntegrationApi apiInstance = new AwsIntegrationApi(defaultClient);
+
+    AWSCcmConfigValidationRequest body =
+        new AWSCcmConfigValidationRequest()
+            .data(
+                new AWSCcmConfigValidationRequestData()
+                    .attributes(
+                        new AWSCcmConfigValidationRequestAttributes()
+                            .accountId("123456789012")
+                            .bucketName("billing")
+                            .bucketRegion("us-east-1")
+                            .reportName("cost-and-usage-report")
+                            .reportPrefix("reports"))
+                    .type(AWSCcmConfigValidationType.CCM_CONFIG_VALIDATION));
+
+    try {
+      AWSCcmConfigValidationResponse result = apiInstance.validateAWSCCMConfig(body);
+      System.out.println(result);
+    } catch (ApiException e) {
+      System.err.println("Exception when calling AwsIntegrationApi#validateAWSCCMConfig");
+      System.err.println("Status code: " + e.getCode());
+      System.err.println("Reason: " + e.getResponseBody());
+      System.err.println("Response headers: " + e.getResponseHeaders());
+      e.printStackTrace();
+    }
+  }
+}
diff --git a/src/main/java/com/datadog/api/client/ApiClient.java b/src/main/java/com/datadog/api/client/ApiClient.java
index c172f090b44..49eacbf0d51 100644
--- a/src/main/java/com/datadog/api/client/ApiClient.java
+++ b/src/main/java/com/datadog/api/client/ApiClient.java
@@ -1044,6 +1044,7 @@ public class ApiClient {
           put("v2.deleteAWSAccountCCMConfig", false);
           put("v2.getAWSAccountCCMConfig", false);
           put("v2.updateAWSAccountCCMConfig", false);
+          put("v2.validateAWSCCMConfig", false);
           put("v2.createJiraIssueTemplate", false);
           put("v2.deleteJiraAccount", false);
           put("v2.deleteJiraIssueTemplate", false);
diff --git a/src/main/java/com/datadog/api/client/v2/api/AwsIntegrationApi.java b/src/main/java/com/datadog/api/client/v2/api/AwsIntegrationApi.java
index a7ecdf67eef..6eef3621915 100644
--- a/src/main/java/com/datadog/api/client/v2/api/AwsIntegrationApi.java
+++ b/src/main/java/com/datadog/api/client/v2/api/AwsIntegrationApi.java
@@ -10,6 +10,8 @@
 import com.datadog.api.client.v2.model.AWSAccountsResponse;
 import com.datadog.api.client.v2.model.AWSCcmConfigRequest;
 import com.datadog.api.client.v2.model.AWSCcmConfigResponse;
+import com.datadog.api.client.v2.model.AWSCcmConfigValidationRequest;
+import com.datadog.api.client.v2.model.AWSCcmConfigValidationResponse;
 import com.datadog.api.client.v2.model.AWSEventBridgeCreateRequest;
 import com.datadog.api.client.v2.model.AWSEventBridgeCreateResponse;
 import com.datadog.api.client.v2.model.AWSEventBridgeDeleteRequest;
@@ -2535,4 +2537,163 @@ public ApiResponse<AWSCcmConfigResponse> updateAWSAccountCCMConfigWithHttpInfo(
         false,
         new GenericType<AWSCcmConfigResponse>() {});
   }
+
+  /**
+   * Validate AWS CCM config.
+   *
+   * <p>See {@link #validateAWSCCMConfigWithHttpInfo}.
+   *
+   * @param body Validate a Cloud Cost Management config for an AWS account integration config.
+   *     (required)
+   * @return AWSCcmConfigValidationResponse
+   * @throws ApiException if fails to make API call
+   */
+  public AWSCcmConfigValidationResponse validateAWSCCMConfig(AWSCcmConfigValidationRequest body)
+      throws ApiException {
+    return validateAWSCCMConfigWithHttpInfo(body).getData();
+  }
+
+  /**
+   * Validate AWS CCM config.
+   *
+   * <p>See {@link #validateAWSCCMConfigWithHttpInfoAsync}.
+   *
+   * @param body Validate a Cloud Cost Management config for an AWS account integration config.
+   *     (required)
+   * @return CompletableFuture&lt;AWSCcmConfigValidationResponse&gt;
+   */
+  public CompletableFuture<AWSCcmConfigValidationResponse> validateAWSCCMConfigAsync(
+      AWSCcmConfigValidationRequest body) {
+    return validateAWSCCMConfigWithHttpInfoAsync(body)
+        .thenApply(
+            response -> {
+              return response.getData();
+            });
+  }
+
+  /**
+   * Validate a Cloud Cost Management config for an AWS account using Cost and Usage Report (CUR)
+   * 2.0 against Datadog's ingest requirements without persisting it.
+   *
+   * @param body Validate a Cloud Cost Management config for an AWS account integration config.
+   *     (required)
+   * @return ApiResponse&lt;AWSCcmConfigValidationResponse&gt;
+   * @throws ApiException if fails to make API call
+   * @http.response.details
+   *     <table border="1">
+   *    <caption>Response details</caption>
+   *       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+   *       <tr><td> 200 </td><td> AWS CCM Config validation result </td><td>  -  </td></tr>
+   *       <tr><td> 400 </td><td> Bad Request </td><td>  -  </td></tr>
+   *       <tr><td> 403 </td><td> Forbidden </td><td>  -  </td></tr>
+   *       <tr><td> 429 </td><td> Too many requests </td><td>  -  </td></tr>
+   *       <tr><td> 503 </td><td> Service Unavailable </td><td>  -  </td></tr>
+   *     </table>
+   */
+  public ApiResponse<AWSCcmConfigValidationResponse> validateAWSCCMConfigWithHttpInfo(
+      AWSCcmConfigValidationRequest body) throws ApiException {
+    // Check if unstable operation is enabled
+    String operationId = "validateAWSCCMConfig";
+    if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
+      apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
+    } else {
+      throw new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId));
+    }
+    Object localVarPostBody = body;
+
+    // verify the required parameter 'body' is set
+    if (body == null) {
+      throw new ApiException(
+          400, "Missing the required parameter 'body' when calling validateAWSCCMConfig");
+    }
+    // create path and map variables
+    String localVarPath = "/api/v2/integration/aws/validate_ccm_config";
+
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+    Invocation.Builder builder =
+        apiClient.createBuilder(
+            "v2.AwsIntegrationApi.validateAWSCCMConfig",
+            localVarPath,
+            new ArrayList<Pair>(),
+            localVarHeaderParams,
+            new HashMap<String, String>(),
+            new String[] {"application/json"},
+            new String[] {"apiKeyAuth", "appKeyAuth"});
+    return apiClient.invokeAPI(
+        "POST",
+        builder,
+        localVarHeaderParams,
+        new String[] {"application/json"},
+        localVarPostBody,
+        new HashMap<String, Object>(),
+        false,
+        new GenericType<AWSCcmConfigValidationResponse>() {});
+  }
+
+  /**
+   * Validate AWS CCM config.
+   *
+   * <p>See {@link #validateAWSCCMConfigWithHttpInfo}.
+   *
+   * @param body Validate a Cloud Cost Management config for an AWS account integration config.
+   *     (required)
+   * @return CompletableFuture&lt;ApiResponse&lt;AWSCcmConfigValidationResponse&gt;&gt;
+   */
+  public CompletableFuture<ApiResponse<AWSCcmConfigValidationResponse>>
+      validateAWSCCMConfigWithHttpInfoAsync(AWSCcmConfigValidationRequest body) {
+    // Check if unstable operation is enabled
+    String operationId = "validateAWSCCMConfig";
+    if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
+      apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
+    } else {
+      CompletableFuture<ApiResponse<AWSCcmConfigValidationResponse>> result =
+          new CompletableFuture<>();
+      result.completeExceptionally(
+          new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId)));
+      return result;
+    }
+    Object localVarPostBody = body;
+
+    // verify the required parameter 'body' is set
+    if (body == null) {
+      CompletableFuture<ApiResponse<AWSCcmConfigValidationResponse>> result =
+          new CompletableFuture<>();
+      result.completeExceptionally(
+          new ApiException(
+              400, "Missing the required parameter 'body' when calling validateAWSCCMConfig"));
+      return result;
+    }
+    // create path and map variables
+    String localVarPath = "/api/v2/integration/aws/validate_ccm_config";
+
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+    Invocation.Builder builder;
+    try {
+      builder =
+          apiClient.createBuilder(
+              "v2.AwsIntegrationApi.validateAWSCCMConfig",
+              localVarPath,
+              new ArrayList<Pair>(),
+              localVarHeaderParams,
+              new HashMap<String, String>(),
+              new String[] {"application/json"},
+              new String[] {"apiKeyAuth", "appKeyAuth"});
+    } catch (ApiException ex) {
+      CompletableFuture<ApiResponse<AWSCcmConfigValidationResponse>> result =
+          new CompletableFuture<>();
+      result.completeExceptionally(ex);
+      return result;
+    }
+    return apiClient.invokeAPIAsync(
+        "POST",
+        builder,
+        localVarHeaderParams,
+        new String[] {"application/json"},
+        localVarPostBody,
+        new HashMap<String, Object>(),
+        false,
+        new GenericType<AWSCcmConfigValidationResponse>() {});
+  }
 }
diff --git a/src/main/java/com/datadog/api/client/v2/model/AWSCcmConfigValidationIssue.java b/src/main/java/com/datadog/api/client/v2/model/AWSCcmConfigValidationIssue.java
new file mode 100644
index 00000000000..7f883336036
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/AWSCcmConfigValidationIssue.java
@@ -0,0 +1,184 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019-Present Datadog, Inc.
+ */
+
+package com.datadog.api.client.v2.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * A single validation issue found while validating an AWS Cost and Usage Report (CUR) 2.0
+ * configuration.
+ */
+@JsonPropertyOrder({
+  AWSCcmConfigValidationIssue.JSON_PROPERTY_CODE,
+  AWSCcmConfigValidationIssue.JSON_PROPERTY_DESCRIPTION
+})
+@jakarta.annotation.Generated(
+    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
+public class AWSCcmConfigValidationIssue {
+  @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_CODE = "code";
+  private AWSCcmConfigValidationIssueCode code;
+
+  public static final String JSON_PROPERTY_DESCRIPTION = "description";
+  private String description;
+
+  public AWSCcmConfigValidationIssue() {}
+
+  @JsonCreator
+  public AWSCcmConfigValidationIssue(
+      @JsonProperty(required = true, value = JSON_PROPERTY_CODE)
+          AWSCcmConfigValidationIssueCode code,
+      @JsonProperty(required = true, value = JSON_PROPERTY_DESCRIPTION) String description) {
+    this.code = code;
+    this.unparsed |= !code.isValid();
+    this.description = description;
+  }
+
+  public AWSCcmConfigValidationIssue code(AWSCcmConfigValidationIssueCode code) {
+    this.code = code;
+    this.unparsed |= !code.isValid();
+    return this;
+  }
+
+  /**
+   * Identifies the specific reason a Cost and Usage Report (CUR) 2.0 configuration failed
+   * validation.
+   *
+   * @return code
+   */
+  @JsonProperty(JSON_PROPERTY_CODE)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public AWSCcmConfigValidationIssueCode getCode() {
+    return code;
+  }
+
+  public void setCode(AWSCcmConfigValidationIssueCode code) {
+    if (!code.isValid()) {
+      this.unparsed = true;
+    }
+    this.code = code;
+  }
+
+  public AWSCcmConfigValidationIssue description(String description) {
+    this.description = description;
+    return this;
+  }
+
+  /**
+   * Human-readable description of the validation issue.
+   *
+   * @return description
+   */
+  @JsonProperty(JSON_PROPERTY_DESCRIPTION)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public String getDescription() {
+    return description;
+  }
+
+  public void setDescription(String description) {
+    this.description = description;
+  }
+
+  /**
+   * A container for additional, undeclared properties. This is a holder for any undeclared
+   * properties as specified with the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
+
+  /**
+   * Set the additional (undeclared) property with the specified name and value. If the property
+   * does not already exist, create it otherwise replace it.
+   *
+   * @param key The arbitrary key to set
+   * @param value The associated value
+   * @return AWSCcmConfigValidationIssue
+   */
+  @JsonAnySetter
+  public AWSCcmConfigValidationIssue putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+      this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   *
+   * @return The additional properties
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   *
+   * @param key The arbitrary key to get
+   * @return The specific additional property for the given key
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+      return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /** Return true if this AWSCcmConfigValidationIssue object is equal to o. */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AWSCcmConfigValidationIssue awsCcmConfigValidationIssue = (AWSCcmConfigValidationIssue) o;
+    return Objects.equals(this.code, awsCcmConfigValidationIssue.code)
+        && Objects.equals(this.description, awsCcmConfigValidationIssue.description)
+        && Objects.equals(
+            this.additionalProperties, awsCcmConfigValidationIssue.additionalProperties);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(code, description, additionalProperties);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AWSCcmConfigValidationIssue {\n");
+    sb.append("    code: ").append(toIndentedString(code)).append("\n");
+    sb.append("    description: ").append(toIndentedString(description)).append("\n");
+    sb.append("    additionalProperties: ")
+        .append(toIndentedString(additionalProperties))
+        .append("\n");
+    sb.append('}');
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/src/main/java/com/datadog/api/client/v2/model/AWSCcmConfigValidationIssueCode.java b/src/main/java/com/datadog/api/client/v2/model/AWSCcmConfigValidationIssueCode.java
new file mode 100644
index 00000000000..34912050f8a
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/AWSCcmConfigValidationIssueCode.java
@@ -0,0 +1,110 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019-Present Datadog, Inc.
+ */
+
+package com.datadog.api.client.v2.model;
+
+import com.datadog.api.client.ModelEnum;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * Identifies the specific reason a Cost and Usage Report (CUR) 2.0 configuration failed validation.
+ */
+@JsonSerialize(
+    using = AWSCcmConfigValidationIssueCode.AWSCcmConfigValidationIssueCodeSerializer.class)
+public class AWSCcmConfigValidationIssueCode extends ModelEnum<String> {
+
+  private static final Set<String> allowedValues =
+      new HashSet<String>(
+          Arrays.asList(
+              "ISSUE_CODE_UNSPECIFIED",
+              "CREDENTIAL_ERROR",
+              "BUCKET_NAME_INVALID_GOVCLOUD",
+              "S3_LIST_PERMISSION_MISSING",
+              "S3_GET_PERMISSION_MISSING",
+              "S3_BUCKET_REGION_MISMATCH",
+              "S3_BUCKET_NOT_ACCESSIBLE",
+              "EXPORT_LIST_PERMISSION_MISSING",
+              "EXPORT_GET_PERMISSION_MISSING",
+              "EXPORT_NOT_FOUND",
+              "EXPORT_STATUS_UNHEALTHY",
+              "TIME_GRANULARITY_INVALID",
+              "FILE_FORMAT_INVALID",
+              "INCLUDE_RESOURCES_DISABLED",
+              "REFRESH_CADENCE_INVALID",
+              "OVERWRITE_MODE_INVALID",
+              "QUERY_STATEMENT_INVALID"));
+
+  public static final AWSCcmConfigValidationIssueCode ISSUE_CODE_UNSPECIFIED =
+      new AWSCcmConfigValidationIssueCode("ISSUE_CODE_UNSPECIFIED");
+  public static final AWSCcmConfigValidationIssueCode CREDENTIAL_ERROR =
+      new AWSCcmConfigValidationIssueCode("CREDENTIAL_ERROR");
+  public static final AWSCcmConfigValidationIssueCode BUCKET_NAME_INVALID_GOVCLOUD =
+      new AWSCcmConfigValidationIssueCode("BUCKET_NAME_INVALID_GOVCLOUD");
+  public static final AWSCcmConfigValidationIssueCode S3_LIST_PERMISSION_MISSING =
+      new AWSCcmConfigValidationIssueCode("S3_LIST_PERMISSION_MISSING");
+  public static final AWSCcmConfigValidationIssueCode S3_GET_PERMISSION_MISSING =
+      new AWSCcmConfigValidationIssueCode("S3_GET_PERMISSION_MISSING");
+  public static final AWSCcmConfigValidationIssueCode S3_BUCKET_REGION_MISMATCH =
+      new AWSCcmConfigValidationIssueCode("S3_BUCKET_REGION_MISMATCH");
+  public static final AWSCcmConfigValidationIssueCode S3_BUCKET_NOT_ACCESSIBLE =
+      new AWSCcmConfigValidationIssueCode("S3_BUCKET_NOT_ACCESSIBLE");
+  public static final AWSCcmConfigValidationIssueCode EXPORT_LIST_PERMISSION_MISSING =
+      new AWSCcmConfigValidationIssueCode("EXPORT_LIST_PERMISSION_MISSING");
+  public static final AWSCcmConfigValidationIssueCode EXPORT_GET_PERMISSION_MISSING =
+      new AWSCcmConfigValidationIssueCode("EXPORT_GET_PERMISSION_MISSING");
+  public static final AWSCcmConfigValidationIssueCode EXPORT_NOT_FOUND =
+      new AWSCcmConfigValidationIssueCode("EXPORT_NOT_FOUND");
+  public static final AWSCcmConfigValidationIssueCode EXPORT_STATUS_UNHEALTHY =
+      new AWSCcmConfigValidationIssueCode("EXPORT_STATUS_UNHEALTHY");
+  public static final AWSCcmConfigValidationIssueCode TIME_GRANULARITY_INVALID =
+      new AWSCcmConfigValidationIssueCode("TIME_GRANULARITY_INVALID");
+  public static final AWSCcmConfigValidationIssueCode FILE_FORMAT_INVALID =
+      new AWSCcmConfigValidationIssueCode("FILE_FORMAT_INVALID");
+  public static final AWSCcmConfigValidationIssueCode INCLUDE_RESOURCES_DISABLED =
+      new AWSCcmConfigValidationIssueCode("INCLUDE_RESOURCES_DISABLED");
+  public static final AWSCcmConfigValidationIssueCode REFRESH_CADENCE_INVALID =
+      new AWSCcmConfigValidationIssueCode("REFRESH_CADENCE_INVALID");
+  public static final AWSCcmConfigValidationIssueCode OVERWRITE_MODE_INVALID =
+      new AWSCcmConfigValidationIssueCode("OVERWRITE_MODE_INVALID");
+  public static final AWSCcmConfigValidationIssueCode QUERY_STATEMENT_INVALID =
+      new AWSCcmConfigValidationIssueCode("QUERY_STATEMENT_INVALID");
+
+  AWSCcmConfigValidationIssueCode(String value) {
+    super(value, allowedValues);
+  }
+
+  public static class AWSCcmConfigValidationIssueCodeSerializer
+      extends StdSerializer<AWSCcmConfigValidationIssueCode> {
+    public AWSCcmConfigValidationIssueCodeSerializer(Class<AWSCcmConfigValidationIssueCode> t) {
+      super(t);
+    }
+
+    public AWSCcmConfigValidationIssueCodeSerializer() {
+      this(null);
+    }
+
+    @Override
+    public void serialize(
+        AWSCcmConfigValidationIssueCode value, JsonGenerator jgen, SerializerProvider provider)
+        throws IOException, JsonProcessingException {
+      jgen.writeObject(value.value);
+    }
+  }
+
+  @JsonCreator
+  public static AWSCcmConfigValidationIssueCode fromValue(String value) {
+    return new AWSCcmConfigValidationIssueCode(value);
+  }
+}
diff --git a/src/main/java/com/datadog/api/client/v2/model/AWSCcmConfigValidationRequest.java b/src/main/java/com/datadog/api/client/v2/model/AWSCcmConfigValidationRequest.java
new file mode 100644
index 00000000000..9dd8b3fbb0f
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/AWSCcmConfigValidationRequest.java
@@ -0,0 +1,147 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019-Present Datadog, Inc.
+ */
+
+package com.datadog.api.client.v2.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+/** AWS CCM config validation request body. */
+@JsonPropertyOrder({AWSCcmConfigValidationRequest.JSON_PROPERTY_DATA})
+@jakarta.annotation.Generated(
+    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
+public class AWSCcmConfigValidationRequest {
+  @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_DATA = "data";
+  private AWSCcmConfigValidationRequestData data;
+
+  public AWSCcmConfigValidationRequest() {}
+
+  @JsonCreator
+  public AWSCcmConfigValidationRequest(
+      @JsonProperty(required = true, value = JSON_PROPERTY_DATA)
+          AWSCcmConfigValidationRequestData data) {
+    this.data = data;
+    this.unparsed |= data.unparsed;
+  }
+
+  public AWSCcmConfigValidationRequest data(AWSCcmConfigValidationRequestData data) {
+    this.data = data;
+    this.unparsed |= data.unparsed;
+    return this;
+  }
+
+  /**
+   * AWS CCM config validation request data.
+   *
+   * @return data
+   */
+  @JsonProperty(JSON_PROPERTY_DATA)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public AWSCcmConfigValidationRequestData getData() {
+    return data;
+  }
+
+  public void setData(AWSCcmConfigValidationRequestData data) {
+    this.data = data;
+  }
+
+  /**
+   * A container for additional, undeclared properties. This is a holder for any undeclared
+   * properties as specified with the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
+
+  /**
+   * Set the additional (undeclared) property with the specified name and value. If the property
+   * does not already exist, create it otherwise replace it.
+   *
+   * @param key The arbitrary key to set
+   * @param value The associated value
+   * @return AWSCcmConfigValidationRequest
+   */
+  @JsonAnySetter
+  public AWSCcmConfigValidationRequest putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+      this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   *
+   * @return The additional properties
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   *
+   * @param key The arbitrary key to get
+   * @return The specific additional property for the given key
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+      return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /** Return true if this AWSCcmConfigValidationRequest object is equal to o. */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AWSCcmConfigValidationRequest awsCcmConfigValidationRequest = (AWSCcmConfigValidationRequest) o;
+    return Objects.equals(this.data, awsCcmConfigValidationRequest.data)
+        && Objects.equals(
+            this.additionalProperties, awsCcmConfigValidationRequest.additionalProperties);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(data, additionalProperties);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AWSCcmConfigValidationRequest {\n");
+    sb.append("    data: ").append(toIndentedString(data)).append("\n");
+    sb.append("    additionalProperties: ")
+        .append(toIndentedString(additionalProperties))
+        .append("\n");
+    sb.append('}');
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/src/main/java/com/datadog/api/client/v2/model/AWSCcmConfigValidationRequestAttributes.java b/src/main/java/com/datadog/api/client/v2/model/AWSCcmConfigValidationRequestAttributes.java
new file mode 100644
index 00000000000..011817307c9
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/AWSCcmConfigValidationRequestAttributes.java
@@ -0,0 +1,260 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019-Present Datadog, Inc.
+ */
+
+package com.datadog.api.client.v2.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+/** Attributes for an AWS CCM config validation request. */
+@JsonPropertyOrder({
+  AWSCcmConfigValidationRequestAttributes.JSON_PROPERTY_ACCOUNT_ID,
+  AWSCcmConfigValidationRequestAttributes.JSON_PROPERTY_BUCKET_NAME,
+  AWSCcmConfigValidationRequestAttributes.JSON_PROPERTY_BUCKET_REGION,
+  AWSCcmConfigValidationRequestAttributes.JSON_PROPERTY_REPORT_NAME,
+  AWSCcmConfigValidationRequestAttributes.JSON_PROPERTY_REPORT_PREFIX
+})
+@jakarta.annotation.Generated(
+    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
+public class AWSCcmConfigValidationRequestAttributes {
+  @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_ACCOUNT_ID = "account_id";
+  private String accountId;
+
+  public static final String JSON_PROPERTY_BUCKET_NAME = "bucket_name";
+  private String bucketName;
+
+  public static final String JSON_PROPERTY_BUCKET_REGION = "bucket_region";
+  private String bucketRegion;
+
+  public static final String JSON_PROPERTY_REPORT_NAME = "report_name";
+  private String reportName;
+
+  public static final String JSON_PROPERTY_REPORT_PREFIX = "report_prefix";
+  private String reportPrefix;
+
+  public AWSCcmConfigValidationRequestAttributes() {}
+
+  @JsonCreator
+  public AWSCcmConfigValidationRequestAttributes(
+      @JsonProperty(required = true, value = JSON_PROPERTY_ACCOUNT_ID) String accountId,
+      @JsonProperty(required = true, value = JSON_PROPERTY_BUCKET_NAME) String bucketName,
+      @JsonProperty(required = true, value = JSON_PROPERTY_BUCKET_REGION) String bucketRegion,
+      @JsonProperty(required = true, value = JSON_PROPERTY_REPORT_NAME) String reportName) {
+    this.accountId = accountId;
+    this.bucketName = bucketName;
+    this.bucketRegion = bucketRegion;
+    this.reportName = reportName;
+  }
+
+  public AWSCcmConfigValidationRequestAttributes accountId(String accountId) {
+    this.accountId = accountId;
+    return this;
+  }
+
+  /**
+   * Your AWS Account ID without dashes.
+   *
+   * @return accountId
+   */
+  @JsonProperty(JSON_PROPERTY_ACCOUNT_ID)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public String getAccountId() {
+    return accountId;
+  }
+
+  public void setAccountId(String accountId) {
+    this.accountId = accountId;
+  }
+
+  public AWSCcmConfigValidationRequestAttributes bucketName(String bucketName) {
+    this.bucketName = bucketName;
+    return this;
+  }
+
+  /**
+   * Name of the S3 bucket where the Cost and Usage Report is stored.
+   *
+   * @return bucketName
+   */
+  @JsonProperty(JSON_PROPERTY_BUCKET_NAME)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public String getBucketName() {
+    return bucketName;
+  }
+
+  public void setBucketName(String bucketName) {
+    this.bucketName = bucketName;
+  }
+
+  public AWSCcmConfigValidationRequestAttributes bucketRegion(String bucketRegion) {
+    this.bucketRegion = bucketRegion;
+    return this;
+  }
+
+  /**
+   * AWS region of the S3 bucket.
+   *
+   * @return bucketRegion
+   */
+  @JsonProperty(JSON_PROPERTY_BUCKET_REGION)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public String getBucketRegion() {
+    return bucketRegion;
+  }
+
+  public void setBucketRegion(String bucketRegion) {
+    this.bucketRegion = bucketRegion;
+  }
+
+  public AWSCcmConfigValidationRequestAttributes reportName(String reportName) {
+    this.reportName = reportName;
+    return this;
+  }
+
+  /**
+   * Name of the Cost and Usage Report.
+   *
+   * @return reportName
+   */
+  @JsonProperty(JSON_PROPERTY_REPORT_NAME)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public String getReportName() {
+    return reportName;
+  }
+
+  public void setReportName(String reportName) {
+    this.reportName = reportName;
+  }
+
+  public AWSCcmConfigValidationRequestAttributes reportPrefix(String reportPrefix) {
+    this.reportPrefix = reportPrefix;
+    return this;
+  }
+
+  /**
+   * S3 prefix where the Cost and Usage Report is stored.
+   *
+   * @return reportPrefix
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_REPORT_PREFIX)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public String getReportPrefix() {
+    return reportPrefix;
+  }
+
+  public void setReportPrefix(String reportPrefix) {
+    this.reportPrefix = reportPrefix;
+  }
+
+  /**
+   * A container for additional, undeclared properties. This is a holder for any undeclared
+   * properties as specified with the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
+
+  /**
+   * Set the additional (undeclared) property with the specified name and value. If the property
+   * does not already exist, create it otherwise replace it.
+   *
+   * @param key The arbitrary key to set
+   * @param value The associated value
+   * @return AWSCcmConfigValidationRequestAttributes
+   */
+  @JsonAnySetter
+  public AWSCcmConfigValidationRequestAttributes putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+      this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   *
+   * @return The additional properties
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   *
+   * @param key The arbitrary key to get
+   * @return The specific additional property for the given key
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+      return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /** Return true if this AWSCcmConfigValidationRequestAttributes object is equal to o. */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AWSCcmConfigValidationRequestAttributes awsCcmConfigValidationRequestAttributes =
+        (AWSCcmConfigValidationRequestAttributes) o;
+    return Objects.equals(this.accountId, awsCcmConfigValidationRequestAttributes.accountId)
+        && Objects.equals(this.bucketName, awsCcmConfigValidationRequestAttributes.bucketName)
+        && Objects.equals(this.bucketRegion, awsCcmConfigValidationRequestAttributes.bucketRegion)
+        && Objects.equals(this.reportName, awsCcmConfigValidationRequestAttributes.reportName)
+        && Objects.equals(this.reportPrefix, awsCcmConfigValidationRequestAttributes.reportPrefix)
+        && Objects.equals(
+            this.additionalProperties,
+            awsCcmConfigValidationRequestAttributes.additionalProperties);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(
+        accountId, bucketName, bucketRegion, reportName, reportPrefix, additionalProperties);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AWSCcmConfigValidationRequestAttributes {\n");
+    sb.append("    accountId: ").append(toIndentedString(accountId)).append("\n");
+    sb.append("    bucketName: ").append(toIndentedString(bucketName)).append("\n");
+    sb.append("    bucketRegion: ").append(toIndentedString(bucketRegion)).append("\n");
+    sb.append("    reportName: ").append(toIndentedString(reportName)).append("\n");
+    sb.append("    reportPrefix: ").append(toIndentedString(reportPrefix)).append("\n");
+    sb.append("    additionalProperties: ")
+        .append(toIndentedString(additionalProperties))
+        .append("\n");
+    sb.append('}');
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/src/main/java/com/datadog/api/client/v2/model/AWSCcmConfigValidationRequestData.java b/src/main/java/com/datadog/api/client/v2/model/AWSCcmConfigValidationRequestData.java
new file mode 100644
index 00000000000..5a0df275b0b
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/AWSCcmConfigValidationRequestData.java
@@ -0,0 +1,184 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019-Present Datadog, Inc.
+ */
+
+package com.datadog.api.client.v2.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+/** AWS CCM config validation request data. */
+@JsonPropertyOrder({
+  AWSCcmConfigValidationRequestData.JSON_PROPERTY_ATTRIBUTES,
+  AWSCcmConfigValidationRequestData.JSON_PROPERTY_TYPE
+})
+@jakarta.annotation.Generated(
+    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
+public class AWSCcmConfigValidationRequestData {
+  @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_ATTRIBUTES = "attributes";
+  private AWSCcmConfigValidationRequestAttributes attributes;
+
+  public static final String JSON_PROPERTY_TYPE = "type";
+  private AWSCcmConfigValidationType type = AWSCcmConfigValidationType.CCM_CONFIG_VALIDATION;
+
+  public AWSCcmConfigValidationRequestData() {}
+
+  @JsonCreator
+  public AWSCcmConfigValidationRequestData(
+      @JsonProperty(required = true, value = JSON_PROPERTY_ATTRIBUTES)
+          AWSCcmConfigValidationRequestAttributes attributes,
+      @JsonProperty(required = true, value = JSON_PROPERTY_TYPE) AWSCcmConfigValidationType type) {
+    this.attributes = attributes;
+    this.unparsed |= attributes.unparsed;
+    this.type = type;
+    this.unparsed |= !type.isValid();
+  }
+
+  public AWSCcmConfigValidationRequestData attributes(
+      AWSCcmConfigValidationRequestAttributes attributes) {
+    this.attributes = attributes;
+    this.unparsed |= attributes.unparsed;
+    return this;
+  }
+
+  /**
+   * Attributes for an AWS CCM config validation request.
+   *
+   * @return attributes
+   */
+  @JsonProperty(JSON_PROPERTY_ATTRIBUTES)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public AWSCcmConfigValidationRequestAttributes getAttributes() {
+    return attributes;
+  }
+
+  public void setAttributes(AWSCcmConfigValidationRequestAttributes attributes) {
+    this.attributes = attributes;
+  }
+
+  public AWSCcmConfigValidationRequestData type(AWSCcmConfigValidationType type) {
+    this.type = type;
+    this.unparsed |= !type.isValid();
+    return this;
+  }
+
+  /**
+   * AWS CCM config validation resource type.
+   *
+   * @return type
+   */
+  @JsonProperty(JSON_PROPERTY_TYPE)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public AWSCcmConfigValidationType getType() {
+    return type;
+  }
+
+  public void setType(AWSCcmConfigValidationType type) {
+    if (!type.isValid()) {
+      this.unparsed = true;
+    }
+    this.type = type;
+  }
+
+  /**
+   * A container for additional, undeclared properties. This is a holder for any undeclared
+   * properties as specified with the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
+
+  /**
+   * Set the additional (undeclared) property with the specified name and value. If the property
+   * does not already exist, create it otherwise replace it.
+   *
+   * @param key The arbitrary key to set
+   * @param value The associated value
+   * @return AWSCcmConfigValidationRequestData
+   */
+  @JsonAnySetter
+  public AWSCcmConfigValidationRequestData putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+      this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   *
+   * @return The additional properties
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   *
+   * @param key The arbitrary key to get
+   * @return The specific additional property for the given key
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+      return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /** Return true if this AWSCcmConfigValidationRequestData object is equal to o. */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AWSCcmConfigValidationRequestData awsCcmConfigValidationRequestData =
+        (AWSCcmConfigValidationRequestData) o;
+    return Objects.equals(this.attributes, awsCcmConfigValidationRequestData.attributes)
+        && Objects.equals(this.type, awsCcmConfigValidationRequestData.type)
+        && Objects.equals(
+            this.additionalProperties, awsCcmConfigValidationRequestData.additionalProperties);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(attributes, type, additionalProperties);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AWSCcmConfigValidationRequestData {\n");
+    sb.append("    attributes: ").append(toIndentedString(attributes)).append("\n");
+    sb.append("    type: ").append(toIndentedString(type)).append("\n");
+    sb.append("    additionalProperties: ")
+        .append(toIndentedString(additionalProperties))
+        .append("\n");
+    sb.append('}');
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/src/main/java/com/datadog/api/client/v2/model/AWSCcmConfigValidationResponse.java b/src/main/java/com/datadog/api/client/v2/model/AWSCcmConfigValidationResponse.java
new file mode 100644
index 00000000000..b5dde2b9247
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/AWSCcmConfigValidationResponse.java
@@ -0,0 +1,148 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019-Present Datadog, Inc.
+ */
+
+package com.datadog.api.client.v2.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+/** AWS CCM config validation response body. */
+@JsonPropertyOrder({AWSCcmConfigValidationResponse.JSON_PROPERTY_DATA})
+@jakarta.annotation.Generated(
+    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
+public class AWSCcmConfigValidationResponse {
+  @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_DATA = "data";
+  private AWSCcmConfigValidationResponseData data;
+
+  public AWSCcmConfigValidationResponse() {}
+
+  @JsonCreator
+  public AWSCcmConfigValidationResponse(
+      @JsonProperty(required = true, value = JSON_PROPERTY_DATA)
+          AWSCcmConfigValidationResponseData data) {
+    this.data = data;
+    this.unparsed |= data.unparsed;
+  }
+
+  public AWSCcmConfigValidationResponse data(AWSCcmConfigValidationResponseData data) {
+    this.data = data;
+    this.unparsed |= data.unparsed;
+    return this;
+  }
+
+  /**
+   * AWS CCM config validation response data.
+   *
+   * @return data
+   */
+  @JsonProperty(JSON_PROPERTY_DATA)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public AWSCcmConfigValidationResponseData getData() {
+    return data;
+  }
+
+  public void setData(AWSCcmConfigValidationResponseData data) {
+    this.data = data;
+  }
+
+  /**
+   * A container for additional, undeclared properties. This is a holder for any undeclared
+   * properties as specified with the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
+
+  /**
+   * Set the additional (undeclared) property with the specified name and value. If the property
+   * does not already exist, create it otherwise replace it.
+   *
+   * @param key The arbitrary key to set
+   * @param value The associated value
+   * @return AWSCcmConfigValidationResponse
+   */
+  @JsonAnySetter
+  public AWSCcmConfigValidationResponse putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+      this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   *
+   * @return The additional properties
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   *
+   * @param key The arbitrary key to get
+   * @return The specific additional property for the given key
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+      return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /** Return true if this AWSCcmConfigValidationResponse object is equal to o. */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AWSCcmConfigValidationResponse awsCcmConfigValidationResponse =
+        (AWSCcmConfigValidationResponse) o;
+    return Objects.equals(this.data, awsCcmConfigValidationResponse.data)
+        && Objects.equals(
+            this.additionalProperties, awsCcmConfigValidationResponse.additionalProperties);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(data, additionalProperties);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AWSCcmConfigValidationResponse {\n");
+    sb.append("    data: ").append(toIndentedString(data)).append("\n");
+    sb.append("    additionalProperties: ")
+        .append(toIndentedString(additionalProperties))
+        .append("\n");
+    sb.append('}');
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/src/main/java/com/datadog/api/client/v2/model/AWSCcmConfigValidationResponseAttributes.java b/src/main/java/com/datadog/api/client/v2/model/AWSCcmConfigValidationResponseAttributes.java
new file mode 100644
index 00000000000..547bb14313d
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/AWSCcmConfigValidationResponseAttributes.java
@@ -0,0 +1,190 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019-Present Datadog, Inc.
+ */
+
+package com.datadog.api.client.v2.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+/** Attributes for an AWS CCM config validation response. */
+@JsonPropertyOrder({
+  AWSCcmConfigValidationResponseAttributes.JSON_PROPERTY_ACCOUNT_ID,
+  AWSCcmConfigValidationResponseAttributes.JSON_PROPERTY_ISSUES
+})
+@jakarta.annotation.Generated(
+    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
+public class AWSCcmConfigValidationResponseAttributes {
+  @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_ACCOUNT_ID = "account_id";
+  private String accountId;
+
+  public static final String JSON_PROPERTY_ISSUES = "issues";
+  private List<AWSCcmConfigValidationIssue> issues = new ArrayList<>();
+
+  public AWSCcmConfigValidationResponseAttributes() {}
+
+  @JsonCreator
+  public AWSCcmConfigValidationResponseAttributes(
+      @JsonProperty(required = true, value = JSON_PROPERTY_ACCOUNT_ID) String accountId,
+      @JsonProperty(required = true, value = JSON_PROPERTY_ISSUES)
+          List<AWSCcmConfigValidationIssue> issues) {
+    this.accountId = accountId;
+    this.issues = issues;
+  }
+
+  public AWSCcmConfigValidationResponseAttributes accountId(String accountId) {
+    this.accountId = accountId;
+    return this;
+  }
+
+  /**
+   * Your AWS Account ID without dashes.
+   *
+   * @return accountId
+   */
+  @JsonProperty(JSON_PROPERTY_ACCOUNT_ID)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public String getAccountId() {
+    return accountId;
+  }
+
+  public void setAccountId(String accountId) {
+    this.accountId = accountId;
+  }
+
+  public AWSCcmConfigValidationResponseAttributes issues(List<AWSCcmConfigValidationIssue> issues) {
+    this.issues = issues;
+    for (AWSCcmConfigValidationIssue item : issues) {
+      this.unparsed |= item.unparsed;
+    }
+    return this;
+  }
+
+  public AWSCcmConfigValidationResponseAttributes addIssuesItem(
+      AWSCcmConfigValidationIssue issuesItem) {
+    this.issues.add(issuesItem);
+    this.unparsed |= issuesItem.unparsed;
+    return this;
+  }
+
+  /**
+   * List of validation issues found for the Cost and Usage Report (CUR) 2.0 configuration. Empty
+   * when the configuration is valid.
+   *
+   * @return issues
+   */
+  @JsonProperty(JSON_PROPERTY_ISSUES)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public List<AWSCcmConfigValidationIssue> getIssues() {
+    return issues;
+  }
+
+  public void setIssues(List<AWSCcmConfigValidationIssue> issues) {
+    this.issues = issues;
+  }
+
+  /**
+   * A container for additional, undeclared properties. This is a holder for any undeclared
+   * properties as specified with the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
+
+  /**
+   * Set the additional (undeclared) property with the specified name and value. If the property
+   * does not already exist, create it otherwise replace it.
+   *
+   * @param key The arbitrary key to set
+   * @param value The associated value
+   * @return AWSCcmConfigValidationResponseAttributes
+   */
+  @JsonAnySetter
+  public AWSCcmConfigValidationResponseAttributes putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+      this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   *
+   * @return The additional properties
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   *
+   * @param key The arbitrary key to get
+   * @return The specific additional property for the given key
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+      return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /** Return true if this AWSCcmConfigValidationResponseAttributes object is equal to o. */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AWSCcmConfigValidationResponseAttributes awsCcmConfigValidationResponseAttributes =
+        (AWSCcmConfigValidationResponseAttributes) o;
+    return Objects.equals(this.accountId, awsCcmConfigValidationResponseAttributes.accountId)
+        && Objects.equals(this.issues, awsCcmConfigValidationResponseAttributes.issues)
+        && Objects.equals(
+            this.additionalProperties,
+            awsCcmConfigValidationResponseAttributes.additionalProperties);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(accountId, issues, additionalProperties);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AWSCcmConfigValidationResponseAttributes {\n");
+    sb.append("    accountId: ").append(toIndentedString(accountId)).append("\n");
+    sb.append("    issues: ").append(toIndentedString(issues)).append("\n");
+    sb.append("    additionalProperties: ")
+        .append(toIndentedString(additionalProperties))
+        .append("\n");
+    sb.append('}');
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/src/main/java/com/datadog/api/client/v2/model/AWSCcmConfigValidationResponseData.java b/src/main/java/com/datadog/api/client/v2/model/AWSCcmConfigValidationResponseData.java
new file mode 100644
index 00000000000..e834d3bc9a1
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/AWSCcmConfigValidationResponseData.java
@@ -0,0 +1,212 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019-Present Datadog, Inc.
+ */
+
+package com.datadog.api.client.v2.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+/** AWS CCM config validation response data. */
+@JsonPropertyOrder({
+  AWSCcmConfigValidationResponseData.JSON_PROPERTY_ATTRIBUTES,
+  AWSCcmConfigValidationResponseData.JSON_PROPERTY_ID,
+  AWSCcmConfigValidationResponseData.JSON_PROPERTY_TYPE
+})
+@jakarta.annotation.Generated(
+    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
+public class AWSCcmConfigValidationResponseData {
+  @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_ATTRIBUTES = "attributes";
+  private AWSCcmConfigValidationResponseAttributes attributes;
+
+  public static final String JSON_PROPERTY_ID = "id";
+  private String id;
+
+  public static final String JSON_PROPERTY_TYPE = "type";
+  private AWSCcmConfigValidationType type = AWSCcmConfigValidationType.CCM_CONFIG_VALIDATION;
+
+  public AWSCcmConfigValidationResponseData() {}
+
+  @JsonCreator
+  public AWSCcmConfigValidationResponseData(
+      @JsonProperty(required = true, value = JSON_PROPERTY_ATTRIBUTES)
+          AWSCcmConfigValidationResponseAttributes attributes,
+      @JsonProperty(required = true, value = JSON_PROPERTY_ID) String id,
+      @JsonProperty(required = true, value = JSON_PROPERTY_TYPE) AWSCcmConfigValidationType type) {
+    this.attributes = attributes;
+    this.unparsed |= attributes.unparsed;
+    this.id = id;
+    this.type = type;
+    this.unparsed |= !type.isValid();
+  }
+
+  public AWSCcmConfigValidationResponseData attributes(
+      AWSCcmConfigValidationResponseAttributes attributes) {
+    this.attributes = attributes;
+    this.unparsed |= attributes.unparsed;
+    return this;
+  }
+
+  /**
+   * Attributes for an AWS CCM config validation response.
+   *
+   * @return attributes
+   */
+  @JsonProperty(JSON_PROPERTY_ATTRIBUTES)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public AWSCcmConfigValidationResponseAttributes getAttributes() {
+    return attributes;
+  }
+
+  public void setAttributes(AWSCcmConfigValidationResponseAttributes attributes) {
+    this.attributes = attributes;
+  }
+
+  public AWSCcmConfigValidationResponseData id(String id) {
+    this.id = id;
+    return this;
+  }
+
+  /**
+   * AWS CCM config validation resource identifier.
+   *
+   * @return id
+   */
+  @JsonProperty(JSON_PROPERTY_ID)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public String getId() {
+    return id;
+  }
+
+  public void setId(String id) {
+    this.id = id;
+  }
+
+  public AWSCcmConfigValidationResponseData type(AWSCcmConfigValidationType type) {
+    this.type = type;
+    this.unparsed |= !type.isValid();
+    return this;
+  }
+
+  /**
+   * AWS CCM config validation resource type.
+   *
+   * @return type
+   */
+  @JsonProperty(JSON_PROPERTY_TYPE)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public AWSCcmConfigValidationType getType() {
+    return type;
+  }
+
+  public void setType(AWSCcmConfigValidationType type) {
+    if (!type.isValid()) {
+      this.unparsed = true;
+    }
+    this.type = type;
+  }
+
+  /**
+   * A container for additional, undeclared properties. This is a holder for any undeclared
+   * properties as specified with the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
+
+  /**
+   * Set the additional (undeclared) property with the specified name and value. If the property
+   * does not already exist, create it otherwise replace it.
+   *
+   * @param key The arbitrary key to set
+   * @param value The associated value
+   * @return AWSCcmConfigValidationResponseData
+   */
+  @JsonAnySetter
+  public AWSCcmConfigValidationResponseData putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+      this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   *
+   * @return The additional properties
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   *
+   * @param key The arbitrary key to get
+   * @return The specific additional property for the given key
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+      return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /** Return true if this AWSCcmConfigValidationResponseData object is equal to o. */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AWSCcmConfigValidationResponseData awsCcmConfigValidationResponseData =
+        (AWSCcmConfigValidationResponseData) o;
+    return Objects.equals(this.attributes, awsCcmConfigValidationResponseData.attributes)
+        && Objects.equals(this.id, awsCcmConfigValidationResponseData.id)
+        && Objects.equals(this.type, awsCcmConfigValidationResponseData.type)
+        && Objects.equals(
+            this.additionalProperties, awsCcmConfigValidationResponseData.additionalProperties);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(attributes, id, type, additionalProperties);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AWSCcmConfigValidationResponseData {\n");
+    sb.append("    attributes: ").append(toIndentedString(attributes)).append("\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    type: ").append(toIndentedString(type)).append("\n");
+    sb.append("    additionalProperties: ")
+        .append(toIndentedString(additionalProperties))
+        .append("\n");
+    sb.append('}');
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/src/main/java/com/datadog/api/client/v2/model/AWSCcmConfigValidationType.java b/src/main/java/com/datadog/api/client/v2/model/AWSCcmConfigValidationType.java
new file mode 100644
index 00000000000..2477c37d562
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/AWSCcmConfigValidationType.java
@@ -0,0 +1,57 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019-Present Datadog, Inc.
+ */
+
+package com.datadog.api.client.v2.model;
+
+import com.datadog.api.client.ModelEnum;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+/** AWS CCM config validation resource type. */
+@JsonSerialize(using = AWSCcmConfigValidationType.AWSCcmConfigValidationTypeSerializer.class)
+public class AWSCcmConfigValidationType extends ModelEnum<String> {
+
+  private static final Set<String> allowedValues =
+      new HashSet<String>(Arrays.asList("ccm_config_validation"));
+
+  public static final AWSCcmConfigValidationType CCM_CONFIG_VALIDATION =
+      new AWSCcmConfigValidationType("ccm_config_validation");
+
+  AWSCcmConfigValidationType(String value) {
+    super(value, allowedValues);
+  }
+
+  public static class AWSCcmConfigValidationTypeSerializer
+      extends StdSerializer<AWSCcmConfigValidationType> {
+    public AWSCcmConfigValidationTypeSerializer(Class<AWSCcmConfigValidationType> t) {
+      super(t);
+    }
+
+    public AWSCcmConfigValidationTypeSerializer() {
+      this(null);
+    }
+
+    @Override
+    public void serialize(
+        AWSCcmConfigValidationType value, JsonGenerator jgen, SerializerProvider provider)
+        throws IOException, JsonProcessingException {
+      jgen.writeObject(value.value);
+    }
+  }
+
+  @JsonCreator
+  public static AWSCcmConfigValidationType fromValue(String value) {
+    return new AWSCcmConfigValidationType(value);
+  }
+}
diff --git a/src/main/java/com/datadog/api/client/v2/model/ObservabilityPipelineConfigDestinationItem.java b/src/main/java/com/datadog/api/client/v2/model/ObservabilityPipelineConfigDestinationItem.java
index 5193145c7e6..da4cff438ab 100644
--- a/src/main/java/com/datadog/api/client/v2/model/ObservabilityPipelineConfigDestinationItem.java
+++ b/src/main/java/com/datadog/api/client/v2/model/ObservabilityPipelineConfigDestinationItem.java
@@ -1379,60 +1379,6 @@ public ObservabilityPipelineConfigDestinationItem deserialize(
             e);
       }
 
-      // deserialize ObservabilityPipelineSplunkHecMetricsDestination
-      try {
-        boolean attemptParsing = true;
-        // ensure that we respect type coercion as set on the client ObjectMapper
-        if (ObservabilityPipelineSplunkHecMetricsDestination.class.equals(Integer.class)
-            || ObservabilityPipelineSplunkHecMetricsDestination.class.equals(Long.class)
-            || ObservabilityPipelineSplunkHecMetricsDestination.class.equals(Float.class)
-            || ObservabilityPipelineSplunkHecMetricsDestination.class.equals(Double.class)
-            || ObservabilityPipelineSplunkHecMetricsDestination.class.equals(Boolean.class)
-            || ObservabilityPipelineSplunkHecMetricsDestination.class.equals(String.class)) {
-          attemptParsing = typeCoercion;
-          if (!attemptParsing) {
-            attemptParsing |=
-                ((ObservabilityPipelineSplunkHecMetricsDestination.class.equals(Integer.class)
-                        || ObservabilityPipelineSplunkHecMetricsDestination.class.equals(
-                            Long.class))
-                    && token == JsonToken.VALUE_NUMBER_INT);
-            attemptParsing |=
-                ((ObservabilityPipelineSplunkHecMetricsDestination.class.equals(Float.class)
-                        || ObservabilityPipelineSplunkHecMetricsDestination.class.equals(
-                            Double.class))
-                    && (token == JsonToken.VALUE_NUMBER_FLOAT
-                        || token == JsonToken.VALUE_NUMBER_INT));
-            attemptParsing |=
-                (ObservabilityPipelineSplunkHecMetricsDestination.class.equals(Boolean.class)
-                    && (token == JsonToken.VALUE_FALSE || token == JsonToken.VALUE_TRUE));
-            attemptParsing |=
-                (ObservabilityPipelineSplunkHecMetricsDestination.class.equals(String.class)
-                    && token == JsonToken.VALUE_STRING);
-          }
-        }
-        if (attemptParsing) {
-          tmp =
-              tree.traverse(jp.getCodec())
-                  .readValueAs(ObservabilityPipelineSplunkHecMetricsDestination.class);
-          // TODO: there is no validation against JSON schema constraints
-          // (min, max, enum, pattern...), this does not perform a strict JSON
-          // validation, which means the 'match' count may be higher than it should be.
-          if (!((ObservabilityPipelineSplunkHecMetricsDestination) tmp).unparsed) {
-            deserialized = tmp;
-            match++;
-          }
-          log.log(
-              Level.FINER,
-              "Input data matches schema 'ObservabilityPipelineSplunkHecMetricsDestination'");
-        }
-      } catch (Exception e) {
-        // deserialization failed, continue
-        log.log(
-            Level.FINER,
-            "Input data does not match schema 'ObservabilityPipelineSplunkHecMetricsDestination'",
-            e);
-      }
-
       ObservabilityPipelineConfigDestinationItem ret =
           new ObservabilityPipelineConfigDestinationItem();
       if (match == 1) {
@@ -1599,12 +1545,6 @@ public ObservabilityPipelineConfigDestinationItem(
     setActualInstance(o);
   }
 
-  public ObservabilityPipelineConfigDestinationItem(
-      ObservabilityPipelineSplunkHecMetricsDestination o) {
-    super("oneOf", Boolean.FALSE);
-    setActualInstance(o);
-  }
-
   static {
     schemas.put(
         "ObservabilityPipelineElasticsearchDestination",
@@ -1677,9 +1617,6 @@ public ObservabilityPipelineConfigDestinationItem(
     schemas.put(
         "ObservabilityPipelineDatadogMetricsDestination",
         new GenericType<ObservabilityPipelineDatadogMetricsDestination>() {});
-    schemas.put(
-        "ObservabilityPipelineSplunkHecMetricsDestination",
-        new GenericType<ObservabilityPipelineSplunkHecMetricsDestination>() {});
     JSON.registerDescendants(
         ObservabilityPipelineConfigDestinationItem.class, Collections.unmodifiableMap(schemas));
   }
@@ -1705,8 +1642,7 @@ public Map<String, GenericType> getSchemas() {
    * ObservabilityPipelineSentinelOneDestination, ObservabilityPipelineSocketDestination,
    * ObservabilityPipelineSplunkHecDestination, ObservabilityPipelineSumoLogicDestination,
    * ObservabilityPipelineSyslogNgDestination, ObservabilityPipelineDatabricksZerobusDestination,
-   * ObservabilityPipelineDatadogMetricsDestination,
-   * ObservabilityPipelineSplunkHecMetricsDestination
+   * ObservabilityPipelineDatadogMetricsDestination
    *
    * <p>It could be an instance of the 'oneOf' schemas. The oneOf child schemas may themselves be a
    * composed schema (allOf, anyOf, oneOf).
@@ -1846,13 +1782,6 @@ public void setActualInstance(Object instance) {
       super.setActualInstance(instance);
       return;
     }
-    if (JSON.isInstanceOf(
-        ObservabilityPipelineSplunkHecMetricsDestination.class,
-        instance,
-        new HashSet<Class<?>>())) {
-      super.setActualInstance(instance);
-      return;
-    }
 
     if (JSON.isInstanceOf(UnparsedObject.class, instance, new HashSet<Class<?>>())) {
       super.setActualInstance(instance);
@@ -1880,8 +1809,7 @@ public void setActualInstance(Object instance) {
             + " ObservabilityPipelineSumoLogicDestination,"
             + " ObservabilityPipelineSyslogNgDestination,"
             + " ObservabilityPipelineDatabricksZerobusDestination,"
-            + " ObservabilityPipelineDatadogMetricsDestination,"
-            + " ObservabilityPipelineSplunkHecMetricsDestination");
+            + " ObservabilityPipelineDatadogMetricsDestination");
   }
 
   /**
@@ -1900,8 +1828,7 @@ public void setActualInstance(Object instance) {
    * ObservabilityPipelineSentinelOneDestination, ObservabilityPipelineSocketDestination,
    * ObservabilityPipelineSplunkHecDestination, ObservabilityPipelineSumoLogicDestination,
    * ObservabilityPipelineSyslogNgDestination, ObservabilityPipelineDatabricksZerobusDestination,
-   * ObservabilityPipelineDatadogMetricsDestination,
-   * ObservabilityPipelineSplunkHecMetricsDestination
+   * ObservabilityPipelineDatadogMetricsDestination
    *
    * @return The actual instance (ObservabilityPipelineElasticsearchDestination,
    *     ObservabilityPipelineHttpClientDestination,
@@ -1920,8 +1847,7 @@ public void setActualInstance(Object instance) {
    *     ObservabilityPipelineSplunkHecDestination, ObservabilityPipelineSumoLogicDestination,
    *     ObservabilityPipelineSyslogNgDestination,
    *     ObservabilityPipelineDatabricksZerobusDestination,
-   *     ObservabilityPipelineDatadogMetricsDestination,
-   *     ObservabilityPipelineSplunkHecMetricsDestination)
+   *     ObservabilityPipelineDatadogMetricsDestination)
    */
   @Override
   public Object getActualInstance() {
@@ -2247,18 +2173,4 @@ public ObservabilityPipelineSyslogNgDestination getObservabilityPipelineSyslogNg
       getObservabilityPipelineDatadogMetricsDestination() throws ClassCastException {
     return (ObservabilityPipelineDatadogMetricsDestination) super.getActualInstance();
   }
-
-  /**
-   * Get the actual instance of `ObservabilityPipelineSplunkHecMetricsDestination`. If the actual
-   * instance is not `ObservabilityPipelineSplunkHecMetricsDestination`, the ClassCastException will
-   * be thrown.
-   *
-   * @return The actual instance of `ObservabilityPipelineSplunkHecMetricsDestination`
-   * @throws ClassCastException if the instance is not
-   *     `ObservabilityPipelineSplunkHecMetricsDestination`
-   */
-  public ObservabilityPipelineSplunkHecMetricsDestination
-      getObservabilityPipelineSplunkHecMetricsDestination() throws ClassCastException {
-    return (ObservabilityPipelineSplunkHecMetricsDestination) super.getActualInstance();
-  }
 }
diff --git a/src/main/java/com/datadog/api/client/v2/model/ObservabilityPipelineSplunkHecMetricsDestination.java b/src/main/java/com/datadog/api/client/v2/model/ObservabilityPipelineSplunkHecMetricsDestination.java
deleted file mode 100644
index 82d2586f1b4..00000000000
--- a/src/main/java/com/datadog/api/client/v2/model/ObservabilityPipelineSplunkHecMetricsDestination.java
+++ /dev/null
@@ -1,499 +0,0 @@
-/*
- * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
- * This product includes software developed at Datadog (https://www.datadoghq.com/).
- * Copyright 2019-Present Datadog, Inc.
- */
-
-package com.datadog.api.client.v2.model;
-
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * The <code>splunk_hec_metrics</code> destination forwards metrics to Splunk using the HTTP Event
- * Collector (HEC).
- *
- * <p><strong>Supported pipeline types:</strong> metrics
- */
-@JsonPropertyOrder({
-  ObservabilityPipelineSplunkHecMetricsDestination.JSON_PROPERTY_BUFFER,
-  ObservabilityPipelineSplunkHecMetricsDestination.JSON_PROPERTY_COMPRESSION,
-  ObservabilityPipelineSplunkHecMetricsDestination.JSON_PROPERTY_DEFAULT_NAMESPACE,
-  ObservabilityPipelineSplunkHecMetricsDestination.JSON_PROPERTY_ENDPOINT_URL_KEY,
-  ObservabilityPipelineSplunkHecMetricsDestination.JSON_PROPERTY_ID,
-  ObservabilityPipelineSplunkHecMetricsDestination.JSON_PROPERTY_INDEX,
-  ObservabilityPipelineSplunkHecMetricsDestination.JSON_PROPERTY_INPUTS,
-  ObservabilityPipelineSplunkHecMetricsDestination.JSON_PROPERTY_SOURCE,
-  ObservabilityPipelineSplunkHecMetricsDestination.JSON_PROPERTY_SOURCETYPE,
-  ObservabilityPipelineSplunkHecMetricsDestination.JSON_PROPERTY_TLS,
-  ObservabilityPipelineSplunkHecMetricsDestination.JSON_PROPERTY_TOKEN_KEY,
-  ObservabilityPipelineSplunkHecMetricsDestination.JSON_PROPERTY_TYPE
-})
-@jakarta.annotation.Generated(
-    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
-public class ObservabilityPipelineSplunkHecMetricsDestination {
-  @JsonIgnore public boolean unparsed = false;
-  public static final String JSON_PROPERTY_BUFFER = "buffer";
-  private ObservabilityPipelineBufferOptions buffer;
-
-  public static final String JSON_PROPERTY_COMPRESSION = "compression";
-  private ObservabilityPipelineSplunkHecMetricsDestinationCompression compression =
-      ObservabilityPipelineSplunkHecMetricsDestinationCompression.NONE;
-
-  public static final String JSON_PROPERTY_DEFAULT_NAMESPACE = "default_namespace";
-  private String defaultNamespace;
-
-  public static final String JSON_PROPERTY_ENDPOINT_URL_KEY = "endpoint_url_key";
-  private String endpointUrlKey;
-
-  public static final String JSON_PROPERTY_ID = "id";
-  private String id;
-
-  public static final String JSON_PROPERTY_INDEX = "index";
-  private String index;
-
-  public static final String JSON_PROPERTY_INPUTS = "inputs";
-  private List<String> inputs = new ArrayList<>();
-
-  public static final String JSON_PROPERTY_SOURCE = "source";
-  private String source;
-
-  public static final String JSON_PROPERTY_SOURCETYPE = "sourcetype";
-  private String sourcetype;
-
-  public static final String JSON_PROPERTY_TLS = "tls";
-  private ObservabilityPipelineTls tls;
-
-  public static final String JSON_PROPERTY_TOKEN_KEY = "token_key";
-  private String tokenKey;
-
-  public static final String JSON_PROPERTY_TYPE = "type";
-  private ObservabilityPipelineSplunkHecMetricsDestinationType type =
-      ObservabilityPipelineSplunkHecMetricsDestinationType.SPLUNK_HEC_METRICS;
-
-  public ObservabilityPipelineSplunkHecMetricsDestination() {}
-
-  @JsonCreator
-  public ObservabilityPipelineSplunkHecMetricsDestination(
-      @JsonProperty(required = true, value = JSON_PROPERTY_ID) String id,
-      @JsonProperty(required = true, value = JSON_PROPERTY_INPUTS) List<String> inputs,
-      @JsonProperty(required = true, value = JSON_PROPERTY_TYPE)
-          ObservabilityPipelineSplunkHecMetricsDestinationType type) {
-    this.id = id;
-    this.inputs = inputs;
-    this.type = type;
-    this.unparsed |= !type.isValid();
-  }
-
-  public ObservabilityPipelineSplunkHecMetricsDestination buffer(
-      ObservabilityPipelineBufferOptions buffer) {
-    this.buffer = buffer;
-    this.unparsed |= buffer.unparsed;
-    return this;
-  }
-
-  /**
-   * Configuration for buffer settings on destination components.
-   *
-   * @return buffer
-   */
-  @jakarta.annotation.Nullable
-  @JsonProperty(JSON_PROPERTY_BUFFER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public ObservabilityPipelineBufferOptions getBuffer() {
-    return buffer;
-  }
-
-  public void setBuffer(ObservabilityPipelineBufferOptions buffer) {
-    this.buffer = buffer;
-  }
-
-  public ObservabilityPipelineSplunkHecMetricsDestination compression(
-      ObservabilityPipelineSplunkHecMetricsDestinationCompression compression) {
-    this.compression = compression;
-    this.unparsed |= !compression.isValid();
-    return this;
-  }
-
-  /**
-   * Compression algorithm applied when sending metrics to Splunk HEC.
-   *
-   * @return compression
-   */
-  @jakarta.annotation.Nullable
-  @JsonProperty(JSON_PROPERTY_COMPRESSION)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public ObservabilityPipelineSplunkHecMetricsDestinationCompression getCompression() {
-    return compression;
-  }
-
-  public void setCompression(
-      ObservabilityPipelineSplunkHecMetricsDestinationCompression compression) {
-    if (!compression.isValid()) {
-      this.unparsed = true;
-    }
-    this.compression = compression;
-  }
-
-  public ObservabilityPipelineSplunkHecMetricsDestination defaultNamespace(
-      String defaultNamespace) {
-    this.defaultNamespace = defaultNamespace;
-    return this;
-  }
-
-  /**
-   * Optional default namespace for metrics sent to Splunk HEC.
-   *
-   * @return defaultNamespace
-   */
-  @jakarta.annotation.Nullable
-  @JsonProperty(JSON_PROPERTY_DEFAULT_NAMESPACE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public String getDefaultNamespace() {
-    return defaultNamespace;
-  }
-
-  public void setDefaultNamespace(String defaultNamespace) {
-    this.defaultNamespace = defaultNamespace;
-  }
-
-  public ObservabilityPipelineSplunkHecMetricsDestination endpointUrlKey(String endpointUrlKey) {
-    this.endpointUrlKey = endpointUrlKey;
-    return this;
-  }
-
-  /**
-   * Name of the environment variable or secret that holds the Splunk HEC endpoint URL.
-   *
-   * @return endpointUrlKey
-   */
-  @jakarta.annotation.Nullable
-  @JsonProperty(JSON_PROPERTY_ENDPOINT_URL_KEY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public String getEndpointUrlKey() {
-    return endpointUrlKey;
-  }
-
-  public void setEndpointUrlKey(String endpointUrlKey) {
-    this.endpointUrlKey = endpointUrlKey;
-  }
-
-  public ObservabilityPipelineSplunkHecMetricsDestination id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * The unique identifier for this component. Used in other parts of the pipeline to reference this
-   * component (for example, as the <code>input</code> to downstream components).
-   *
-   * @return id
-   */
-  @JsonProperty(JSON_PROPERTY_ID)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ObservabilityPipelineSplunkHecMetricsDestination index(String index) {
-    this.index = index;
-    return this;
-  }
-
-  /**
-   * Optional name of the Splunk index where metrics are written.
-   *
-   * @return index
-   */
-  @jakarta.annotation.Nullable
-  @JsonProperty(JSON_PROPERTY_INDEX)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public String getIndex() {
-    return index;
-  }
-
-  public void setIndex(String index) {
-    this.index = index;
-  }
-
-  public ObservabilityPipelineSplunkHecMetricsDestination inputs(List<String> inputs) {
-    this.inputs = inputs;
-    return this;
-  }
-
-  public ObservabilityPipelineSplunkHecMetricsDestination addInputsItem(String inputsItem) {
-    this.inputs.add(inputsItem);
-    return this;
-  }
-
-  /**
-   * A list of component IDs whose output is used as the <code>input</code> for this component.
-   *
-   * @return inputs
-   */
-  @JsonProperty(JSON_PROPERTY_INPUTS)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public List<String> getInputs() {
-    return inputs;
-  }
-
-  public void setInputs(List<String> inputs) {
-    this.inputs = inputs;
-  }
-
-  public ObservabilityPipelineSplunkHecMetricsDestination source(String source) {
-    this.source = source;
-    return this;
-  }
-
-  /**
-   * The Splunk source field value for metric events.
-   *
-   * @return source
-   */
-  @jakarta.annotation.Nullable
-  @JsonProperty(JSON_PROPERTY_SOURCE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public String getSource() {
-    return source;
-  }
-
-  public void setSource(String source) {
-    this.source = source;
-  }
-
-  public ObservabilityPipelineSplunkHecMetricsDestination sourcetype(String sourcetype) {
-    this.sourcetype = sourcetype;
-    return this;
-  }
-
-  /**
-   * The Splunk sourcetype to assign to metric events.
-   *
-   * @return sourcetype
-   */
-  @jakarta.annotation.Nullable
-  @JsonProperty(JSON_PROPERTY_SOURCETYPE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public String getSourcetype() {
-    return sourcetype;
-  }
-
-  public void setSourcetype(String sourcetype) {
-    this.sourcetype = sourcetype;
-  }
-
-  public ObservabilityPipelineSplunkHecMetricsDestination tls(ObservabilityPipelineTls tls) {
-    this.tls = tls;
-    this.unparsed |= tls.unparsed;
-    return this;
-  }
-
-  /**
-   * Configuration for enabling TLS encryption between the pipeline component and external services.
-   *
-   * @return tls
-   */
-  @jakarta.annotation.Nullable
-  @JsonProperty(JSON_PROPERTY_TLS)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public ObservabilityPipelineTls getTls() {
-    return tls;
-  }
-
-  public void setTls(ObservabilityPipelineTls tls) {
-    this.tls = tls;
-  }
-
-  public ObservabilityPipelineSplunkHecMetricsDestination tokenKey(String tokenKey) {
-    this.tokenKey = tokenKey;
-    return this;
-  }
-
-  /**
-   * Name of the environment variable or secret that holds the Splunk HEC token.
-   *
-   * @return tokenKey
-   */
-  @jakarta.annotation.Nullable
-  @JsonProperty(JSON_PROPERTY_TOKEN_KEY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public String getTokenKey() {
-    return tokenKey;
-  }
-
-  public void setTokenKey(String tokenKey) {
-    this.tokenKey = tokenKey;
-  }
-
-  public ObservabilityPipelineSplunkHecMetricsDestination type(
-      ObservabilityPipelineSplunkHecMetricsDestinationType type) {
-    this.type = type;
-    this.unparsed |= !type.isValid();
-    return this;
-  }
-
-  /**
-   * The destination type. Always <code>splunk_hec_metrics</code>.
-   *
-   * @return type
-   */
-  @JsonProperty(JSON_PROPERTY_TYPE)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public ObservabilityPipelineSplunkHecMetricsDestinationType getType() {
-    return type;
-  }
-
-  public void setType(ObservabilityPipelineSplunkHecMetricsDestinationType type) {
-    if (!type.isValid()) {
-      this.unparsed = true;
-    }
-    this.type = type;
-  }
-
-  /**
-   * A container for additional, undeclared properties. This is a holder for any undeclared
-   * properties as specified with the 'additionalProperties' keyword in the OAS document.
-   */
-  private Map<String, Object> additionalProperties;
-
-  /**
-   * Set the additional (undeclared) property with the specified name and value. If the property
-   * does not already exist, create it otherwise replace it.
-   *
-   * @param key The arbitrary key to set
-   * @param value The associated value
-   * @return ObservabilityPipelineSplunkHecMetricsDestination
-   */
-  @JsonAnySetter
-  public ObservabilityPipelineSplunkHecMetricsDestination putAdditionalProperty(
-      String key, Object value) {
-    if (this.additionalProperties == null) {
-      this.additionalProperties = new HashMap<String, Object>();
-    }
-    this.additionalProperties.put(key, value);
-    return this;
-  }
-
-  /**
-   * Return the additional (undeclared) property.
-   *
-   * @return The additional properties
-   */
-  @JsonAnyGetter
-  public Map<String, Object> getAdditionalProperties() {
-    return additionalProperties;
-  }
-
-  /**
-   * Return the additional (undeclared) property with the specified name.
-   *
-   * @param key The arbitrary key to get
-   * @return The specific additional property for the given key
-   */
-  public Object getAdditionalProperty(String key) {
-    if (this.additionalProperties == null) {
-      return null;
-    }
-    return this.additionalProperties.get(key);
-  }
-
-  /** Return true if this ObservabilityPipelineSplunkHecMetricsDestination object is equal to o. */
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ObservabilityPipelineSplunkHecMetricsDestination
-        observabilityPipelineSplunkHecMetricsDestination =
-            (ObservabilityPipelineSplunkHecMetricsDestination) o;
-    return Objects.equals(this.buffer, observabilityPipelineSplunkHecMetricsDestination.buffer)
-        && Objects.equals(
-            this.compression, observabilityPipelineSplunkHecMetricsDestination.compression)
-        && Objects.equals(
-            this.defaultNamespace,
-            observabilityPipelineSplunkHecMetricsDestination.defaultNamespace)
-        && Objects.equals(
-            this.endpointUrlKey, observabilityPipelineSplunkHecMetricsDestination.endpointUrlKey)
-        && Objects.equals(this.id, observabilityPipelineSplunkHecMetricsDestination.id)
-        && Objects.equals(this.index, observabilityPipelineSplunkHecMetricsDestination.index)
-        && Objects.equals(this.inputs, observabilityPipelineSplunkHecMetricsDestination.inputs)
-        && Objects.equals(this.source, observabilityPipelineSplunkHecMetricsDestination.source)
-        && Objects.equals(
-            this.sourcetype, observabilityPipelineSplunkHecMetricsDestination.sourcetype)
-        && Objects.equals(this.tls, observabilityPipelineSplunkHecMetricsDestination.tls)
-        && Objects.equals(this.tokenKey, observabilityPipelineSplunkHecMetricsDestination.tokenKey)
-        && Objects.equals(this.type, observabilityPipelineSplunkHecMetricsDestination.type)
-        && Objects.equals(
-            this.additionalProperties,
-            observabilityPipelineSplunkHecMetricsDestination.additionalProperties);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(
-        buffer,
-        compression,
-        defaultNamespace,
-        endpointUrlKey,
-        id,
-        index,
-        inputs,
-        source,
-        sourcetype,
-        tls,
-        tokenKey,
-        type,
-        additionalProperties);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ObservabilityPipelineSplunkHecMetricsDestination {\n");
-    sb.append("    buffer: ").append(toIndentedString(buffer)).append("\n");
-    sb.append("    compression: ").append(toIndentedString(compression)).append("\n");
-    sb.append("    defaultNamespace: ").append(toIndentedString(defaultNamespace)).append("\n");
-    sb.append("    endpointUrlKey: ").append(toIndentedString(endpointUrlKey)).append("\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    index: ").append(toIndentedString(index)).append("\n");
-    sb.append("    inputs: ").append(toIndentedString(inputs)).append("\n");
-    sb.append("    source: ").append(toIndentedString(source)).append("\n");
-    sb.append("    sourcetype: ").append(toIndentedString(sourcetype)).append("\n");
-    sb.append("    tls: ").append(toIndentedString(tls)).append("\n");
-    sb.append("    tokenKey: ").append(toIndentedString(tokenKey)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    additionalProperties: ")
-        .append(toIndentedString(additionalProperties))
-        .append("\n");
-    sb.append('}');
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces (except the first line).
-   */
-  private String toIndentedString(Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/com/datadog/api/client/v2/model/ObservabilityPipelineSplunkHecMetricsDestinationCompression.java b/src/main/java/com/datadog/api/client/v2/model/ObservabilityPipelineSplunkHecMetricsDestinationCompression.java
deleted file mode 100644
index b955aa651fd..00000000000
--- a/src/main/java/com/datadog/api/client/v2/model/ObservabilityPipelineSplunkHecMetricsDestinationCompression.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
- * This product includes software developed at Datadog (https://www.datadoghq.com/).
- * Copyright 2019-Present Datadog, Inc.
- */
-
-package com.datadog.api.client.v2.model;
-
-import com.datadog.api.client.ModelEnum;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.StdSerializer;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-/** Compression algorithm applied when sending metrics to Splunk HEC. */
-@JsonSerialize(
-    using =
-        ObservabilityPipelineSplunkHecMetricsDestinationCompression
-            .ObservabilityPipelineSplunkHecMetricsDestinationCompressionSerializer.class)
-public class ObservabilityPipelineSplunkHecMetricsDestinationCompression extends ModelEnum<String> {
-
-  private static final Set<String> allowedValues =
-      new HashSet<String>(Arrays.asList("none", "gzip"));
-
-  public static final ObservabilityPipelineSplunkHecMetricsDestinationCompression NONE =
-      new ObservabilityPipelineSplunkHecMetricsDestinationCompression("none");
-  public static final ObservabilityPipelineSplunkHecMetricsDestinationCompression GZIP =
-      new ObservabilityPipelineSplunkHecMetricsDestinationCompression("gzip");
-
-  ObservabilityPipelineSplunkHecMetricsDestinationCompression(String value) {
-    super(value, allowedValues);
-  }
-
-  public static class ObservabilityPipelineSplunkHecMetricsDestinationCompressionSerializer
-      extends StdSerializer<ObservabilityPipelineSplunkHecMetricsDestinationCompression> {
-    public ObservabilityPipelineSplunkHecMetricsDestinationCompressionSerializer(
-        Class<ObservabilityPipelineSplunkHecMetricsDestinationCompression> t) {
-      super(t);
-    }
-
-    public ObservabilityPipelineSplunkHecMetricsDestinationCompressionSerializer() {
-      this(null);
-    }
-
-    @Override
-    public void serialize(
-        ObservabilityPipelineSplunkHecMetricsDestinationCompression value,
-        JsonGenerator jgen,
-        SerializerProvider provider)
-        throws IOException, JsonProcessingException {
-      jgen.writeObject(value.value);
-    }
-  }
-
-  @JsonCreator
-  public static ObservabilityPipelineSplunkHecMetricsDestinationCompression fromValue(
-      String value) {
-    return new ObservabilityPipelineSplunkHecMetricsDestinationCompression(value);
-  }
-}
diff --git a/src/main/java/com/datadog/api/client/v2/model/ObservabilityPipelineSplunkHecMetricsDestinationType.java b/src/main/java/com/datadog/api/client/v2/model/ObservabilityPipelineSplunkHecMetricsDestinationType.java
deleted file mode 100644
index bfe5654796e..00000000000
--- a/src/main/java/com/datadog/api/client/v2/model/ObservabilityPipelineSplunkHecMetricsDestinationType.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
- * This product includes software developed at Datadog (https://www.datadoghq.com/).
- * Copyright 2019-Present Datadog, Inc.
- */
-
-package com.datadog.api.client.v2.model;
-
-import com.datadog.api.client.ModelEnum;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.StdSerializer;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-/** The destination type. Always <code>splunk_hec_metrics</code>. */
-@JsonSerialize(
-    using =
-        ObservabilityPipelineSplunkHecMetricsDestinationType
-            .ObservabilityPipelineSplunkHecMetricsDestinationTypeSerializer.class)
-public class ObservabilityPipelineSplunkHecMetricsDestinationType extends ModelEnum<String> {
-
-  private static final Set<String> allowedValues =
-      new HashSet<String>(Arrays.asList("splunk_hec_metrics"));
-
-  public static final ObservabilityPipelineSplunkHecMetricsDestinationType SPLUNK_HEC_METRICS =
-      new ObservabilityPipelineSplunkHecMetricsDestinationType("splunk_hec_metrics");
-
-  ObservabilityPipelineSplunkHecMetricsDestinationType(String value) {
-    super(value, allowedValues);
-  }
-
-  public static class ObservabilityPipelineSplunkHecMetricsDestinationTypeSerializer
-      extends StdSerializer<ObservabilityPipelineSplunkHecMetricsDestinationType> {
-    public ObservabilityPipelineSplunkHecMetricsDestinationTypeSerializer(
-        Class<ObservabilityPipelineSplunkHecMetricsDestinationType> t) {
-      super(t);
-    }
-
-    public ObservabilityPipelineSplunkHecMetricsDestinationTypeSerializer() {
-      this(null);
-    }
-
-    @Override
-    public void serialize(
-        ObservabilityPipelineSplunkHecMetricsDestinationType value,
-        JsonGenerator jgen,
-        SerializerProvider provider)
-        throws IOException, JsonProcessingException {
-      jgen.writeObject(value.value);
-    }
-  }
-
-  @JsonCreator
-  public static ObservabilityPipelineSplunkHecMetricsDestinationType fromValue(String value) {
-    return new ObservabilityPipelineSplunkHecMetricsDestinationType(value);
-  }
-}
diff --git a/src/test/resources/cassettes/features/v1/Create_a_user_returns_User_created_response_test.json b/src/test/resources/cassettes/features/v1/Create_a_user_returns_User_created_response_test.json
index 42def371a51..b676df880e6 100644
--- a/src/test/resources/cassettes/features/v1/Create_a_user_returns_User_created_response_test.json
+++ b/src/test/resources/cassettes/features/v1/Create_a_user_returns_User_created_response_test.json
@@ -53,6 +53,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "af617072-2860-ba27-e045-b00c8baf0187"
+    "id": "af617072-2860-ba27-e045-b00c8baf0188"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v1/Create_a_user_returns_null_access_role.json b/src/test/resources/cassettes/features/v1/Create_a_user_returns_null_access_role.json
index 5a17eb5f03a..e5b3fe6bcf6 100644
--- a/src/test/resources/cassettes/features/v1/Create_a_user_returns_null_access_role.json
+++ b/src/test/resources/cassettes/features/v1/Create_a_user_returns_null_access_role.json
@@ -53,6 +53,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "af617072-2860-ba27-e045-b00c8baf0188"
+    "id": "af617072-2860-ba27-e045-b00c8baf0187"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_Bad_Request_response.json
index c82b6c27f29..a42ef29bfae 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_Bad_Request_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "73fd406e-d686-10bd-50ee-83f2c499e8a9"
+    "id": "73fd406e-d686-10bd-50ee-83f2c499e8a8"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_No_Content_response.json
index 0d38d7d0a6a..cf63593c8d1 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eeb"
+    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9ee9"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_Not_Found_response.json
index 89c80bd879e..aa5b0a6e9b8 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_Not_Found_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9ee9"
+    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eed"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_AWS_Account_object_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_AWS_Account_object_response.json
index f2248371931..f02f71207af 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_AWS_Account_object_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_AWS_Account_object_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eee"
+    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eeb"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_Not_Found_response.json
index 55368f4ae1c..7e5c7b1234d 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_Not_Found_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "9b33b83c-c8bb-714f-cf71-33ab2f3af9d4"
+    "id": "9b33b83c-c8bb-714f-cf71-33ab2f3af9d3"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Get_all_account_configs_returns_AWS_Accounts_List_object_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Get_all_account_configs_returns_AWS_Accounts_List_object_response.json
index cb1a6e0b10f..e1e0b004585 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Get_all_account_configs_returns_AWS_Accounts_List_object_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Get_all_account_configs_returns_AWS_Accounts_List_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "101a55f5-5a26-d616-5fb4-8d0451d83d11"
+    "id": "101a55f5-5a26-d616-5fb4-8d0451d83d10"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_List_available_namespaces_returns_AWS_Namespaces_List_object_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_List_available_namespaces_returns_AWS_Namespaces_List_object_response.json
index 994e56ed9eb..7711ea26b7b 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_List_available_namespaces_returns_AWS_Namespaces_List_object_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_List_available_namespaces_returns_AWS_Namespaces_List_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "d0ec7736-ef6c-d071-3390-4a5c3a301d11"
+    "id": "d0ec7736-ef6c-d071-3390-4a5c3a301d0e"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_List_log_services_returns_AWS_Logs_Services_List_object_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_List_log_services_returns_AWS_Logs_Services_List_object_response.json
index f469a5cda1f..266b281e690 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_List_log_services_returns_AWS_Logs_Services_List_object_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_List_log_services_returns_AWS_Logs_Services_List_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "03c3c0d9-a62f-5ac6-398b-e22a05d14d79"
+    "id": "03c3c0d9-a62f-5ac6-398b-e22a05d14d7a"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Patch_account_config_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Patch_account_config_returns_Bad_Request_response.json
index 8fcc5731aee..f2b714e3f34 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Patch_account_config_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Patch_account_config_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eed"
+    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eee"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Archive_case_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Archive_case_returns_Bad_Request_response.json
index e271cf945b0..a8c4aa7a929 100644
--- a/src/test/resources/cassettes/features/v2/Archive_case_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Archive_case_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f5"
+    "id": "79babc38-7a70-5347-c8a6-73b0e7014600"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Archive_case_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Archive_case_returns_OK_response.json
index 3c9bf8d6267..b65d84821ea 100644
--- a/src/test/resources/cassettes/features/v2/Archive_case_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Archive_case_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145fa"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145ff"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Assign_case_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Assign_case_returns_OK_response.json
index 2831c66a09c..8e9d7338d0d 100644
--- a/src/test/resources/cassettes/features/v2/Assign_case_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Assign_case_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e7014600"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145ec"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Bulk_delete_datastore_items_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Bulk_delete_datastore_items_returns_Bad_Request_response.json
index 25ab575ed0d..633105f0f85 100644
--- a/src/test/resources/cassettes/features/v2/Bulk_delete_datastore_items_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Bulk_delete_datastore_items_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d33"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d30"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Bulk_delete_datastore_items_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Bulk_delete_datastore_items_returns_OK_response.json
index d39fee8a337..c794e78463c 100644
--- a/src/test/resources/cassettes/features/v2/Bulk_delete_datastore_items_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Bulk_delete_datastore_items_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d2d"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d2f"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Bulk_write_datastore_items_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Bulk_write_datastore_items_returns_Bad_Request_response.json
index b22410fa4ef..eb6915eead6 100644
--- a/src/test/resources/cassettes/features/v2/Bulk_write_datastore_items_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Bulk_write_datastore_items_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d30"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d32"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Bulk_write_datastore_items_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Bulk_write_datastore_items_returns_OK_response.json
index 21ee8cc402d..b7e39e620cf 100644
--- a/src/test/resources/cassettes/features/v2/Bulk_write_datastore_items_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Bulk_write_datastore_items_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d32"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d2e"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Cancel_a_historical_job_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Cancel_a_historical_job_returns_OK_response.json
index 9645e2b41cc..2dd306813ac 100644
--- a/src/test/resources/cassettes/features/v2/Cancel_a_historical_job_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Cancel_a_historical_job_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6bb82102-e994-f0d1-ee96-e1e3f1d80fff"
+    "id": "6bb82102-e994-f0d1-ee96-e1e3f1d80ffe"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Cancels_a_data_deletion_request_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Cancels_a_data_deletion_request_returns_OK_response.json
index 0b99dd1bd72..cfae7af1511 100644
--- a/src/test/resources/cassettes/features/v2/Cancels_a_data_deletion_request_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Cancels_a_data_deletion_request_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "516e2b97-25f6-b08c-4d4a-1da22948b32e"
+    "id": "516e2b97-25f6-b08c-4d4a-1da22948b32f"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Comment_case_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Comment_case_returns_Bad_Request_response.json
index 415e80ea1fb..8c97b2392b3 100644
--- a/src/test/resources/cassettes/features/v2/Comment_case_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Comment_case_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f2"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f6"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_AWS_CCM_config_returns_AWS_CCM_Config_object_response.json b/src/test/resources/cassettes/features/v2/Create_AWS_CCM_config_returns_AWS_CCM_Config_object_response.json
index 5ba8e36023e..7c726903cc8 100644
--- a/src/test/resources/cassettes/features/v2/Create_AWS_CCM_config_returns_AWS_CCM_Config_object_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_AWS_CCM_config_returns_AWS_CCM_Config_object_response.json
@@ -48,7 +48,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "58d1c8d5-bb10-59b9-aa85-8871f8479221"
+    "id": "58d1c8d5-bb10-59b9-aa85-8871f847921f"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_AWS_CCM_config_returns_Conflict_response.json b/src/test/resources/cassettes/features/v2/Create_AWS_CCM_config_returns_Conflict_response.json
index a885ab105be..563401356dc 100644
--- a/src/test/resources/cassettes/features/v2/Create_AWS_CCM_config_returns_Conflict_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_AWS_CCM_config_returns_Conflict_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "58d1c8d5-bb10-59b9-aa85-8871f847921f"
+    "id": "58d1c8d5-bb10-59b9-aa85-8871f8479220"
   },
   {
     "httpRequest": {
@@ -57,6 +57,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "58d1c8d5-bb10-59b9-aa85-8871f8479220"
+    "id": "58d1c8d5-bb10-59b9-aa85-8871f8479221"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Create_AWS_on_demand_task_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Create_AWS_on_demand_task_returns_Bad_Request_response.json
index 91451dfea49..ea94cd9866e 100644
--- a/src/test/resources/cassettes/features/v2/Create_AWS_on_demand_task_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_AWS_on_demand_task_returns_Bad_Request_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ddc95453-e78c-c1f7-f3a9-441d29765f2f"
+    "id": "ddc95453-e78c-c1f7-f3a9-441d29765f2e"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Create_App_returns_Created_response.json b/src/test/resources/cassettes/features/v2/Create_App_returns_Created_response.json
index 12d11a05f48..149f4ec2ee3 100644
--- a/src/test/resources/cassettes/features/v2/Create_App_returns_Created_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_App_returns_Created_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50c"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c514"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_GCP_scan_options_returns_Agentless_scan_options_enabled_successfully_response.json b/src/test/resources/cassettes/features/v2/Create_GCP_scan_options_returns_Agentless_scan_options_enabled_successfully_response.json
index 25b85370788..848565e096f 100644
--- a/src/test/resources/cassettes/features/v2/Create_GCP_scan_options_returns_Agentless_scan_options_enabled_successfully_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_GCP_scan_options_returns_Agentless_scan_options_enabled_successfully_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "95d55fc8-65c9-599d-fc62-5922c335758f"
+    "id": "95d55fc8-65c9-599d-fc62-5922c3357590"
   },
   {
     "httpRequest": {
@@ -48,6 +48,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7e1fd6df-f1a0-70b4-90c2-13c11f689f82"
+    "id": "7e1fd6df-f1a0-70b4-90c2-13c11f689f83"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Create_GCP_scan_options_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Create_GCP_scan_options_returns_Bad_Request_response.json
index 1b79699f31c..f2582dd2e15 100644
--- a/src/test/resources/cassettes/features/v2/Create_GCP_scan_options_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_GCP_scan_options_returns_Bad_Request_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "88bc6eec-07d7-cb8c-599b-ab5a96b05cc6"
+    "id": "88bc6eec-07d7-cb8c-599b-ab5a96b05cc7"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Create_Org_Connection_returns_Conflict_response.json b/src/test/resources/cassettes/features/v2/Create_Org_Connection_returns_Conflict_response.json
index 223e245f710..95cb4a17509 100644
--- a/src/test/resources/cassettes/features/v2/Create_Org_Connection_returns_Conflict_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_Org_Connection_returns_Conflict_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae47"
+    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae45"
   },
   {
     "httpRequest": {
@@ -57,7 +57,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae48"
+    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae46"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_Scanning_Group_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Create_Scanning_Group_returns_OK_response.json
index c4618fa2695..c7581f314f6 100644
--- a/src/test/resources/cassettes/features/v2/Create_Scanning_Group_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_Scanning_Group_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e82"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e7c"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_returns_OK_response.json
index 7cd225c46c7..27a0366d605 100644
--- a/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e83"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e7d"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa6"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa1"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_with_should_save_match_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_with_should_save_match_returns_OK_response.json
index 1fec75541c7..724c6d79189 100644
--- a/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_with_should_save_match_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_with_should_save_match_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e7f"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e7a"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa3"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238a9f"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_a_custom_framework_returns_Conflict_response.json b/src/test/resources/cassettes/features/v2/Create_a_custom_framework_returns_Conflict_response.json
index 3af6b797aec..0f7572f4ef5 100644
--- a/src/test/resources/cassettes/features/v2/Create_a_custom_framework_returns_Conflict_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_a_custom_framework_returns_Conflict_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "13fe9685-b072-5fe0-c841-4499a9e71c75"
+    "id": "13fe9685-b072-5fe0-c841-4499a9e71c74"
   },
   {
     "httpRequest": {
@@ -57,7 +57,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "13fe9685-b072-5fe0-c841-4499a9e71c76"
+    "id": "13fe9685-b072-5fe0-c841-4499a9e71c75"
   },
   {
     "httpRequest": {
@@ -83,6 +83,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3f"
+    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3e"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Create_a_custom_framework_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Create_a_custom_framework_returns_OK_response.json
index 28abb6f8e76..09067379e94 100644
--- a/src/test/resources/cassettes/features/v2/Create_a_custom_framework_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_a_custom_framework_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "13fe9685-b072-5fe0-c841-4499a9e71c74"
+    "id": "13fe9685-b072-5fe0-c841-4499a9e71c71"
   },
   {
     "httpRequest": {
@@ -53,6 +53,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3e"
+    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3a"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Create_a_dataset_returns_Conflict_response.json b/src/test/resources/cassettes/features/v2/Create_a_dataset_returns_Conflict_response.json
index 98400c9266c..df7ec302f17 100644
--- a/src/test/resources/cassettes/features/v2/Create_a_dataset_returns_Conflict_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_a_dataset_returns_Conflict_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "32c558cf-4a2e-f914-f443-ab94000addcd"
+    "id": "32c558cf-4a2e-f914-f443-ab94000addca"
   },
   {
     "httpRequest": {
@@ -57,7 +57,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "32c558cf-4a2e-f914-f443-ab94000addce"
+    "id": "32c558cf-4a2e-f914-f443-ab94000addcb"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_a_dataset_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Create_a_dataset_returns_OK_response.json
index e735e8a6ac5..fba8b2ccd41 100644
--- a/src/test/resources/cassettes/features/v2/Create_a_dataset_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_a_dataset_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "32c558cf-4a2e-f914-f443-ab94000addca"
+    "id": "32c558cf-4a2e-f914-f443-ab94000addcd"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_a_restriction_query_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Create_a_restriction_query_returns_OK_response.json
index 2cb19c254b0..fef955ebbee 100644
--- a/src/test/resources/cassettes/features/v2/Create_a_restriction_query_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_a_restriction_query_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "eb3b308b-3d56-9ef8-4096-dd7718f51861"
+    "id": "eb3b308b-3d56-9ef8-4096-dd7718f5185e"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_an_AWS_integration_returns_Conflict_response.json b/src/test/resources/cassettes/features/v2/Create_an_AWS_integration_returns_Conflict_response.json
index 19dc53b7c6a..d5488cdba66 100644
--- a/src/test/resources/cassettes/features/v2/Create_an_AWS_integration_returns_Conflict_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_an_AWS_integration_returns_Conflict_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce4"
+    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce2"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_an_incident_type_returns_CREATED_response.json b/src/test/resources/cassettes/features/v2/Create_an_incident_type_returns_CREATED_response.json
index ae1a3ad8373..4e0d708d5b5 100644
--- a/src/test/resources/cassettes/features/v2/Create_an_incident_type_returns_CREATED_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_an_incident_type_returns_CREATED_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bda"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd6"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_custom_attribute_config_for_a_case_type_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Create_custom_attribute_config_for_a_case_type_returns_Bad_Request_response.json
index 127207e03a2..c312b3face8 100644
--- a/src/test/resources/cassettes/features/v2/Create_custom_attribute_config_for_a_case_type_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_custom_attribute_config_for_a_case_type_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af6462"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6466"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_custom_attribute_config_for_a_case_type_returns_CREATED_response.json b/src/test/resources/cassettes/features/v2/Create_custom_attribute_config_for_a_case_type_returns_CREATED_response.json
index 9fe6ad431e0..1a120b75ae8 100644
--- a/src/test/resources/cassettes/features/v2/Create_custom_attribute_config_for_a_case_type_returns_CREATED_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_custom_attribute_config_for_a_case_type_returns_CREATED_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af6464"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6463"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_incident_notification_rule_returns_Created_response.json b/src/test/resources/cassettes/features/v2/Create_incident_notification_rule_returns_Created_response.json
index b794f34e580..4032fbdc8fc 100644
--- a/src/test/resources/cassettes/features/v2/Create_incident_notification_rule_returns_Created_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_incident_notification_rule_returns_Created_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd1"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bdc"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_incident_notification_template_returns_Created_response.json b/src/test/resources/cassettes/features/v2/Create_incident_notification_template_returns_Created_response.json
index 91af4088c4a..6b69cce1630 100644
--- a/src/test/resources/cassettes/features/v2/Create_incident_notification_template_returns_Created_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_incident_notification_template_returns_Created_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd2"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bdb"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_role_with_a_permission_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Create_role_with_a_permission_returns_OK_response.json
index 036e7ac60ea..226202c4126 100644
--- a/src/test/resources/cassettes/features/v2/Create_role_with_a_permission_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_role_with_a_permission_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb892172"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb892173"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Creates_a_data_deletion_request_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Creates_a_data_deletion_request_returns_OK_response.json
index c12abc0c362..8155c3aeded 100644
--- a/src/test/resources/cassettes/features/v2/Creates_a_data_deletion_request_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Creates_a_data_deletion_request_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "516e2b97-25f6-b08c-4d4a-1da22948b330"
+    "id": "516e2b97-25f6-b08c-4d4a-1da22948b32e"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_App_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_App_returns_OK_response.json
index 813ef8386df..a03b13eebf8 100644
--- a/src/test/resources/cassettes/features/v2/Delete_App_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_App_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c511"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c510"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_Multiple_Apps_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_Multiple_Apps_returns_OK_response.json
index a3cb24b8701..7ed67796512 100644
--- a/src/test/resources/cassettes/features/v2/Delete_Multiple_Apps_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_Multiple_Apps_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50f"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50d"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_Scanning_Group_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_Scanning_Group_returns_OK_response.json
index 1077273c329..f6f0ad2102c 100644
--- a/src/test/resources/cassettes/features/v2/Delete_Scanning_Group_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_Scanning_Group_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e7e"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e7f"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa2"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa3"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_Scanning_Rule_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_Scanning_Rule_returns_OK_response.json
index b25f9a30e79..703a137e1f9 100644
--- a/src/test/resources/cassettes/features/v2/Delete_Scanning_Rule_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_Scanning_Rule_returns_OK_response.json
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238a9f"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa0"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_a_WAF_exclusion_filter_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_a_WAF_exclusion_filter_returns_OK_response.json
index d14b87aa29b..e17e659929e 100644
--- a/src/test/resources/cassettes/features/v2/Delete_a_WAF_exclusion_filter_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_a_WAF_exclusion_filter_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "f87651cf-cb9d-db71-c4de-1be9e301b3ea"
+    "id": "f87651cf-cb9d-db71-c4de-1be9e301b3e9"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_a_case_type_returns_NotContent_response.json b/src/test/resources/cassettes/features/v2/Delete_a_case_type_returns_NotContent_response.json
index d49ca03fd7c..1511b4f762f 100644
--- a/src/test/resources/cassettes/features/v2/Delete_a_case_type_returns_NotContent_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_a_case_type_returns_NotContent_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af6466"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6462"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_a_case_type_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_a_case_type_returns_OK_response.json
index 7a28290d6ae..7919b99b4ff 100644
--- a/src/test/resources/cassettes/features/v2/Delete_a_case_type_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_a_case_type_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af6467"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6461"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_a_custom_framework_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_a_custom_framework_returns_OK_response.json
index ebf1f92f4a9..ab18e4a92c4 100644
--- a/src/test/resources/cassettes/features/v2/Delete_a_custom_framework_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_a_custom_framework_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "13fe9685-b072-5fe0-c841-4499a9e71c72"
+    "id": "13fe9685-b072-5fe0-c841-4499a9e71c73"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3b"
+    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3c"
   },
   {
     "httpRequest": {
@@ -79,6 +79,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3c"
+    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3d"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Delete_a_dataset_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Delete_a_dataset_returns_No_Content_response.json
index 92c10c6b507..21f390e6ce1 100644
--- a/src/test/resources/cassettes/features/v2/Delete_a_dataset_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_a_dataset_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "32c558cf-4a2e-f914-f443-ab94000addc9"
+    "id": "32c558cf-4a2e-f914-f443-ab94000addce"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_a_restriction_query_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_a_restriction_query_returns_OK_response.json
index b4f342c7c6b..85885d0581b 100644
--- a/src/test/resources/cassettes/features/v2/Delete_a_restriction_query_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_a_restriction_query_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "eb3b308b-3d56-9ef8-4096-dd7718f5185e"
+    "id": "eb3b308b-3d56-9ef8-4096-dd7718f51861"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_a_retention_filter_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_a_retention_filter_returns_OK_response.json
index 48b483cd7a4..381d1b90a1b 100644
--- a/src/test/resources/cassettes/features/v2/Delete_a_retention_filter_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_a_retention_filter_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069b"
+    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff0699"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_Bad_Request_response.json
index a42ef29bfae..c82b6c27f29 100644
--- a/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_Bad_Request_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "73fd406e-d686-10bd-50ee-83f2c499e8a8"
+    "id": "73fd406e-d686-10bd-50ee-83f2c499e8a9"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_No_Content_response.json
index 0847900878e..10fbac85dbb 100644
--- a/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce1"
+    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce5"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_Not_Found_response.json
index 797500d67cb..a5021c6aada 100644
--- a/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_Not_Found_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce5"
+    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce6"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_an_existing_Workflow_returns_Successfully_deleted_a_workflow_response.json b/src/test/resources/cassettes/features/v2/Delete_an_existing_Workflow_returns_Successfully_deleted_a_workflow_response.json
index 0d2738de1a3..a86b5756b5e 100644
--- a/src/test/resources/cassettes/features/v2/Delete_an_existing_Workflow_returns_Successfully_deleted_a_workflow_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_an_existing_Workflow_returns_Successfully_deleted_a_workflow_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ef58c8e5-8d44-f741-5735-0d8c01ffa21e"
+    "id": "ef58c8e5-8d44-f741-5735-0d8c01ffa21c"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_an_incident_type_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_an_incident_type_returns_OK_response.json
index 74fcc0a0c5e..8b898cb6a9d 100644
--- a/src/test/resources/cassettes/features/v2/Delete_an_incident_type_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_an_incident_type_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd8"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bda"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_Bad_Request_response.json
index 355262a1b02..18d5998a22a 100644
--- a/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145fc"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145ea"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_No_Content_response.json
index 3c7a22d087a..021bac611d3 100644
--- a/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145ea"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f2"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_Not_Found_response.json
index f352512410e..f1c8d39365e 100644
--- a/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_Not_Found_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f3"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f4"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_custom_attribute_from_case_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Delete_custom_attribute_from_case_returns_Not_Found_response.json
index d85b4091fcb..7747f8db345 100644
--- a/src/test/resources/cassettes/features/v2/Delete_custom_attribute_from_case_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_custom_attribute_from_case_returns_Not_Found_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145e9"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f7"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_custom_attributes_config_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Delete_custom_attributes_config_returns_Bad_Request_response.json
index 32e889b68d6..2dc635d3a78 100644
--- a/src/test/resources/cassettes/features/v2/Delete_custom_attributes_config_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_custom_attributes_config_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af6461"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6467"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_datastore_item_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_datastore_item_returns_OK_response.json
index 02c557b492b..14ecd66b8a4 100644
--- a/src/test/resources/cassettes/features/v2/Delete_datastore_item_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_datastore_item_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d34"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d2c"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_datastore_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_datastore_returns_OK_response.json
index 0f4bd1ebaf2..89a12a585b3 100644
--- a/src/test/resources/cassettes/features/v2/Delete_datastore_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_datastore_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d2e"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d31"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_incident_notification_rule_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Delete_incident_notification_rule_returns_No_Content_response.json
index edd6a6da9bf..6e8b7d7b0b1 100644
--- a/src/test/resources/cassettes/features/v2/Delete_incident_notification_rule_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_incident_notification_rule_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd3"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd9"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_incident_notification_template_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Delete_incident_notification_template_returns_No_Content_response.json
index 53b4917f2bb..3770b9b0a09 100644
--- a/src/test/resources/cassettes/features/v2/Delete_incident_notification_template_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_incident_notification_template_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd7"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd5"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Edit_a_dataset_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Edit_a_dataset_returns_OK_response.json
index f868434d6ac..75a40d06c1c 100644
--- a/src/test/resources/cassettes/features/v2/Edit_a_dataset_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Edit_a_dataset_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "32c558cf-4a2e-f914-f443-ab94000addcf"
+    "id": "32c558cf-4a2e-f914-f443-ab94000addc9"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Generate_a_new_external_ID_returns_AWS_External_ID_object_response.json b/src/test/resources/cassettes/features/v2/Generate_a_new_external_ID_returns_AWS_External_ID_object_response.json
index c2491988476..6ef442b0c31 100644
--- a/src/test/resources/cassettes/features/v2/Generate_a_new_external_ID_returns_AWS_External_ID_object_response.json
+++ b/src/test/resources/cassettes/features/v2/Generate_a_new_external_ID_returns_AWS_External_ID_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "a3ebb722-60eb-fa89-589a-ff3630e3a2cc"
+    "id": "a3ebb722-60eb-fa89-589a-ff3630e3a2ce"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Generate_new_external_ID_returns_AWS_External_ID_object_response.json b/src/test/resources/cassettes/features/v2/Generate_new_external_ID_returns_AWS_External_ID_object_response.json
index 1e23eb77688..dbcf089d3c7 100644
--- a/src/test/resources/cassettes/features/v2/Generate_new_external_ID_returns_AWS_External_ID_object_response.json
+++ b/src/test/resources/cassettes/features/v2/Generate_new_external_ID_returns_AWS_External_ID_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "a3ebb722-60eb-fa89-589a-ff3630e3a2ce"
+    "id": "a3ebb722-60eb-fa89-589a-ff3630e3a2cc"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Get_AWS_On_Demand_task_by_id_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Get_AWS_On_Demand_task_by_id_returns_Bad_Request_response.json
index 6b2882ea815..fe4cf251d57 100644
--- a/src/test/resources/cassettes/features/v2/Get_AWS_On_Demand_task_by_id_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_AWS_On_Demand_task_by_id_returns_Bad_Request_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "4fd99083-06ab-185c-0a48-d579a5f192c2"
+    "id": "4fd99083-06ab-185c-0a48-d579a5f192c1"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Get_AWS_on_demand_task_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Get_AWS_on_demand_task_returns_Bad_Request_response.json
index fe4cf251d57..6b2882ea815 100644
--- a/src/test/resources/cassettes/features/v2/Get_AWS_on_demand_task_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_AWS_on_demand_task_returns_Bad_Request_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "4fd99083-06ab-185c-0a48-d579a5f192c1"
+    "id": "4fd99083-06ab-185c-0a48-d579a5f192c2"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Get_App_returns_Gone_response.json b/src/test/resources/cassettes/features/v2/Get_App_returns_Gone_response.json
index bd34150cae6..e633be95098 100644
--- a/src/test/resources/cassettes/features/v2/Get_App_returns_Gone_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_App_returns_Gone_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c515"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c511"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_a_critical_asset_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_a_critical_asset_returns_OK_response.json
index eccc4031f16..0baec6032c5 100644
--- a/src/test/resources/cassettes/features/v2/Get_a_critical_asset_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_a_critical_asset_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6ffb5b4d-a3b7-6fa1-1d1c-e0464f43c9e6"
+    "id": "6ffb5b4d-a3b7-6fa1-1d1c-e0464f43c9e5"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_a_custom_framework_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_a_custom_framework_returns_OK_response.json
index 5661edabb7b..009fff14323 100644
--- a/src/test/resources/cassettes/features/v2/Get_a_custom_framework_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_a_custom_framework_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "13fe9685-b072-5fe0-c841-4499a9e71c73"
+    "id": "13fe9685-b072-5fe0-c841-4499a9e71c72"
   },
   {
     "httpRequest": {
@@ -79,6 +79,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3d"
+    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3b"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Get_a_given_APM_retention_filter_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_a_given_APM_retention_filter_returns_OK_response.json
index 108cf352bd9..1519dba55ca 100644
--- a/src/test/resources/cassettes/features/v2/Get_a_given_APM_retention_filter_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_a_given_APM_retention_filter_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069e"
+    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069c"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_a_single_dataset_by_ID_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_a_single_dataset_by_ID_returns_OK_response.json
index 4d88f30cac5..59a863c261f 100644
--- a/src/test/resources/cassettes/features/v2/Get_a_single_dataset_by_ID_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_a_single_dataset_by_ID_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "32c558cf-4a2e-f914-f443-ab94000addcc"
+    "id": "32c558cf-4a2e-f914-f443-ab94000addcf"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_all_custom_attributes_config_of_case_type_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_all_custom_attributes_config_of_case_type_returns_OK_response.json
index 07da3e25a95..3286dbce5dc 100644
--- a/src/test/resources/cassettes/features/v2/Get_all_custom_attributes_config_of_case_type_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_all_custom_attributes_config_of_case_type_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af6463"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6464"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_all_datasets_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_all_datasets_returns_OK_response.json
index 7b4fa0f864b..bd35bd59ea6 100644
--- a/src/test/resources/cassettes/features/v2/Get_all_datasets_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_all_datasets_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "32c558cf-4a2e-f914-f443-ab94000addcb"
+    "id": "32c558cf-4a2e-f914-f443-ab94000addcc"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_AWS_Account_object_response.json b/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_AWS_Account_object_response.json
index 9933d6258ad..88ec4190fd7 100644
--- a/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_AWS_Account_object_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_AWS_Account_object_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce6"
+    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce3"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_Not_Found_response.json
index 7e5c7b1234d..55368f4ae1c 100644
--- a/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_Not_Found_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "9b33b83c-c8bb-714f-cf71-33ab2f3af9d3"
+    "id": "9b33b83c-c8bb-714f-cf71-33ab2f3af9d4"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Get_an_existing_Workflow_returns_Successfully_got_a_workflow_response.json b/src/test/resources/cassettes/features/v2/Get_an_existing_Workflow_returns_Successfully_got_a_workflow_response.json
index 0ad821e051f..c859297de35 100644
--- a/src/test/resources/cassettes/features/v2/Get_an_existing_Workflow_returns_Successfully_got_a_workflow_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_an_existing_Workflow_returns_Successfully_got_a_workflow_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ef58c8e5-8d44-f741-5735-0d8c01ffa21c"
+    "id": "ef58c8e5-8d44-f741-5735-0d8c01ffa21d"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_datastore_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_datastore_returns_OK_response.json
index 4aba2dd2af0..b79df729351 100644
--- a/src/test/resources/cassettes/features/v2/Get_datastore_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_datastore_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d35"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d34"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_incident_notification_rule_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_incident_notification_rule_returns_OK_response.json
index 00f0e4bc8fd..7b054104c3f 100644
--- a/src/test/resources/cassettes/features/v2/Get_incident_notification_rule_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_incident_notification_rule_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bdc"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd7"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_incident_notification_template_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_incident_notification_template_returns_OK_response.json
index 8af5e0e1230..06a6f28a5dd 100644
--- a/src/test/resources/cassettes/features/v2/Get_incident_notification_template_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_incident_notification_template_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bdb"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd3"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_list_of_AWS_log_ready_services_returns_AWS_Logs_Services_List_object_response.json b/src/test/resources/cassettes/features/v2/Get_list_of_AWS_log_ready_services_returns_AWS_Logs_Services_List_object_response.json
index e05cab1201f..f469a5cda1f 100644
--- a/src/test/resources/cassettes/features/v2/Get_list_of_AWS_log_ready_services_returns_AWS_Logs_Services_List_object_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_list_of_AWS_log_ready_services_returns_AWS_Logs_Services_List_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "03c3c0d9-a62f-5ac6-398b-e22a05d14d7b"
+    "id": "03c3c0d9-a62f-5ac6-398b-e22a05d14d79"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Get_the_details_of_a_case_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_the_details_of_a_case_returns_OK_response.json
index aa8f9bb249e..832db589a6a 100644
--- a/src/test/resources/cassettes/features/v2/Get_the_details_of_a_case_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_the_details_of_a_case_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f0"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145fa"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Gets_a_list_of_data_deletion_requests_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Gets_a_list_of_data_deletion_requests_returns_OK_response.json
index 1eccad92176..6ab71e5cb0b 100644
--- a/src/test/resources/cassettes/features/v2/Gets_a_list_of_data_deletion_requests_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Gets_a_list_of_data_deletion_requests_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "516e2b97-25f6-b08c-4d4a-1da22948b32f"
+    "id": "516e2b97-25f6-b08c-4d4a-1da22948b330"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Grant_permission_to_a_role_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Grant_permission_to_a_role_returns_OK_response.json
index 7c863a23483..c185341f0ba 100644
--- a/src/test/resources/cassettes/features/v2/Grant_permission_to_a_role_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Grant_permission_to_a_role_returns_OK_response.json
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb89216d"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb892175"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/List_App_Versions_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_App_Versions_returns_OK_response.json
index 45cfbd41d64..47c8d6237a9 100644
--- a/src/test/resources/cassettes/features/v2/List_App_Versions_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_App_Versions_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c518"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50e"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/List_Scanning_Groups_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_Scanning_Groups_returns_OK_response.json
index debb94ef652..601160992e8 100644
--- a/src/test/resources/cassettes/features/v2/List_Scanning_Groups_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_Scanning_Groups_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e79"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e84"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238a9e"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa7"
   },
   {
     "httpRequest": {
@@ -79,7 +79,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e7a"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e85"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/List_all_APM_retention_filters_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_all_APM_retention_filters_returns_OK_response.json
index 0a42d776a20..3ea25dce874 100644
--- a/src/test/resources/cassettes/features/v2/List_all_APM_retention_filters_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_all_APM_retention_filters_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069d"
+    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069b"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/List_all_AWS_integrations_returns_AWS_Accounts_List_object_response.json b/src/test/resources/cassettes/features/v2/List_all_AWS_integrations_returns_AWS_Accounts_List_object_response.json
index 4ddbbbf6380..bd48720dd5f 100644
--- a/src/test/resources/cassettes/features/v2/List_all_AWS_integrations_returns_AWS_Accounts_List_object_response.json
+++ b/src/test/resources/cassettes/features/v2/List_all_AWS_integrations_returns_AWS_Accounts_List_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "101a55f5-5a26-d616-5fb4-8d0451d83d10"
+    "id": "101a55f5-5a26-d616-5fb4-8d0451d83d11"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/List_available_namespaces_returns_AWS_Namespaces_List_object_response.json b/src/test/resources/cassettes/features/v2/List_available_namespaces_returns_AWS_Namespaces_List_object_response.json
index b4ab43f6993..4e2a1b8a39b 100644
--- a/src/test/resources/cassettes/features/v2/List_available_namespaces_returns_AWS_Namespaces_List_object_response.json
+++ b/src/test/resources/cassettes/features/v2/List_available_namespaces_returns_AWS_Namespaces_List_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "d0ec7736-ef6c-d071-3390-4a5c3a301d0e"
+    "id": "d0ec7736-ef6c-d071-3390-4a5c3a301d11"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/List_datastore_items_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_datastore_items_returns_OK_response.json
index 1796631327a..3ec5cb41a21 100644
--- a/src/test/resources/cassettes/features/v2/List_datastore_items_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_datastore_items_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d2c"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d35"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/List_incident_notification_rules_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_incident_notification_rules_returns_OK_response.json
index 3b4c609f8c5..658cc27abad 100644
--- a/src/test/resources/cassettes/features/v2/List_incident_notification_rules_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_incident_notification_rules_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd9"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd1"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/List_log_services_returns_AWS_Logs_Services_List_object_response.json b/src/test/resources/cassettes/features/v2/List_log_services_returns_AWS_Logs_Services_List_object_response.json
index 266b281e690..e05cab1201f 100644
--- a/src/test/resources/cassettes/features/v2/List_log_services_returns_AWS_Logs_Services_List_object_response.json
+++ b/src/test/resources/cassettes/features/v2/List_log_services_returns_AWS_Logs_Services_List_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "03c3c0d9-a62f-5ac6-398b-e22a05d14d7a"
+    "id": "03c3c0d9-a62f-5ac6-398b-e22a05d14d7b"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/List_permissions_for_a_role_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_permissions_for_a_role_returns_OK_response.json
index 068dfdc41d2..cfd81d2cd53 100644
--- a/src/test/resources/cassettes/features/v2/List_permissions_for_a_role_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_permissions_for_a_role_returns_OK_response.json
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb892170"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb89216d"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/List_permissions_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_permissions_returns_OK_response.json
index af216062061..15f40344bd7 100644
--- a/src/test/resources/cassettes/features/v2/List_permissions_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_permissions_returns_OK_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb892175"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb89216c"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/List_pipelines_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_pipelines_returns_OK_response.json
index d25ab6492a4..7f8215348d1 100644
--- a/src/test/resources/cassettes/features/v2/List_pipelines_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_pipelines_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "1c5790bf-1fdc-930d-ee1e-046e57b87c7c"
+    "id": "1c5790bf-1fdc-930d-ee1e-046e57b87c80"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Name_App_Version_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Name_App_Version_returns_No_Content_response.json
index 15fabc90492..794b5deb5db 100644
--- a/src/test/resources/cassettes/features/v2/Name_App_Version_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Name_App_Version_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c512"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50f"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_Bad_Request_response_2.json b/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_Bad_Request_response_2.json
index 2ebfbdcfa75..c48e77cce48 100644
--- a/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_Bad_Request_response_2.json
+++ b/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_Bad_Request_response_2.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c6af96d1-87d1-3cd6-0d2d-71631b85bb77"
+    "id": "c6af96d1-87d1-3cd6-0d2d-71631b85bb78"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_OK_response.json
index 974c53ce63d..0a176ee003e 100644
--- a/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_OK_response.json
@@ -22,6 +22,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "0f485c8a-a29e-ebed-3836-545f90bc9456"
+    "id": "0f485c8a-a29e-ebed-3836-545f90bc9457"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Patch_GCP_Scan_Options_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Patch_GCP_Scan_Options_returns_Bad_Request_response.json
index d4bcf1ca8ac..fee9f74e00a 100644
--- a/src/test/resources/cassettes/features/v2/Patch_GCP_Scan_Options_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Patch_GCP_Scan_Options_returns_Bad_Request_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c2c329a8-5875-126a-1858-e7c00b5af113"
+    "id": "c2c329a8-5875-126a-1858-e7c00b5af114"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Pin_a_Model_Lab_run_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Pin_a_Model_Lab_run_returns_No_Content_response.json
index 9c853b6672d..3292c6ddbd0 100644
--- a/src/test/resources/cassettes/features/v2/Pin_a_Model_Lab_run_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Pin_a_Model_Lab_run_returns_No_Content_response.json
@@ -39,6 +39,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e9b5da5a-ee96-27b2-f8a0-482fba517cce"
+    "id": "e9b5da5a-ee96-27b2-f8a0-482fba517ccd"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Post_AWS_Scan_Options_returns_Agentless_scan_options_enabled_successfully_response.json b/src/test/resources/cassettes/features/v2/Post_AWS_Scan_Options_returns_Agentless_scan_options_enabled_successfully_response.json
index 858d36f9769..ead796b159c 100644
--- a/src/test/resources/cassettes/features/v2/Post_AWS_Scan_Options_returns_Agentless_scan_options_enabled_successfully_response.json
+++ b/src/test/resources/cassettes/features/v2/Post_AWS_Scan_Options_returns_Agentless_scan_options_enabled_successfully_response.json
@@ -52,6 +52,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "49ae287a-8cc5-118a-4b1c-2dbceae02055"
+    "id": "49ae287a-8cc5-118a-4b1c-2dbceae02054"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Post_AWS_Scan_Options_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Post_AWS_Scan_Options_returns_OK_response.json
index 08f556111f9..199c7919faf 100644
--- a/src/test/resources/cassettes/features/v2/Post_AWS_Scan_Options_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Post_AWS_Scan_Options_returns_OK_response.json
@@ -52,6 +52,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "49ae287a-8cc5-118a-4b1c-2dbceae02054"
+    "id": "49ae287a-8cc5-118a-4b1c-2dbceae02055"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Post_GCP_Scan_Options_returns_Agentless_scan_options_enabled_successfully_response.json b/src/test/resources/cassettes/features/v2/Post_GCP_Scan_Options_returns_Agentless_scan_options_enabled_successfully_response.json
index 848565e096f..25b85370788 100644
--- a/src/test/resources/cassettes/features/v2/Post_GCP_Scan_Options_returns_Agentless_scan_options_enabled_successfully_response.json
+++ b/src/test/resources/cassettes/features/v2/Post_GCP_Scan_Options_returns_Agentless_scan_options_enabled_successfully_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "95d55fc8-65c9-599d-fc62-5922c3357590"
+    "id": "95d55fc8-65c9-599d-fc62-5922c335758f"
   },
   {
     "httpRequest": {
@@ -48,6 +48,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7e1fd6df-f1a0-70b4-90c2-13c11f689f83"
+    "id": "7e1fd6df-f1a0-70b4-90c2-13c11f689f82"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Post_GCP_Scan_Options_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Post_GCP_Scan_Options_returns_Bad_Request_response.json
index edd75392e93..15a68603f06 100644
--- a/src/test/resources/cassettes/features/v2/Post_GCP_Scan_Options_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Post_GCP_Scan_Options_returns_Bad_Request_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "88bc6eec-07d7-cb8c-599b-ab5a96b05cc7"
+    "id": "88bc6eec-07d7-cb8c-599b-ab5a96b05cc6"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Post_an_AWS_on_demand_task_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Post_an_AWS_on_demand_task_returns_Bad_Request_response.json
index ea94cd9866e..91451dfea49 100644
--- a/src/test/resources/cassettes/features/v2/Post_an_AWS_on_demand_task_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Post_an_AWS_on_demand_task_returns_Bad_Request_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ddc95453-e78c-c1f7-f3a9-441d29765f2e"
+    "id": "ddc95453-e78c-c1f7-f3a9-441d29765f2f"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Publish_App_returns_Created_response.json b/src/test/resources/cassettes/features/v2/Publish_App_returns_Created_response.json
index 007a5928092..99b5cd75580 100644
--- a/src/test/resources/cassettes/features/v2/Publish_App_returns_Created_response.json
+++ b/src/test/resources/cassettes/features/v2/Publish_App_returns_Created_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50e"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c519"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Reorder_Groups_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Reorder_Groups_returns_Bad_Request_response.json
index e6fd8ed3e42..db4e9405d0d 100644
--- a/src/test/resources/cassettes/features/v2/Reorder_Groups_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Reorder_Groups_returns_Bad_Request_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e7d"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e79"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa1"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238a9e"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Reorder_Groups_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Reorder_Groups_returns_OK_response.json
index a825db5ee55..f301ca6f3ce 100644
--- a/src/test/resources/cassettes/features/v2/Reorder_Groups_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Reorder_Groups_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e84"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e80"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa7"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa4"
   },
   {
     "httpRequest": {
@@ -79,7 +79,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e85"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e81"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Revoke_permission_returns_Not_found_response.json b/src/test/resources/cassettes/features/v2/Revoke_permission_returns_Not_found_response.json
index a6d6057cc63..3ad8271712a 100644
--- a/src/test/resources/cassettes/features/v2/Revoke_permission_returns_Not_found_response.json
+++ b/src/test/resources/cassettes/features/v2/Revoke_permission_returns_Not_found_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb89216c"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb89216f"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Revoke_permission_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Revoke_permission_returns_OK_response.json
index 524aba86421..29de68e4b42 100644
--- a/src/test/resources/cassettes/features/v2/Revoke_permission_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Revoke_permission_returns_OK_response.json
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb892171"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb892174"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Run_a_historical_job_returns_Status_created_response.json b/src/test/resources/cassettes/features/v2/Run_a_historical_job_returns_Status_created_response.json
index 916bccfa080..e5433d704cc 100644
--- a/src/test/resources/cassettes/features/v2/Run_a_historical_job_returns_Status_created_response.json
+++ b/src/test/resources/cassettes/features/v2/Run_a_historical_job_returns_Status_created_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6bb82102-e994-f0d1-ee96-e1e3f1d80ffe"
+    "id": "6bb82102-e994-f0d1-ee96-e1e3f1d80fff"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Unarchive_case_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Unarchive_case_returns_Bad_Request_response.json
index 332b85099dd..b0100b1774b 100644
--- a/src/test/resources/cassettes/features/v2/Unarchive_case_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Unarchive_case_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f9"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145ee"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Unarchive_case_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Unarchive_case_returns_OK_response.json
index e2e2a133bc8..60a873eea23 100644
--- a/src/test/resources/cassettes/features/v2/Unarchive_case_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Unarchive_case_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145ef"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145e9"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Unassign_case_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Unassign_case_returns_Bad_Request_response.json
index d51ad920076..9696ac40e32 100644
--- a/src/test/resources/cassettes/features/v2/Unassign_case_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Unassign_case_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145fb"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145ef"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Unassign_case_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Unassign_case_returns_OK_response.json
index 88b95ace082..25c50b5140f 100644
--- a/src/test/resources/cassettes/features/v2/Unassign_case_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Unassign_case_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f1"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145fb"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Unpin_a_Model_Lab_run_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Unpin_a_Model_Lab_run_returns_No_Content_response.json
index 3af8cd28dc9..f9fb078423e 100644
--- a/src/test/resources/cassettes/features/v2/Unpin_a_Model_Lab_run_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Unpin_a_Model_Lab_run_returns_No_Content_response.json
@@ -18,6 +18,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e9b5da5a-ee96-27b2-f8a0-482fba517ccd"
+    "id": "e9b5da5a-ee96-27b2-f8a0-482fba517cce"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Unpublish_App_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Unpublish_App_returns_OK_response.json
index 785bd78f8b8..cf3de41da76 100644
--- a/src/test/resources/cassettes/features/v2/Unpublish_App_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Unpublish_App_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c513"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c518"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_Bad_Request_response_2.json b/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_Bad_Request_response_2.json
index c48e77cce48..2ebfbdcfa75 100644
--- a/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_Bad_Request_response_2.json
+++ b/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_Bad_Request_response_2.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c6af96d1-87d1-3cd6-0d2d-71631b85bb78"
+    "id": "c6af96d1-87d1-3cd6-0d2d-71631b85bb77"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_No_Content_response.json
index 0a176ee003e..974c53ce63d 100644
--- a/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_No_Content_response.json
@@ -22,6 +22,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "0f485c8a-a29e-ebed-3836-545f90bc9457"
+    "id": "0f485c8a-a29e-ebed-3836-545f90bc9456"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Update_App_Favorite_Status_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Update_App_Favorite_Status_returns_No_Content_response.json
index 31b69ffd5db..fb2106e33db 100644
--- a/src/test/resources/cassettes/features/v2/Update_App_Favorite_Status_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_App_Favorite_Status_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c516"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c512"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_App_Protection_Level_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_App_Protection_Level_returns_OK_response.json
index 2e968ee5068..b097c819bce 100644
--- a/src/test/resources/cassettes/features/v2/Update_App_Protection_Level_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_App_Protection_Level_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c510"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c516"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_App_Self_Service_Status_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Update_App_Self_Service_Status_returns_No_Content_response.json
index e34cd831da4..65d3667dc0a 100644
--- a/src/test/resources/cassettes/features/v2/Update_App_Self_Service_Status_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_App_Self_Service_Status_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c51a"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c515"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_App_Tags_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Update_App_Tags_returns_No_Content_response.json
index 0d48cfd6420..5f6656d94c1 100644
--- a/src/test/resources/cassettes/features/v2/Update_App_Tags_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_App_Tags_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c519"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c51a"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_App_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_App_returns_Bad_Request_response.json
index 557872184a5..5e1d57e1aff 100644
--- a/src/test/resources/cassettes/features/v2/Update_App_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_App_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50d"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50c"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_App_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_App_returns_OK_response.json
index 8754c8dd9f3..561057ced5c 100644
--- a/src/test/resources/cassettes/features/v2/Update_App_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_App_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c514"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c513"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_GCP_scan_options_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_GCP_scan_options_returns_Bad_Request_response.json
index e0d488678ae..bd889c4d7e5 100644
--- a/src/test/resources/cassettes/features/v2/Update_GCP_scan_options_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_GCP_scan_options_returns_Bad_Request_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c2c329a8-5875-126a-1858-e7c00b5af114"
+    "id": "c2c329a8-5875-126a-1858-e7c00b5af113"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_Bad_Request_response.json
index 30f5bc71d9c..970a0b596df 100644
--- a/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae43"
+    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae47"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_Not_Found_response.json
index 1c923bb6635..441a98208d4 100644
--- a/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_Not_Found_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae46"
+    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae48"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_OK_response.json
index bc6d33ad1cb..085c2a10ee9 100644
--- a/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae45"
+    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae43"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_Scanning_Group_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_Scanning_Group_returns_OK_response.json
index b67f3a1d41c..4fc4e2937a7 100644
--- a/src/test/resources/cassettes/features/v2/Update_Scanning_Group_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_Scanning_Group_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e81"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e83"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa5"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa6"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_Scanning_Rule_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_Scanning_Rule_returns_Bad_Request_response.json
index 7929a88b4e0..71ae1c8ab0f 100644
--- a/src/test/resources/cassettes/features/v2/Update_Scanning_Rule_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_Scanning_Rule_returns_Bad_Request_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e80"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e82"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa4"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa5"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_Scanning_Rule_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_Scanning_Rule_returns_OK_response.json
index c3bd407a946..19819989192 100644
--- a/src/test/resources/cassettes/features/v2/Update_Scanning_Rule_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_Scanning_Rule_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e7c"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e7e"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa0"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa2"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_WAF_exclusion_filter_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_a_WAF_exclusion_filter_returns_OK_response.json
index fdf05e33c3a..2d88a0bc75b 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_WAF_exclusion_filter_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_WAF_exclusion_filter_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "f87651cf-cb9d-db71-c4de-1be9e301b3e9"
+    "id": "f87651cf-cb9d-db71-c4de-1be9e301b3ea"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_critical_asset_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_a_critical_asset_returns_OK_response.json
index 6b10b1f99cb..3f634cdfdc4 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_critical_asset_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_critical_asset_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6ffb5b4d-a3b7-6fa1-1d1c-e0464f43c9e5"
+    "id": "6ffb5b4d-a3b7-6fa1-1d1c-e0464f43c9e6"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_custom_framework_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_a_custom_framework_returns_OK_response.json
index 4144e776050..c6d6252edc4 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_custom_framework_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_custom_framework_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "13fe9685-b072-5fe0-c841-4499a9e71c71"
+    "id": "13fe9685-b072-5fe0-c841-4499a9e71c76"
   },
   {
     "httpRequest": {
@@ -83,6 +83,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3a"
+    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3f"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Update_a_pipeline_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_a_pipeline_returns_OK_response.json
index 9a05ea21a67..5486c5522b1 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_pipeline_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_pipeline_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "1c5790bf-1fdc-930d-ee1e-046e57b87c80"
+    "id": "1c5790bf-1fdc-930d-ee1e-046e57b87c7c"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_Bad_Request_response.json
index e93ced0b7aa..c669844b54b 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069a"
+    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff0697"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_Not_Found_response.json
index f8e2615c3f8..170166752c7 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_Not_Found_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ce266f9d-5f90-251e-805b-1fa5bbd62fea"
+    "id": "ce266f9d-5f90-251e-805b-1fa5bbd62feb"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_OK_response.json
index 83f232b7769..3e2885f919c 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff0698"
+    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069a"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_retention_filter_with_trace_rate_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_a_retention_filter_with_trace_rate_returns_OK_response.json
index 6b4562c95f9..a39d900e784 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_retention_filter_with_trace_rate_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_retention_filter_with_trace_rate_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069c"
+    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069d"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_Bad_Request_response.json
index a8ee0769782..f7ba5a0c135 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff0699"
+    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069e"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_Not_Found_response.json
index 170166752c7..f8e2615c3f8 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_Not_Found_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ce266f9d-5f90-251e-805b-1fa5bbd62feb"
+    "id": "ce266f9d-5f90-251e-805b-1fa5bbd62fea"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_OK_response.json
index 4f6a89b85f3..4f3f459c693 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff0697"
+    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff0698"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_role_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_a_role_returns_Bad_Request_response.json
index 2733aa2afce..73305cd59ef 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_role_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_role_returns_Bad_Request_response.json
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb89216f"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb892171"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_role_returns_Not_found_response.json b/src/test/resources/cassettes/features/v2/Update_a_role_returns_Not_found_response.json
index f994b57c57d..3523eabfb46 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_role_returns_Not_found_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_role_returns_Not_found_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb892173"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb892170"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_role_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_a_role_returns_OK_response.json
index 19ad9312674..ada6cbf8cd4 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_role_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_role_returns_OK_response.json
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb892174"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb892172"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_an_AWS_integration_returns_AWS_Account_object_response.json b/src/test/resources/cassettes/features/v2/Update_an_AWS_integration_returns_AWS_Account_object_response.json
index e47e6cdfe12..2efa53de1ac 100644
--- a/src/test/resources/cassettes/features/v2/Update_an_AWS_integration_returns_AWS_Account_object_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_an_AWS_integration_returns_AWS_Account_object_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce3"
+    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce4"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_an_AWS_integration_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_an_AWS_integration_returns_Bad_Request_response.json
index 833d5ca5043..5e43645a6a4 100644
--- a/src/test/resources/cassettes/features/v2/Update_an_AWS_integration_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_an_AWS_integration_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce2"
+    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce1"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_an_existing_Workflow_returns_Successfully_updated_a_workflow_response.json b/src/test/resources/cassettes/features/v2/Update_an_existing_Workflow_returns_Successfully_updated_a_workflow_response.json
index ab514e51ba2..be6cf1cbadf 100644
--- a/src/test/resources/cassettes/features/v2/Update_an_existing_Workflow_returns_Successfully_updated_a_workflow_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_an_existing_Workflow_returns_Successfully_updated_a_workflow_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ef58c8e5-8d44-f741-5735-0d8c01ffa21d"
+    "id": "ef58c8e5-8d44-f741-5735-0d8c01ffa21e"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_an_incident_type_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_an_incident_type_returns_OK_response.json
index 7bd770826d4..6309739cc9f 100644
--- a/src/test/resources/cassettes/features/v2/Update_an_incident_type_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_an_incident_type_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd6"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd2"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_attributes_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_case_attributes_returns_OK_response.json
index 44f28b45360..88be588dd3c 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_attributes_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_attributes_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145fe"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f5"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_Bad_Request_response.json
index c69aaf87654..876ad2e41fe 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af646a"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6469"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_Not_Found_response.json
index fe19098a6f3..edb0c4fa3c7 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_Not_Found_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145ff"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145ed"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_OK_response.json
index c2b2cab762b..3e0850132da 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af6469"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af646a"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_description_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_case_description_returns_OK_response.json
index fef8d736355..b4cf2323a2d 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_description_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_description_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f8"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f1"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_priority_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_case_priority_returns_Bad_Request_response.json
index fc0f56bc1de..266a2b33b31 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_priority_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_priority_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f4"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145fe"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_priority_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_case_priority_returns_OK_response.json
index 2231d87f113..f462fd4c8dd 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_priority_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_priority_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f7"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f0"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_status_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_case_status_returns_Bad_Request_response.json
index 73fbdd658a2..6a5f8600d39 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_status_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_status_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145ec"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f3"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_status_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_case_status_returns_OK_response.json
index e39974723b5..4d0529dbc46 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_status_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_status_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145ee"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f8"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_title_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_case_title_returns_Bad_Request_response.json
index b7f4230cf66..40f7af7c478 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_title_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_title_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145ed"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f9"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_title_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_case_title_returns_OK_response.json
index 6c834d6b77d..1463cb0e2aa 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_title_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_title_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f6"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145fc"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_datastore_item_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_datastore_item_returns_OK_response.json
index 7e38c35c46e..a293ad3ef40 100644
--- a/src/test/resources/cassettes/features/v2/Update_datastore_item_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_datastore_item_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d2f"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d2d"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_datastore_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_datastore_returns_OK_response.json
index 2163486ba0e..a5223c853a8 100644
--- a/src/test/resources/cassettes/features/v2/Update_datastore_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_datastore_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d31"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d33"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_incident_notification_template_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_incident_notification_template_returns_OK_response.json
index 32bf36c65c1..92e2e3d0445 100644
--- a/src/test/resources/cassettes/features/v2/Update_incident_notification_template_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_incident_notification_template_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd5"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd8"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_the_state_of_an_issue_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_the_state_of_an_issue_returns_Bad_Request_response.json
index 4a27cd1e9d6..e642f719a20 100644
--- a/src/test/resources/cassettes/features/v2/Update_the_state_of_an_issue_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_the_state_of_an_issue_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "a2c05b3b-bab5-013b-200d-7dc622c1b35f"
+    "id": "a2c05b3b-bab5-013b-200d-7dc622c1b35e"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_the_state_of_an_issue_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_the_state_of_an_issue_returns_OK_response.json
index 6078cbf29e3..0c4d5613d6a 100644
--- a/src/test/resources/cassettes/features/v2/Update_the_state_of_an_issue_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_the_state_of_an_issue_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "a2c05b3b-bab5-013b-200d-7dc622c1b35e"
+    "id": "a2c05b3b-bab5-013b-200d-7dc622c1b35f"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/com/datadog/api/client/v2/api/aws_integration.feature b/src/test/resources/com/datadog/api/client/v2/api/aws_integration.feature
index 5989319f4ee..dac51bb7449 100644
--- a/src/test/resources/com/datadog/api/client/v2/api/aws_integration.feature
+++ b/src/test/resources/com/datadog/api/client/v2/api/aws_integration.feature
@@ -292,3 +292,19 @@ Feature: AWS Integration
     And body with value {"data": {"attributes": {"account_tags": ["key:value"], "auth_config": {"role_name": "DatadogIntegrationRole"}, "aws_account_id": "123456789012", "aws_partition": "aws", "logs_config": {"lambda_forwarder": {"lambdas": ["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"], "log_source_config": {"tag_filters": [{"source": "s3", "tags": ["test:test"]}]}, "sources": ["s3"]}}, "metrics_config": {"automute_enabled": true, "collect_cloudwatch_alarms": true, "collect_custom_metrics": true, "enabled": true, "tag_filters": [{"namespace": "AWS/EC2", "tags": ["key:value"]}]}, "resources_config": {"cloud_security_posture_management_collection": false, "extended_collection": false}, "traces_config": {}}, "type": "account"}}
     When the request is sent
     Then the response status is 404 Not Found
+
+  @generated @skip @team:DataDog/aws-integrations
+  Scenario: Validate AWS CCM config returns "AWS CCM Config validation result" response
+    Given operation "ValidateAWSCCMConfig" enabled
+    And new "ValidateAWSCCMConfig" request
+    And body with value {"data": {"attributes": {"account_id": "123456789012", "bucket_name": "billing", "bucket_region": "us-east-1", "report_name": "cost-and-usage-report", "report_prefix": "reports"}, "type": "ccm_config_validation"}}
+    When the request is sent
+    Then the response status is 200 AWS CCM Config validation result
+
+  @generated @skip @team:DataDog/aws-integrations
+  Scenario: Validate AWS CCM config returns "Bad Request" response
+    Given operation "ValidateAWSCCMConfig" enabled
+    And new "ValidateAWSCCMConfig" request
+    And body with value {"data": {"attributes": {"account_id": "123456789012", "bucket_name": "billing", "bucket_region": "us-east-1", "report_name": "cost-and-usage-report", "report_prefix": "reports"}, "type": "ccm_config_validation"}}
+    When the request is sent
+    Then the response status is 400 Bad Request
diff --git a/src/test/resources/com/datadog/api/client/v2/api/undo.json b/src/test/resources/com/datadog/api/client/v2/api/undo.json
index 09d6acff288..b3564f10b86 100644
--- a/src/test/resources/com/datadog/api/client/v2/api/undo.json
+++ b/src/test/resources/com/datadog/api/client/v2/api/undo.json
@@ -3126,6 +3126,12 @@
       "type": "safe"
     }
   },
+  "ValidateAWSCCMConfig": {
+    "tag": "AWS Integration",
+    "undo": {
+      "type": "safe"
+    }
+  },
   "ListGCPSTSAccounts": {
     "tag": "GCP Integration",
     "undo": {