add changes for datadog partner program to estimated cost and billable usage APIs (#1670)

Co-authored-by: ci.datadog-api-spec <[email protected]>
Co-authored-by: api-clients-generation-pipeline[bot] <54105614+api-clients-generation-pipeline[bot]@users.noreply.github.com>

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

.apigentools-info

@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2024-07-11 16:35:13.616074",
-            "spec_repo_commit": "d83fe206"
+            "regenerated": "2024-07-16 10:52:44.851668",
+            "spec_repo_commit": "06d5775d"
         },
         "v2": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2024-07-11 16:35:13.635786",
-            "spec_repo_commit": "d83fe206"
+            "regenerated": "2024-07-16 10:52:44.869580",
+            "spec_repo_commit": "06d5775d"
         }
     }
 }

.generator/schemas/v1/openapi.yaml

@@ -17269,6 +17269,12 @@ components:
     UsageBillableSummaryHour:
       description: Response with monthly summary of data billed by Datadog.
       properties:
+        account_name:
+          description: The account name.
+          type: string
+        account_public_id:
+          description: The account public ID.
+          type: string
         billing_plan:
           description: The billing plan.
           type: string
@@ -31646,6 +31652,15 @@ paths:
         schema:
           format: date-time
           type: string
+      - description: 'Boolean to specify whether to include accounts connected to
+          the current account as partner customers in the Datadog partner network
+          program. Defaults to `false`. '
+        in: query
+        name: include_connected_accounts
+        required: false
+        schema:
+          default: false
+          type: boolean
       responses:
         '200':
           content:

.generator/schemas/v2/openapi.yaml

@@ -5390,6 +5390,12 @@ components:
     CostByOrgAttributes:
       description: Cost attributes data.
       properties:
+        account_name:
+          description: The account name.
+          type: string
+        account_public_id:
+          description: The account public ID.
+          type: string
         charges:
           description: List of charges data reported for the requested month.
           items:
@@ -36185,6 +36191,15 @@ paths:
         schema:
           format: date-time
           type: string
+      - description: 'Boolean to specify whether to include accounts connected to
+          the current account as partner customers in the Datadog partner network
+          program. Defaults to `false`. '
+        in: query
+        name: include_connected_accounts
+        required: false
+        schema:
+          default: false
+          type: boolean
       responses:
         '200':
           content:

features/support/scenarios_model_mapping.ts

@@ -169,6 +169,10 @@ export const ScenariosModelMappings: {[key: string]: {[key: string]: any}} = {
             "type": "Date",
             "format": "date-time",
             },
