Skip to content

Commit 539aaff

Browse files
api-clients-generation-pipeline[bot]ci.datadog-api-spec
api-clients-generation-pipeline[bot]
and
ci.datadog-api-spec
authored
Revert - Update specs for AWS account updates and creation for CCM configs (#1136)
Co-authored-by: ci.datadog-api-spec <packages@datadoghq.com>
1 parent 990d73a commit 539aaff

23 files changed

+42
-460
lines changed

‎.generator/schemas/v2/openapi.yaml‎

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1485,8 +1485,6 @@ components:
14851485
$ref: '#/components/schemas/AWSAccountPartition'
14861486
aws_regions:
14871487
$ref: '#/components/schemas/AWSRegions'
1488-
ccm_config:
1489-
$ref: '#/components/schemas/AWSCCMConfig'
14901488
logs_config:
14911489
$ref: '#/components/schemas/AWSLogsConfig'
14921490
metrics_config:
@@ -1552,8 +1550,6 @@ components:
15521550
$ref: '#/components/schemas/AWSAccountPartition'
15531551
aws_regions:
15541552
$ref: '#/components/schemas/AWSRegions'
1555-
ccm_config:
1556-
$ref: '#/components/schemas/AWSCCMConfig'
15571553
created_at:
15581554
description: Timestamp of when the account integration was created.
15591555
format: date-time
@@ -1627,8 +1623,6 @@ components:
16271623
$ref: '#/components/schemas/AWSAccountPartition'
16281624
aws_regions:
16291625
$ref: '#/components/schemas/AWSRegions'
1630-
ccm_config:
1631-
$ref: '#/components/schemas/AWSCCMConfig'
16321626
logs_config:
16331627
$ref: '#/components/schemas/AWSLogsConfig'
16341628
metrics_config:
@@ -1760,15 +1754,6 @@ components:
17601754
required:
17611755
- role_name
17621756
type: object
1763-
AWSCCMConfig:
1764-
description: AWS Cloud Cost Management config.
1765-
properties:
1766-
data_export_configs:
1767-
description: List of data export configurations for Cost and Usage Reports.
1768-
items:
1769-
$ref: '#/components/schemas/DataExportConfig'
1770-
type: array
1771-
type: object
17721757
AWSCredentials:
17731758
description: The definition of `AWSCredentials` object.
17741759
oneOf:
@@ -16814,30 +16799,6 @@ components:
1681416799
example: canceled
1681516800
type: string
1681616801
type: object
16817-
DataExportConfig:
16818-
description: AWS Cost and Usage Report data export configuration.
16819-
properties:
16820-
bucket_name:
16821-
description: Name of the S3 bucket where the Cost and Usage Report is stored.
16822-
example: billing
16823-
type: string
16824-
bucket_region:
16825-
description: AWS region of the S3 bucket.
16826-
example: us-east-1
16827-
type: string
16828-
report_name:
16829-
description: Name of the Cost and Usage Report.
16830-
example: cost-and-usage-report
16831-
type: string
16832-
report_prefix:
16833-
description: S3 prefix where the Cost and Usage Report is stored.
16834-
example: reports
16835-
type: string
16836-
report_type:
16837-
description: Type of the Cost and Usage Report.
16838-
example: CUR2.0
16839-
type: string
16840-
type: object
1684116802
DataRelationshipsTeams:
1684216803
description: Associates teams with this schedule in a data structure.
1684316804
properties:

‎examples/v2_aws-integration_CreateAWSAccount.rs‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ use datadog_api_client::datadogV2::model::AWSAccountPartition;
88
use datadog_api_client::datadogV2::model::AWSAccountType;
99
use datadog_api_client::datadogV2::model::AWSAuthConfig;
1010
use datadog_api_client::datadogV2::model::AWSAuthConfigKeys;
11-
use datadog_api_client::datadogV2::model::AWSCCMConfig;
1211
use datadog_api_client::datadogV2::model::AWSLambdaForwarderConfig;
1312
use datadog_api_client::datadogV2::model::AWSLambdaForwarderConfigLogSourceConfig;
1413
use datadog_api_client::datadogV2::model::AWSLogSourceTagFilter;
@@ -17,7 +16,6 @@ use datadog_api_client::datadogV2::model::AWSMetricsConfig;
1716
use datadog_api_client::datadogV2::model::AWSNamespaceTagFilter;
1817
use datadog_api_client::datadogV2::model::AWSResourcesConfig;
1918
use datadog_api_client::datadogV2::model::AWSTracesConfig;
20-
use datadog_api_client::datadogV2::model::DataExportConfig;
2119

2220
#[tokio::main]
2321
async fn main() {
@@ -31,14 +29,6 @@ async fn main() {
3129
AWSAccountPartition::AWS,
3230
)
3331
.account_tags(Some(vec!["key:value".to_string()]))
34-
.ccm_config(AWSCCMConfig::new().data_export_configs(vec![
35-
DataExportConfig::new()
36-
.bucket_name("my-bucket".to_string())
37-
.bucket_region("us-east-1".to_string())
38-
.report_name("my-report".to_string())
39-
.report_prefix("reports".to_string())
40-
.report_type("CUR2.0".to_string())
41-
]))
4232
.logs_config(
4333
AWSLogsConfig::new().lambda_forwarder(
4434
AWSLambdaForwarderConfig::new()

‎examples/v2_aws-integration_CreateAWSAccount_1716720881.rs‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ use datadog_api_client::datadogV2::model::AWSAccountPartition;
88
use datadog_api_client::datadogV2::model::AWSAccountType;
99
use datadog_api_client::datadogV2::model::AWSAuthConfig;
1010
use datadog_api_client::datadogV2::model::AWSAuthConfigRole;
11-
use datadog_api_client::datadogV2::model::AWSCCMConfig;
1211
use datadog_api_client::datadogV2::model::AWSLambdaForwarderConfig;
1312
use datadog_api_client::datadogV2::model::AWSLambdaForwarderConfigLogSourceConfig;
1413
use datadog_api_client::datadogV2::model::AWSLogSourceTagFilter;
@@ -17,7 +16,6 @@ use datadog_api_client::datadogV2::model::AWSMetricsConfig;
1716
use datadog_api_client::datadogV2::model::AWSNamespaceTagFilter;
1817
use datadog_api_client::datadogV2::model::AWSResourcesConfig;
1918
use datadog_api_client::datadogV2::model::AWSTracesConfig;
20-
use datadog_api_client::datadogV2::model::DataExportConfig;
2119

2220
#[tokio::main]
2321
async fn main() {
@@ -30,14 +28,6 @@ async fn main() {
3028
AWSAccountPartition::AWS,
3129
)
3230
.account_tags(Some(vec!["key:value".to_string()]))
33-
.ccm_config(AWSCCMConfig::new().data_export_configs(vec![
34-
DataExportConfig::new()
35-
.bucket_name("my-bucket".to_string())
36-
.bucket_region("us-east-1".to_string())
37-
.report_name("my-report".to_string())
38-
.report_prefix("reports".to_string())
39-
.report_type("CUR2.0".to_string())
40-
]))
4131
.logs_config(
4232
AWSLogsConfig::new().lambda_forwarder(
4333
AWSLambdaForwarderConfig::new()

‎examples/v2_aws-integration_UpdateAWSAccount.rs‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ use datadog_api_client::datadogV2::model::AWSAccountUpdateRequestAttributes;
88
use datadog_api_client::datadogV2::model::AWSAccountUpdateRequestData;
99
use datadog_api_client::datadogV2::model::AWSAuthConfig;
1010
use datadog_api_client::datadogV2::model::AWSAuthConfigRole;
11-
use datadog_api_client::datadogV2::model::AWSCCMConfig;
1211
use datadog_api_client::datadogV2::model::AWSLambdaForwarderConfig;
1312
use datadog_api_client::datadogV2::model::AWSLambdaForwarderConfigLogSourceConfig;
1413
use datadog_api_client::datadogV2::model::AWSLogSourceTagFilter;
@@ -17,7 +16,6 @@ use datadog_api_client::datadogV2::model::AWSMetricsConfig;
1716
use datadog_api_client::datadogV2::model::AWSNamespaceTagFilter;
1817
use datadog_api_client::datadogV2::model::AWSResourcesConfig;
1918
use datadog_api_client::datadogV2::model::AWSTracesConfig;
20-
use datadog_api_client::datadogV2::model::DataExportConfig;
2119

2220
#[tokio::main]
2321
async fn main() {
@@ -34,19 +32,6 @@ async fn main() {
3432
),
3533
)
3634
.aws_partition(AWSAccountPartition::AWS)
37-
.ccm_config(
38-
AWSCCMConfig
39-
::new().data_export_configs(
40-
vec![
41-
DataExportConfig::new()
42-
.bucket_name("updated-bucket".to_string())
43-
.bucket_region("us-west-2".to_string())
44-
.report_name("updated-report".to_string())
45-
.report_prefix("cost-reports".to_string())
46-
.report_type("CUR2.0".to_string())
47-
],
48-
),
49-
)
5035
.logs_config(
5136
AWSLogsConfig
5237
::new().lambda_forwarder(

‎src/datadogV2/model/mod.rs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3032,10 +3032,6 @@ pub mod model_aws_regions_include_only;
30323032
pub use self::model_aws_regions_include_only::AWSRegionsIncludeOnly;
30333033
pub mod model_aws_regions;
30343034
pub use self::model_aws_regions::AWSRegions;
3035-
pub mod model_awsccm_config;
3036-
pub use self::model_awsccm_config::AWSCCMConfig;
3037-
pub mod model_data_export_config;
3038-
pub use self::model_data_export_config::DataExportConfig;
30393035
pub mod model_aws_logs_config;
30403036
pub use self::model_aws_logs_config::AWSLogsConfig;
30413037
pub mod model_aws_lambda_forwarder_config;

‎src/datadogV2/model/model_aws_account_create_request_attributes.rs‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@ pub struct AWSAccountCreateRequestAttributes {
3232
/// AWS Regions to collect data from. Defaults to `include_all`.
3333
#[serde(rename = "aws_regions")]
3434
pub aws_regions: Option<crate::datadogV2::model::AWSRegions>,
35-
/// AWS Cloud Cost Management config.
36-
#[serde(rename = "ccm_config")]
37-
pub ccm_config: Option<crate::datadogV2::model::AWSCCMConfig>,
3835
/// AWS Logs Collection config.
3936
#[serde(rename = "logs_config")]
4037
pub logs_config: Option<crate::datadogV2::model::AWSLogsConfig>,
@@ -66,7 +63,6 @@ impl AWSAccountCreateRequestAttributes {
6663
aws_account_id,
6764
aws_partition,
6865
aws_regions: None,
69-
ccm_config: None,
7066
logs_config: None,
7167
metrics_config: None,
7268
resources_config: None,
@@ -86,11 +82,6 @@ impl AWSAccountCreateRequestAttributes {
8682
self
8783
}
8884

89-
pub fn ccm_config(mut self, value: crate::datadogV2::model::AWSCCMConfig) -> Self {
90-
self.ccm_config = Some(value);
91-
self
92-
}
93-
9485
pub fn logs_config(mut self, value: crate::datadogV2::model::AWSLogsConfig) -> Self {
9586
self.logs_config = Some(value);
9687
self
@@ -142,7 +133,6 @@ impl<'de> Deserialize<'de> for AWSAccountCreateRequestAttributes {
142133
let mut aws_account_id: Option<String> = None;
143134
let mut aws_partition: Option<crate::datadogV2::model::AWSAccountPartition> = None;
144135
let mut aws_regions: Option<crate::datadogV2::model::AWSRegions> = None;
145-
let mut ccm_config: Option<crate::datadogV2::model::AWSCCMConfig> = None;
146136
let mut logs_config: Option<crate::datadogV2::model::AWSLogsConfig> = None;
147137
let mut metrics_config: Option<crate::datadogV2::model::AWSMetricsConfig> = None;
148138
let mut resources_config: Option<crate::datadogV2::model::AWSResourcesConfig> =
@@ -207,12 +197,6 @@ impl<'de> Deserialize<'de> for AWSAccountCreateRequestAttributes {
207197
}
208198
}
209199
}
210-
"ccm_config" => {
211-
if v.is_null() {
212-
continue;
213-
}
214-
ccm_config = Some(serde_json::from_value(v).map_err(M::Error::custom)?);
215-
}
216200
"logs_config" => {
217201
if v.is_null() {
218202
continue;
@@ -261,7 +245,6 @@ impl<'de> Deserialize<'de> for AWSAccountCreateRequestAttributes {
261245
aws_account_id,
262246
aws_partition,
263247
aws_regions,
264-
ccm_config,
265248
logs_config,
266249
metrics_config,
267250
resources_config,

‎src/datadogV2/model/model_aws_account_response_attributes.rs‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@ pub struct AWSAccountResponseAttributes {
3232
/// AWS Regions to collect data from. Defaults to `include_all`.
3333
#[serde(rename = "aws_regions")]
3434
pub aws_regions: Option<crate::datadogV2::model::AWSRegions>,
35-
/// AWS Cloud Cost Management config.
36-
#[serde(rename = "ccm_config")]
37-
pub ccm_config: Option<crate::datadogV2::model::AWSCCMConfig>,
3835
/// Timestamp of when the account integration was created.
3936
#[serde(rename = "created_at")]
4037
pub created_at: Option<chrono::DateTime<chrono::Utc>>,
@@ -68,7 +65,6 @@ impl AWSAccountResponseAttributes {
6865
aws_account_id,
6966
aws_partition: None,
7067
aws_regions: None,
71-
ccm_config: None,
7268
created_at: None,
7369
logs_config: None,
7470
metrics_config: None,
@@ -100,11 +96,6 @@ impl AWSAccountResponseAttributes {
10096
self
10197
}
10298

103-
pub fn ccm_config(mut self, value: crate::datadogV2::model::AWSCCMConfig) -> Self {
104-
self.ccm_config = Some(value);
105-
self
106-
}
107-
10899
pub fn created_at(mut self, value: chrono::DateTime<chrono::Utc>) -> Self {
109100
self.created_at = Some(value);
110101
self
@@ -166,7 +157,6 @@ impl<'de> Deserialize<'de> for AWSAccountResponseAttributes {
166157
let mut aws_account_id: Option<String> = None;
167158
let mut aws_partition: Option<crate::datadogV2::model::AWSAccountPartition> = None;
168159
let mut aws_regions: Option<crate::datadogV2::model::AWSRegions> = None;
169-
let mut ccm_config: Option<crate::datadogV2::model::AWSCCMConfig> = None;
170160
let mut created_at: Option<chrono::DateTime<chrono::Utc>> = None;
171161
let mut logs_config: Option<crate::datadogV2::model::AWSLogsConfig> = None;
172162
let mut metrics_config: Option<crate::datadogV2::model::AWSMetricsConfig> = None;
@@ -239,12 +229,6 @@ impl<'de> Deserialize<'de> for AWSAccountResponseAttributes {
239229
}
240230
}
241231
}
242-
"ccm_config" => {
243-
if v.is_null() {
244-
continue;
245-
}
246-
ccm_config = Some(serde_json::from_value(v).map_err(M::Error::custom)?);
247-
}
248232
"created_at" => {
249233
if v.is_null() {
250234
continue;
@@ -302,7 +286,6 @@ impl<'de> Deserialize<'de> for AWSAccountResponseAttributes {
302286
aws_account_id,
303287
aws_partition,
304288
aws_regions,
305-
ccm_config,
306289
created_at,
307290
logs_config,
308291
metrics_config,

‎src/datadogV2/model/model_aws_account_update_request_attributes.rs‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@ pub struct AWSAccountUpdateRequestAttributes {
3232
/// AWS Regions to collect data from. Defaults to `include_all`.
3333
#[serde(rename = "aws_regions")]
3434
pub aws_regions: Option<crate::datadogV2::model::AWSRegions>,
35-
/// AWS Cloud Cost Management config.
36-
#[serde(rename = "ccm_config")]
37-
pub ccm_config: Option<crate::datadogV2::model::AWSCCMConfig>,
3835
/// AWS Logs Collection config.
3936
#[serde(rename = "logs_config")]
4037
pub logs_config: Option<crate::datadogV2::model::AWSLogsConfig>,
@@ -62,7 +59,6 @@ impl AWSAccountUpdateRequestAttributes {
6259
aws_account_id,
6360
aws_partition: None,
6461
aws_regions: None,
65-
ccm_config: None,
6662
logs_config: None,
6763
metrics_config: None,
6864
resources_config: None,
@@ -92,11 +88,6 @@ impl AWSAccountUpdateRequestAttributes {
9288
self
9389
}
9490

95-
pub fn ccm_config(mut self, value: crate::datadogV2::model::AWSCCMConfig) -> Self {
96-
self.ccm_config = Some(value);
97-
self
98-
}
99-
10091
pub fn logs_config(mut self, value: crate::datadogV2::model::AWSLogsConfig) -> Self {
10192
self.logs_config = Some(value);
10293
self
@@ -148,7 +139,6 @@ impl<'de> Deserialize<'de> for AWSAccountUpdateRequestAttributes {
148139
let mut aws_account_id: Option<String> = None;
149140
let mut aws_partition: Option<crate::datadogV2::model::AWSAccountPartition> = None;
150141
let mut aws_regions: Option<crate::datadogV2::model::AWSRegions> = None;
151-
let mut ccm_config: Option<crate::datadogV2::model::AWSCCMConfig> = None;
152142
let mut logs_config: Option<crate::datadogV2::model::AWSLogsConfig> = None;
153143
let mut metrics_config: Option<crate::datadogV2::model::AWSMetricsConfig> = None;
154144
let mut resources_config: Option<crate::datadogV2::model::AWSResourcesConfig> =
@@ -219,12 +209,6 @@ impl<'de> Deserialize<'de> for AWSAccountUpdateRequestAttributes {
219209
}
220210
}
221211
}
222-
"ccm_config" => {
223-
if v.is_null() {
224-
continue;
225-
}
226-
ccm_config = Some(serde_json::from_value(v).map_err(M::Error::custom)?);
227-
}
228212
"logs_config" => {
229213
if v.is_null() {
230214
continue;
@@ -269,7 +253,6 @@ impl<'de> Deserialize<'de> for AWSAccountUpdateRequestAttributes {
269253
aws_account_id,
270254
aws_partition,
271255
aws_regions,
272-
ccm_config,
273256
logs_config,
274257
metrics_config,
275258
resources_config,

0 commit comments

Comments
 (0)