Merge branch 'master' into datadog-api-spec/generated/3594

cpatel24 · web-flow · commit f801b417a1e1 · 2025-02-20T20:24:02.000-05:00
diff --git a/.generator/schemas/v2/openapi.yaml b/.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'
@@ -35642,7 +35673,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'
diff --git a/features/v2/cloud_cost_management.feature b/features/v2/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
 
diff --git a/packages/datadog-api-client-v2/apis/CloudCostManagementApi.ts b/packages/datadog-api-client-v2/apis/CloudCostManagementApi.ts
@@ -1458,7 +1458,7 @@ export class CloudCostManagementApi {
   }
 
   /**
-   * 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 param The request object
    */
   public updateCostAWSCURConfig(
diff --git a/packages/datadog-api-client-v2/index.ts b/packages/datadog-api-client-v2/index.ts
@@ -639,6 +639,7 @@ export {
   WorkflowAutomationApi,
 } from "./apis/WorkflowAutomationApi";
 
+export { AccountFilteringConfig } from "./models/AccountFilteringConfig";
 export { ActionConnectionAttributes } from "./models/ActionConnectionAttributes";
 export { ActionConnectionAttributesUpdate } from "./models/ActionConnectionAttributesUpdate";
 export { ActionConnectionData } from "./models/ActionConnectionData";
diff --git a/packages/datadog-api-client-v2/models/AccountFilteringConfig.ts b/packages/datadog-api-client-v2/models/AccountFilteringConfig.ts
@@ -0,0 +1,68 @@
+/**
+ * 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 2020-Present Datadog, Inc.
+ */
+
+import { AttributeTypeMap } from "../../datadog-api-client-common/util";
+
+/**
+ * The account filtering configuration.
+ */
+export class AccountFilteringConfig {
+  /**
+   * The AWS account IDs to be excluded from your billing dataset. This field is used when `include_new_accounts` is `true`.
+   */
+  "excludedAccounts"?: Array<string>;
+  /**
+   * Whether or not to automatically include new member accounts by default in your billing dataset.
+   */
+  "includeNewAccounts"?: boolean;
+  /**
+   * The AWS account IDs to be included in your billing dataset. This field is used when `include_new_accounts` is `false`.
+   */
+  "includedAccounts"?: Array<string>;
+
+  /**
+   * A container for additional, undeclared properties.
+   * This is a holder for any undeclared properties as specified with
+   * the 'additionalProperties' keyword in the OAS document.
+   */
+  "additionalProperties"?: { [key: string]: any };
+
+  /**
+   * @ignore
+   */
+  "_unparsed"?: boolean;
+
+  /**
+   * @ignore
+   */
+  static readonly attributeTypeMap: AttributeTypeMap = {
+    excludedAccounts: {
+      baseName: "excluded_accounts",
+      type: "Array<string>",
+    },
+    includeNewAccounts: {
+      baseName: "include_new_accounts",
+      type: "boolean",
+    },
+    includedAccounts: {
+      baseName: "included_accounts",
+      type: "Array<string>",
+    },
+    additionalProperties: {
+      baseName: "additionalProperties",
+      type: "any",
+    },
+  };
+
+  /**
+   * @ignore
+   */
+  static getAttributeTypeMap(): AttributeTypeMap {
+    return AccountFilteringConfig.attributeTypeMap;
+  }
+
+  public constructor() {}
+}
diff --git a/packages/datadog-api-client-v2/models/AwsCURConfigAttributes.ts b/packages/datadog-api-client-v2/models/AwsCURConfigAttributes.ts
@@ -3,13 +3,18 @@
  * This product includes software developed at Datadog (https://www.datadoghq.com/).
  * Copyright 2020-Present Datadog, Inc.
  */
+import { AccountFilteringConfig } from "./AccountFilteringConfig";
 
 import { AttributeTypeMap } from "../../datadog-api-client-common/util";
 
 /**
  * Attributes for An AWS CUR config.
  */
 export class AwsCURConfigAttributes {
+  /**
+   * The account filtering configuration.
+   */
+  "accountFilters"?: AccountFilteringConfig;
   /**
    * The AWS account ID.
    */
@@ -71,6 +76,10 @@ export class AwsCURConfigAttributes {
    * @ignore
    */
   static readonly attributeTypeMap: AttributeTypeMap = {
+    accountFilters: {
+      baseName: "account_filters",
+      type: "AccountFilteringConfig",
+    },
     accountId: {
       baseName: "account_id",
       type: "string",
diff --git a/packages/datadog-api-client-v2/models/AwsCURConfigPatchRequestAttributes.ts b/packages/datadog-api-client-v2/models/AwsCURConfigPatchRequestAttributes.ts
@@ -3,17 +3,22 @@
  * This product includes software developed at Datadog (https://www.datadoghq.com/).
  * Copyright 2020-Present Datadog, Inc.
  */
+import { AccountFilteringConfig } from "./AccountFilteringConfig";
 
 import { AttributeTypeMap } from "../../datadog-api-client-common/util";
 
 /**
  * Attributes for AWS CUR config Patch Request.
  */
 export class AwsCURConfigPatchRequestAttributes {
+  /**
+   * The account filtering configuration.
+   */
+  "accountFilters"?: AccountFilteringConfig;
   /**
    * Whether or not the Cloud Cost Management account is enabled.
    */
-  "isEnabled": boolean;
+  "isEnabled"?: boolean;
 
   /**
    * A container for additional, undeclared properties.
@@ -31,10 +36,13 @@ export class AwsCURConfigPatchRequestAttributes {
    * @ignore
    */
   static readonly attributeTypeMap: AttributeTypeMap = {
+    accountFilters: {
+      baseName: "account_filters",
+      type: "AccountFilteringConfig",
+    },
     isEnabled: {
       baseName: "is_enabled",
       type: "boolean",
-      required: true,
     },
     additionalProperties: {
       baseName: "additionalProperties",
diff --git a/packages/datadog-api-client-v2/models/AwsCURConfigPostRequestAttributes.ts b/packages/datadog-api-client-v2/models/AwsCURConfigPostRequestAttributes.ts
@@ -3,13 +3,18 @@
  * This product includes software developed at Datadog (https://www.datadoghq.com/).
  * Copyright 2020-Present Datadog, Inc.
  */
+import { AccountFilteringConfig } from "./AccountFilteringConfig";
 
 import { AttributeTypeMap } from "../../datadog-api-client-common/util";
 
 /**
  * Attributes for AWS CUR config Post Request.
  */
 export class AwsCURConfigPostRequestAttributes {
+  /**
+   * The account filtering configuration.
+   */
+  "accountFilters"?: AccountFilteringConfig;
   /**
    * The AWS account ID.
    */
@@ -55,6 +60,10 @@ export class AwsCURConfigPostRequestAttributes {
    * @ignore
    */
   static readonly attributeTypeMap: AttributeTypeMap = {
+    accountFilters: {
+      baseName: "account_filters",
+      type: "AccountFilteringConfig",
+    },
     accountId: {
       baseName: "account_id",
       type: "string",
diff --git a/packages/datadog-api-client-v2/models/ObjectSerializer.ts b/packages/datadog-api-client-v2/models/ObjectSerializer.ts
@@ -47,6 +47,7 @@ import { AWSRegionsIncludeAll } from "./AWSRegionsIncludeAll";
 import { AWSRegionsIncludeOnly } from "./AWSRegionsIncludeOnly";
 import { AWSResourcesConfig } from "./AWSResourcesConfig";
 import { AWSTracesConfig } from "./AWSTracesConfig";
+import { AccountFilteringConfig } from "./AccountFilteringConfig";
 import { ActionConnectionAttributes } from "./ActionConnectionAttributes";
 import { ActionConnectionAttributesUpdate } from "./ActionConnectionAttributesUpdate";
 import { ActionConnectionData } from "./ActionConnectionData";
@@ -2522,6 +2523,7 @@ const typeMap: { [index: string]: any } = {
   AWSRegionsIncludeOnly: AWSRegionsIncludeOnly,
   AWSResourcesConfig: AWSResourcesConfig,
   AWSTracesConfig: AWSTracesConfig,
+  AccountFilteringConfig: AccountFilteringConfig,
   ActionConnectionAttributes: ActionConnectionAttributes,
   ActionConnectionAttributesUpdate: ActionConnectionAttributesUpdate,
   ActionConnectionData: ActionConnectionData,

Original file line number	Diff line number	Diff line change
`@@ -1458,7 +1458,7 @@ export class CloudCostManagementApi {`
`1458`	`1458`	`}`
`1459`	`1459`
`1460`	`1460`	`/**`
`1461`		`- * Update the status of an AWS CUR config (active/archived).`
	`1461`	`+ * Update the status (active/archived) and/or account filtering configuration of an AWS CUR config.`
`1462`	`1462`	`* @param param The request object`
`1463`	`1463`	`*/`
`1464`	`1464`	`public updateCostAWSCURConfig(`