+        "includeConnectedAccounts": {
+            "type": "boolean",
+            "format": "",
+            },
         "operationResponseType": "UsageBillableSummaryResponse",
     },
     "v1.GetUsageCIApp": {
@@ -3090,6 +3094,10 @@ export const ScenariosModelMappings: {[key: string]: {[key: string]: any}} = {
             "type": "Date",
             "format": "date-time",
             },
+        "includeConnectedAccounts": {
+            "type": "boolean",
+            "format": "",
+            },
         "operationResponseType": "CostByOrgResponse",
     },
     "v2.GetHistoricalCostByOrg": {

packages/datadog-api-client-v1/apis/UsageMeteringApi.ts

@@ -632,6 +632,7 @@ export class UsageMeteringApiRequestFactory extends BaseAPIRequestFactory {
 
   public async getUsageBillableSummary(
     month?: Date,
+    includeConnectedAccounts?: boolean,
     _options?: Configuration
   ): Promise<RequestContext> {
     const _config = _options || this.configuration;
@@ -656,6 +657,12 @@ export class UsageMeteringApiRequestFactory extends BaseAPIRequestFactory {
         ObjectSerializer.serialize(month, "Date", "date-time")
       );
     }
+    if (includeConnectedAccounts !== undefined) {
+      requestContext.setQueryParam(
+        "include_connected_accounts",
+        ObjectSerializer.serialize(includeConnectedAccounts, "boolean", "")
+      );
+    }
 
     // Apply auth methods
     applySecurityAuthentication(_config, requestContext, [
@@ -4479,6 +4486,11 @@ export interface UsageMeteringApiGetUsageBillableSummaryRequest {
    * @type Date
    */
   month?: Date;
+  /**
+   * Boolean to specify whether to include accounts connected to the current account as partner customers in the Datadog partner network program. Defaults to `false`.
+   * @type boolean
+   */
+  includeConnectedAccounts?: boolean;
 }
 
 export interface UsageMeteringApiGetUsageCIAppRequest {
@@ -5175,6 +5187,7 @@ export class UsageMeteringApi {
   ): Promise<UsageBillableSummaryResponse> {
     const requestContextPromise = this.requestFactory.getUsageBillableSummary(
       param.month,
+      param.includeConnectedAccounts,
       options
     );
     return requestContextPromise.then((requestContext) => {

packages/datadog-api-client-v1/models/UsageBillableSummaryHour.ts

@@ -11,6 +11,14 @@ import { AttributeTypeMap } from "../../datadog-api-client-common/util";
  * Response with monthly summary of data billed by Datadog.
  */
 export class UsageBillableSummaryHour {
+  /**
+   * The account name.
+   */
+  "accountName"?: string;
+  /**
+   * The account public ID.
+   */
+  "accountPublicId"?: string;
   /**
    * The billing plan.
    */
@@ -64,6 +72,14 @@ export class UsageBillableSummaryHour {
    * @ignore
    */
   static readonly attributeTypeMap: AttributeTypeMap = {
+    accountName: {
+      baseName: "account_name",
+      type: "string",
+    },
+    accountPublicId: {
+      baseName: "account_public_id",
+      type: "string",
+    },
     billingPlan: {
       baseName: "billing_plan",
       type: "string",

packages/datadog-api-client-v2/apis/UsageMeteringApi.ts

@@ -118,6 +118,7 @@ export class UsageMeteringApiRequestFactory extends BaseAPIRequestFactory {
     endMonth?: Date,
     startDate?: Date,
     endDate?: Date,
+    includeConnectedAccounts?: boolean,
     _options?: Configuration
   ): Promise<RequestContext> {
     const _config = _options || this.configuration;
@@ -166,6 +167,12 @@ export class UsageMeteringApiRequestFactory extends BaseAPIRequestFactory {
         ObjectSerializer.serialize(endDate, "Date", "date-time")
       );
     }
+    if (includeConnectedAccounts !== undefined) {
+      requestContext.setQueryParam(
+        "include_connected_accounts",
+        ObjectSerializer.serialize(includeConnectedAccounts, "boolean", "")
+      );
+    }
 
     // Apply auth methods
     applySecurityAuthentication(_config, requestContext, [
@@ -1294,6 +1301,11 @@ export interface UsageMeteringApiGetEstimatedCostByOrgRequest {
    * @type Date
    */
   endDate?: Date;
+  /**
+   * Boolean to specify whether to include accounts connected to the current account as partner customers in the Datadog partner network program. Defaults to `false`.
+   * @type boolean
+   */
+  includeConnectedAccounts?: boolean;
 }
 
 export interface UsageMeteringApiGetHistoricalCostByOrgRequest {
@@ -1548,6 +1560,7 @@ export class UsageMeteringApi {
       param.endMonth,
       param.startDate,
       param.endDate,
+      param.includeConnectedAccounts,
       options
     );
     return requestContextPromise.then((requestContext) => {

packages/datadog-api-client-v2/models/CostByOrgAttributes.ts

@@ -11,6 +11,14 @@ import { AttributeTypeMap } from "../../datadog-api-client-common/util";
  * Cost attributes data.
  */
 export class CostByOrgAttributes {
+  /**
+   * The account name.
+   */
+  "accountName"?: string;
+  /**
+   * The account public ID.
+   */
+  "accountPublicId"?: string;
   /**
    * List of charges data reported for the requested month.
    */
@@ -52,6 +60,14 @@ export class CostByOrgAttributes {
    * @ignore
    */
   static readonly attributeTypeMap: AttributeTypeMap = {
+    accountName: {
+      baseName: "account_name",
+      type: "string",
+    },
+    accountPublicId: {
+      baseName: "account_public_id",
+      type: "string",
+    },
     charges: {
       baseName: "charges",
       type: "Array<ChargebackBreakdown>",