Update documentation with account filtering info for aws_cur_config endpoints (#2416)

Co-authored-by: ci.datadog-api-spec <packages@datadoghq.com>

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

.apigentools-info

@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2025-02-20 13:34:59.325200",
-            "spec_repo_commit": "c64543d0"
+            "regenerated": "2025-02-20 18:33:39.071911",
+            "spec_repo_commit": "d3fcdb89"
         },
         "v2": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2025-02-20 13:34:59.340610",
-            "spec_repo_commit": "c64543d0"
+            "regenerated": "2025-02-20 18:33:39.118129",
+            "spec_repo_commit": "d3fcdb89"
         }
     }
 }

.generator/schemas/v2/openapi.yaml

@@ -1715,6 +1715,33 @@ components:
         xray_services:
           $ref: '#/components/schemas/XRayServicesList'
       type: object
+    AccountFilteringConfig:
+      description: The account filtering configuration.
+      properties:
+        excluded_accounts:
+          description: The AWS account IDs to be excluded from your billing dataset.
+            This field is used when `include_new_accounts` is `true`.
+          example:
+          - '123456789123'
+          - '123456789143'
+          items:
+            type: string
+          type: array
+        include_new_accounts:
+          description: Whether or not to automatically include new member accounts
+            by default in your billing dataset.
+          example: true
+          type: boolean
+        included_accounts:
+          description: The AWS account IDs to be included in your billing dataset.
+            This field is used when `include_new_accounts` is `false`.
+          example:
+          - '123456789123'
+          - '123456789143'
+          items:
+            type: string
+          type: array
+      type: object
     ActionConnectionAttributes:
       description: The definition of `ActionConnectionAttributes` object.
       properties:
@@ -2870,6 +2897,8 @@ components:
     AwsCURConfigAttributes:
       description: Attributes for An AWS CUR config.
       properties:
+        account_filters:
+          $ref: '#/components/schemas/AccountFilteringConfig'
         account_id:
           description: The AWS account ID.
           example: '123456789123'
@@ -2947,12 +2976,12 @@ components:
     AwsCURConfigPatchRequestAttributes:
       description: Attributes for AWS CUR config Patch Request.
       properties:
+        account_filters:
+          $ref: '#/components/schemas/AccountFilteringConfig'
         is_enabled:
           description: Whether or not the Cloud Cost Management account is enabled.
           example: true
           type: boolean
-      required:
-      - is_enabled
       type: object
     AwsCURConfigPatchRequestType:
       default: aws_cur_config_patch_request
@@ -2985,6 +3014,8 @@ components:
     AwsCURConfigPostRequestAttributes:
       description: Attributes for AWS CUR config Post Request.
       properties:
+        account_filters:
+          $ref: '#/components/schemas/AccountFilteringConfig'
         account_id:
           description: The AWS account ID.
           example: '123456789123'
@@ -35630,7 +35661,8 @@ paths:
         permissions:
         - cloud_cost_management_write
     patch:
-      description: Update the status of an AWS CUR config (active/archived).
+      description: Update the status (active/archived) and/or account filtering configuration
+        of an AWS CUR config.
       operationId: UpdateCostAWSCURConfig
       parameters:
       - $ref: '#/components/parameters/CloudAccountID'

docs/datadog_api_client.v2.model.rst

@@ -4,6 +4,13 @@ datadog\_api\_client.v2.model package
 Submodules
 ----------
 
+datadog\_api\_client.v2.model.account\_filtering\_config module
+---------------------------------------------------------------
+
+.. automodule:: datadog_api_client.v2.model.account_filtering_config
+   :members:
+   :show-inheritance:
+
 datadog\_api\_client.v2.model.action\_connection\_attributes module
 -------------------------------------------------------------------
 

src/datadog_api_client/v2/api/cloud_cost_management_api.py

