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

api-clients-generation-pipeline[bot] · ci.datadog-api-spec · web-flow · commit ef6c9547a395 · 2024-07-16T12:39:53.000Z
Co-authored-by: ci.datadog-api-spec &lt;packages@datadoghq.com&gt;
diff --git a/.apigentools-info b/.apigentools-info
@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2024-07-11 16:35:09.396752",
-            "spec_repo_commit": "d83fe206"
+            "regenerated": "2024-07-16 10:52:41.488047",
+            "spec_repo_commit": "06d5775d"
         },
         "v2": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2024-07-11 16:35:09.414475",
-            "spec_repo_commit": "d83fe206"
+            "regenerated": "2024-07-16 10:52:41.505656",
+            "spec_repo_commit": "06d5775d"
         }
     }
 }
diff --git a/.generator/schemas/v1/openapi.yaml b/.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:
diff --git a/.generator/schemas/v2/openapi.yaml b/.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:
diff --git a/src/datadogV1/api/api_usage_metering.rs b/src/datadogV1/api/api_usage_metering.rs
@@ -258,6 +258,8 @@ impl GetUsageAuditLogsOptionalParams {
 pub struct GetUsageBillableSummaryOptionalParams {
     /// Datetime in ISO-8601 format, UTC, precise to month: `[YYYY-MM]` for usage starting this month.
     pub month: Option<chrono::DateTime<chrono::Utc>>,
+    /// Boolean to specify whether to include accounts connected to the current account as partner customers in the Datadog partner network program. Defaults to `false`.
+    pub include_connected_accounts: Option<bool>,
 }
 
 impl GetUsageBillableSummaryOptionalParams {
@@ -266,6 +268,11 @@ impl GetUsageBillableSummaryOptionalParams {
         self.month = Some(value);
         self
     }
+    /// Boolean to specify whether to include accounts connected to the current account as partner customers in the Datadog partner network program. Defaults to `false`.
+    pub fn include_connected_accounts(mut self, value: bool) -> Self {
+        self.include_connected_accounts = Some(value);
+        self
+    }
 }
 
 /// GetUsageCIAppOptionalParams is a struct for passing parameters to the method [`UsageMeteringAPI::get_usage_ci_app`]
@@ -2568,6 +2575,7 @@ impl UsageMeteringAPI {
 
         // unbox and build optional parameters
         let month = params.month;
+        let include_connected_accounts = params.include_connected_accounts;
 
         let local_client = &self.client;
 
@@ -2584,6 +2592,10 @@ impl UsageMeteringAPI {
                 &local_query_param.to_rfc3339_opts(chrono::SecondsFormat::Millis, true),
             )]);
         };
+        if let Some(ref local_query_param) = include_connected_accounts {
+            local_req_builder = local_req_builder
+                .query(&[("include_connected_accounts", &local_query_param.to_string())]);
+        };
 
         // build headers
         let mut headers = HeaderMap::new();
diff --git a/src/datadogV1/model/model_usage_billable_summary_hour.rs b/src/datadogV1/model/model_usage_billable_summary_hour.rs
@@ -11,6 +11,12 @@ use std::fmt::{self, Formatter};
 #[skip_serializing_none]
 #[derive(Clone, Debug, PartialEq, Serialize)]
 pub struct UsageBillableSummaryHour {
+    /// The account name.
+    #[serde(rename = "account_name")]
+    pub account_name: Option<String>,
+    /// The account public ID.
+    #[serde(rename = "account_public_id")]
+    pub account_public_id: Option<String>,
     /// The billing plan.
     #[serde(rename = "billing_plan")]
     pub billing_plan: Option<String>,
@@ -46,6 +52,8 @@ pub struct UsageBillableSummaryHour {
 impl UsageBillableSummaryHour {
     pub fn new() -> UsageBillableSummaryHour {
         UsageBillableSummaryHour {
+            account_name: None,
+            account_public_id: None,
             billing_plan: None,
             end_date: None,
             num_orgs: None,
@@ -59,6 +67,16 @@ impl UsageBillableSummaryHour {
         }
     }
 
+    pub fn account_name(mut self, value: String) -> Self {
+        self.account_name = Some(value);
+        self
+    }
+
+    pub fn account_public_id(mut self, value: String) -> Self {
+        self.account_public_id = Some(value);
+        self
+    }
+
     pub fn billing_plan(mut self, value: String) -> Self {
         self.billing_plan = Some(value);
         self
@@ -128,6 +146,8 @@ impl<'de> Deserialize<'de> for UsageBillableSummaryHour {
             where
                 M: MapAccess<'a>,
             {
+                let mut account_name: Option<String> = None;
+                let mut account_public_id: Option<String> = None;
                 let mut billing_plan: Option<String> = None;
                 let mut end_date: Option<chrono::DateTime<chrono::Utc>> = None;
                 let mut num_orgs: Option<i64> = None;
@@ -141,6 +161,20 @@ impl<'de> Deserialize<'de> for UsageBillableSummaryHour {
 
                 while let Some((k, v)) = map.next_entry::<String, serde_json::Value>()? {
                     match k.as_str() {
+                        "account_name" => {
+                            if v.is_null() {
+                                continue;
+                            }
+                            account_name =
+                                Some(serde_json::from_value(v).map_err(M::Error::custom)?);
+                        }
+                        "account_public_id" => {
+                            if v.is_null() {
+                                continue;
+                            }
+                            account_public_id =
+                                Some(serde_json::from_value(v).map_err(M::Error::custom)?);
+                        }
                         "billing_plan" => {
                             if v.is_null() {
                                 continue;
@@ -202,6 +236,8 @@ impl<'de> Deserialize<'de> for UsageBillableSummaryHour {
                 }
 
                 let content = UsageBillableSummaryHour {
+                    account_name,
+                    account_public_id,
                     billing_plan,
                     end_date,
                     num_orgs,
diff --git a/src/datadogV2/api/api_usage_metering.rs b/src/datadogV2/api/api_usage_metering.rs
@@ -36,6 +36,8 @@ pub struct GetEstimatedCostByOrgOptionalParams {
     pub start_date: Option<chrono::DateTime<chrono::Utc>>,
     /// Datetime in ISO-8601 format, UTC, precise to day: `[YYYY-MM-DD]` for cost ending this day.
     pub end_date: Option<chrono::DateTime<chrono::Utc>>,
+    /// Boolean to specify whether to include accounts connected to the current account as partner customers in the Datadog partner network program. Defaults to `false`.
+    pub include_connected_accounts: Option<bool>,
 }
 
 impl GetEstimatedCostByOrgOptionalParams {
@@ -64,6 +66,11 @@ impl GetEstimatedCostByOrgOptionalParams {
         self.end_date = Some(value);
         self
     }
+    /// Boolean to specify whether to include accounts connected to the current account as partner customers in the Datadog partner network program. Defaults to `false`.
+    pub fn include_connected_accounts(mut self, value: bool) -> Self {
+        self.include_connected_accounts = Some(value);
+        self
+    }
 }
 
 /// GetHistoricalCostByOrgOptionalParams is a struct for passing parameters to the method [`UsageMeteringAPI::get_historical_cost_by_org`]
@@ -717,6 +724,7 @@ impl UsageMeteringAPI {
         let end_month = params.end_month;
         let start_date = params.start_date;
         let end_date = params.end_date;
+        let include_connected_accounts = params.include_connected_accounts;
 
         let local_client = &self.client;
 
@@ -755,6 +763,10 @@ impl UsageMeteringAPI {
                 &local_query_param.to_rfc3339_opts(chrono::SecondsFormat::Millis, true),
             )]);
         };
+        if let Some(ref local_query_param) = include_connected_accounts {
+            local_req_builder = local_req_builder
+                .query(&[("include_connected_accounts", &local_query_param.to_string())]);
+        };
 
         // build headers
         let mut headers = HeaderMap::new();
diff --git a/src/datadogV2/model/model_cost_by_org_attributes.rs b/src/datadogV2/model/model_cost_by_org_attributes.rs
@@ -11,6 +11,12 @@ use std::fmt::{self, Formatter};
 #[skip_serializing_none]
 #[derive(Clone, Debug, PartialEq, Serialize)]
 pub struct CostByOrgAttributes {
+    /// The account name.
+    #[serde(rename = "account_name")]
+    pub account_name: Option<String>,
+    /// The account public ID.
+    #[serde(rename = "account_public_id")]
+    pub account_public_id: Option<String>,
     /// List of charges data reported for the requested month.
     #[serde(rename = "charges")]
     pub charges: Option<Vec<crate::datadogV2::model::ChargebackBreakdown>>,
@@ -37,6 +43,8 @@ pub struct CostByOrgAttributes {
 impl CostByOrgAttributes {
     pub fn new() -> CostByOrgAttributes {
         CostByOrgAttributes {
+            account_name: None,
+            account_public_id: None,
             charges: None,
             date: None,
             org_name: None,
@@ -47,6 +55,16 @@ impl CostByOrgAttributes {
         }
     }
 
+    pub fn account_name(mut self, value: String) -> Self {
+        self.account_name = Some(value);
+        self
+    }
+
+    pub fn account_public_id(mut self, value: String) -> Self {
+        self.account_public_id = Some(value);
+        self
+    }
+
     pub fn charges(mut self, value: Vec<crate::datadogV2::model::ChargebackBreakdown>) -> Self {
         self.charges = Some(value);
         self
@@ -101,6 +119,8 @@ impl<'de> Deserialize<'de> for CostByOrgAttributes {
             where
                 M: MapAccess<'a>,
             {
+                let mut account_name: Option<String> = None;
+                let mut account_public_id: Option<String> = None;
                 let mut charges: Option<Vec<crate::datadogV2::model::ChargebackBreakdown>> = None;
                 let mut date: Option<chrono::DateTime<chrono::Utc>> = None;
                 let mut org_name: Option<String> = None;
@@ -111,6 +131,20 @@ impl<'de> Deserialize<'de> for CostByOrgAttributes {
 
                 while let Some((k, v)) = map.next_entry::<String, serde_json::Value>()? {
                     match k.as_str() {
+                        "account_name" => {
+                            if v.is_null() {
+                                continue;
+                            }
+                            account_name =
+                                Some(serde_json::from_value(v).map_err(M::Error::custom)?);
+                        }
+                        "account_public_id" => {
+                            if v.is_null() {
+                                continue;
+                            }
+                            account_public_id =
+                                Some(serde_json::from_value(v).map_err(M::Error::custom)?);
+                        }
                         "charges" => {
                             if v.is_null() {
                                 continue;
@@ -152,6 +186,8 @@ impl<'de> Deserialize<'de> for CostByOrgAttributes {
                 }
 
                 let content = CostByOrgAttributes {
+                    account_name,
+                    account_public_id,
                     charges,
                     date,
                     org_name,
diff --git a/tests/scenarios/function_mappings.rs b/tests/scenarios/function_mappings.rs
@@ -3408,9 +3408,13 @@ fn test_v1_get_usage_billable_summary(
     let month = _parameters
         .get("month")
         .and_then(|param| Some(serde_json::from_value(param.clone()).unwrap()));
+    let include_connected_accounts = _parameters
+        .get("include_connected_accounts")
+        .and_then(|param| Some(serde_json::from_value(param.clone()).unwrap()));
     let mut params =
         datadogV1::api_usage_metering::GetUsageBillableSummaryOptionalParams::default();
     params.month = month;
+    params.include_connected_accounts = include_connected_accounts;
     let response = match block_on(api.get_usage_billable_summary_with_http_info(params)) {
         Ok(response) => response,
         Err(error) => {
@@ -12738,12 +12742,16 @@ fn test_v2_get_estimated_cost_by_org(
     let end_date = _parameters
         .get("end_date")
         .and_then(|param| Some(serde_json::from_value(param.clone()).unwrap()));
+    let include_connected_accounts = _parameters
+        .get("include_connected_accounts")
+        .and_then(|param| Some(serde_json::from_value(param.clone()).unwrap()));
     let mut params = datadogV2::api_usage_metering::GetEstimatedCostByOrgOptionalParams::default();
     params.view = view;
     params.start_month = start_month;
     params.end_month = end_month;
     params.start_date = start_date;
     params.end_date = end_date;
+    params.include_connected_accounts = include_connected_accounts;
     let response = match block_on(api.get_estimated_cost_by_org_with_http_info(params)) {
         Ok(response) => response,
         Err(error) => {

Original file line number	Diff line number	Diff line change
`@@ -4,13 +4,13 @@`
`4`	`4`	`"spec_versions": {`
`5`	`5`	`"v1": {`
`6`	`6`	`"apigentools_version": "1.6.6",`
`7`		`- "regenerated": "2024-07-11 16:35:09.396752",`
`8`		`- "spec_repo_commit": "d83fe206"`
	`7`	`+ "regenerated": "2024-07-16 10:52:41.488047",`
	`8`	`+ "spec_repo_commit": "06d5775d"`
`9`	`9`	`},`
`10`	`10`	`"v2": {`
`11`	`11`	`"apigentools_version": "1.6.6",`
`12`		`- "regenerated": "2024-07-11 16:35:09.414475",`
`13`		`- "spec_repo_commit": "d83fe206"`
	`12`	`+ "regenerated": "2024-07-16 10:52:41.505656",`
	`13`	`+ "spec_repo_commit": "06d5775d"`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`	`}`