@@ -427,7 +427,7 @@ def update_cost_awscur_config(
     ) -> AwsCURConfigsResponse:
         """Update Cloud Cost Management AWS CUR config.
 
-        Update the status of an AWS CUR config (active/archived).
+        Update the status (active/archived) and/or account filtering configuration of an AWS CUR config.
 
         :param cloud_account_id: Cloud Account id.
         :type cloud_account_id: str

src/datadog_api_client/v2/model/account_filtering_config.py

@@ -0,0 +1,56 @@
+# 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.
+from __future__ import annotations
+
+from typing import List, Union
+
+from datadog_api_client.model_utils import (
+    ModelNormal,
+    cached_property,
+    unset,
+    UnsetType,
+)
+
+
+class AccountFilteringConfig(ModelNormal):
+    @cached_property
+    def openapi_types(_):
+        return {
+            "excluded_accounts": ([str],),
+            "include_new_accounts": (bool,),
+            "included_accounts": ([str],),
+        }
+
+    attribute_map = {
+        "excluded_accounts": "excluded_accounts",
+        "include_new_accounts": "include_new_accounts",
+        "included_accounts": "included_accounts",
+    }
+
+    def __init__(
+        self_,
+        excluded_accounts: Union[List[str], UnsetType] = unset,
+        include_new_accounts: Union[bool, UnsetType] = unset,
+        included_accounts: Union[List[str], UnsetType] = unset,
+        **kwargs,
+    ):
+        """
+        The account filtering configuration.
+
+        :param excluded_accounts: The AWS account IDs to be excluded from your billing dataset. This field is used when ``include_new_accounts`` is ``true``.
+        :type excluded_accounts: [str], optional
+
+        :param include_new_accounts: Whether or not to automatically include new member accounts by default in your billing dataset.
+        :type include_new_accounts: bool, optional
+
+        :param included_accounts: The AWS account IDs to be included in your billing dataset. This field is used when ``include_new_accounts`` is ``false``.
+        :type included_accounts: [str], optional
+        """
+        if excluded_accounts is not unset:
+            kwargs["excluded_accounts"] = excluded_accounts
+        if include_new_accounts is not unset:
+            kwargs["include_new_accounts"] = include_new_accounts
+        if included_accounts is not unset:
+            kwargs["included_accounts"] = included_accounts
+        super().__init__(kwargs)

src/datadog_api_client/v2/model/aws_cur_config_attributes.py

@@ -3,7 +3,7 @@
 # Copyright 2019-Present Datadog, Inc.
 from __future__ import annotations
 
-from typing import List, Union
+from typing import List, Union, TYPE_CHECKING
 
 from datadog_api_client.model_utils import (
     ModelNormal,
@@ -13,6 +13,10 @@
 )
 
 
+if TYPE_CHECKING:
+    from datadog_api_client.v2.model.account_filtering_config import AccountFilteringConfig
+
+
 class AwsCURConfigAttributes(ModelNormal):
     validations = {
         "created_at": {},
@@ -25,7 +29,10 @@ class AwsCURConfigAttributes(ModelNormal):
 
     @cached_property
     def openapi_types(_):
+        from datadog_api_client.v2.model.account_filtering_config import AccountFilteringConfig
+
         return {
+            "account_filters": (AccountFilteringConfig,),
             "account_id": (str,),
             "bucket_name": (str,),
             "bucket_region": (str,),
@@ -40,6 +47,7 @@ def openapi_types(_):
         }
 
     attribute_map = {
+        "account_filters": "account_filters",
         "account_id": "account_id",
         "bucket_name": "bucket_name",
         "bucket_region": "bucket_region",
@@ -61,6 +69,7 @@ def __init__(
         report_name: str,
         report_prefix: str,
         status: str,
+        account_filters: Union[AccountFilteringConfig, UnsetType] = unset,
         created_at: Union[str, UnsetType] = unset,
         error_messages: Union[List[str], UnsetType] = unset,
         months: Union[int, UnsetType] = unset,
@@ -71,6 +80,9 @@ def __init__(
         """
         Attributes for An AWS CUR config.
 
+        :param account_filters: The account filtering configuration.
+        :type account_filters: AccountFilteringConfig, optional
+
         :param account_id: The AWS account ID.
         :type account_id: str
 
@@ -104,6 +116,8 @@ def __init__(
         :param updated_at: The timestamp when the AWS CUR config status was updated.
         :type updated_at: str, optional
         """
+        if account_filters is not unset:
+            kwargs["account_filters"] = account_filters
         if created_at is not unset:
             kwargs["created_at"] = created_at
         if error_messages is not unset:

src/datadog_api_client/v2/model/aws_cur_config_patch_request_attributes.py

@@ -3,31 +3,52 @@
 # Copyright 2019-Present Datadog, Inc.
 from __future__ import annotations
 
+from typing import Union, TYPE_CHECKING
 
 from datadog_api_client.model_utils import (
     ModelNormal,
     cached_property,
+    unset,
+    UnsetType,
 )
 
 
+if TYPE_CHECKING:
+    from datadog_api_client.v2.model.account_filtering_config import AccountFilteringConfig
+
+
 class AwsCURConfigPatchRequestAttributes(ModelNormal):
     @cached_property
     def openapi_types(_):
+        from datadog_api_client.v2.model.account_filtering_config import AccountFilteringConfig
+
         return {
+            "account_filters": (AccountFilteringConfig,),
             "is_enabled": (bool,),
         }
 
     attribute_map = {
+        "account_filters": "account_filters",
         "is_enabled": "is_enabled",
     }
 
-    def __init__(self_, is_enabled: bool, **kwargs):
+    def __init__(
+        self_,
+        account_filters: Union[AccountFilteringConfig, UnsetType] = unset,
+        is_enabled: Union[bool, UnsetType] = unset,
+        **kwargs,
+    ):
         """
         Attributes for AWS CUR config Patch Request.
 
+        :param account_filters: The account filtering configuration.
+        :type account_filters: AccountFilteringConfig, optional
+
         :param is_enabled: Whether or not the Cloud Cost Management account is enabled.
-        :type is_enabled: bool
+        :type is_enabled: bool, optional
         """
+        if account_filters is not unset:
+            kwargs["account_filters"] = account_filters
+        if is_enabled is not unset:
+            kwargs["is_enabled"] = is_enabled
         super().__init__(kwargs)
-
-        self_.is_enabled = is_enabled

src/datadog_api_client/v2/model/aws_cur_config_post_request_attributes.py

@@ -3,7 +3,7 @@
 # Copyright 2019-Present Datadog, Inc.
 from __future__ import annotations
 
-from typing import Union
+from typing import Union, TYPE_CHECKING
 
 from datadog_api_client.model_utils import (
     ModelNormal,
@@ -13,6 +13,10 @@
 )
 
 
+if TYPE_CHECKING:
+    from datadog_api_client.v2.model.account_filtering_config import AccountFilteringConfig
+
+
 class AwsCURConfigPostRequestAttributes(ModelNormal):
     validations = {
         "months": {
@@ -22,7 +26,10 @@ class AwsCURConfigPostRequestAttributes(ModelNormal):
 
     @cached_property
     def openapi_types(_):
+        from datadog_api_client.v2.model.account_filtering_config import AccountFilteringConfig
+
         return {
+            "account_filters": (AccountFilteringConfig,),
             "account_id": (str,),
             "bucket_name": (str,),
             "bucket_region": (str,),
@@ -33,6 +40,7 @@ def openapi_types(_):
         }
 
     attribute_map = {
+        "account_filters": "account_filters",
         "account_id": "account_id",
         "bucket_name": "bucket_name",
         "bucket_region": "bucket_region",
@@ -48,6 +56,7 @@ def __init__(
         bucket_name: str,
         report_name: str,
         report_prefix: str,
+        account_filters: Union[AccountFilteringConfig, UnsetType] = unset,
         bucket_region: Union[str, UnsetType] = unset,
         is_enabled: Union[bool, UnsetType] = unset,
         months: Union[int, UnsetType] = unset,
@@ -56,6 +65,9 @@ def __init__(
         """
         Attributes for AWS CUR config Post Request.
 
+        :param account_filters: The account filtering configuration.
+        :type account_filters: AccountFilteringConfig, optional
+
         :param account_id: The AWS account ID.
         :type account_id: str
 
@@ -77,6 +89,8 @@ def __init__(
         :param report_prefix: The report prefix used for the Cost and Usage Report.
         :type report_prefix: str
         """
+        if account_filters is not unset:
+            kwargs["account_filters"] = account_filters
         if bucket_region is not unset:
             kwargs["bucket_region"] = bucket_region
         if is_enabled is not unset:

src/datadog_api_client/v2/models/__init__.py

@@ -62,6 +62,7 @@
 from datadog_api_client.v2.model.aws_regions_include_only import AWSRegionsIncludeOnly
 from datadog_api_client.v2.model.aws_resources_config import AWSResourcesConfig
 from datadog_api_client.v2.model.aws_traces_config import AWSTracesConfig
+from datadog_api_client.v2.model.account_filtering_config import AccountFilteringConfig
 from datadog_api_client.v2.model.action_connection_attributes import ActionConnectionAttributes
 from datadog_api_client.v2.model.action_connection_attributes_update import ActionConnectionAttributesUpdate
 from datadog_api_client.v2.model.action_connection_data import ActionConnectionData
@@ -2539,6 +2540,7 @@
     "AWSRegionsIncludeOnly",
     "AWSResourcesConfig",
     "AWSTracesConfig",
+    "AccountFilteringConfig",
     "ActionConnectionAttributes",
     "ActionConnectionAttributesUpdate",
     "ActionConnectionData",

tests/v2/features/cloud_cost_management.feature

@@ -16,7 +16,7 @@ Feature: Cloud Cost Management
   @generated @skip @team:Datadog/cloud-cost-management
   Scenario: Create Cloud Cost Management AWS CUR config returns "Bad Request" response
     Given new "CreateCostAWSCURConfig" request
-    And body with value {"data": {"attributes": {"account_id": "123456789123", "bucket_name": "dd-cost-bucket", "bucket_region": "us-east-1", "report_name": "dd-report-name", "report_prefix": "dd-report-prefix"}, "type": "aws_cur_config_post_request"}}
+    And body with value {"data": {"attributes": {"account_filters": {"excluded_accounts": ["123456789123", "123456789143"], "include_new_accounts": true, "included_accounts": ["123456789123", "123456789143"]}, "account_id": "123456789123", "bucket_name": "dd-cost-bucket", "bucket_region": "us-east-1", "report_name": "dd-report-name", "report_prefix": "dd-report-prefix"}, "type": "aws_cur_config_post_request"}}
     When the request is sent
     Then the response status is 400 Bad Request