Skip to content

Commit d603b28

Browse files
author
ci.datadog-api-spec
committed
Regenerate client from commit 6fb3c7ee of spec repo
1 parent c4e5d15 commit d603b28

File tree

42 files changed

+79
-309
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+79
-309
lines changed

.apigentools-info

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
"spec_versions": {
55
"v1": {
66
"apigentools_version": "1.6.6",
7-
"regenerated": "2024-11-21 20:23:39.100315",
8-
"spec_repo_commit": "ad36259c"
7+
"regenerated": "2024-11-21 21:37:05.038929",
8+
"spec_repo_commit": "6fb3c7ee"
99
},
1010
"v2": {
1111
"apigentools_version": "1.6.6",
12-
"regenerated": "2024-11-21 20:23:39.119286",
13-
"spec_repo_commit": "ad36259c"
12+
"regenerated": "2024-11-21 21:37:05.057743",
13+
"spec_repo_commit": "6fb3c7ee"
1414
}
1515
}
1616
}

.generator/schemas/v2/openapi.yaml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1320,19 +1320,8 @@ components:
13201320
AWSNamespaceFilters:
13211321
description: AWS Metrics namespace filters
13221322
oneOf:
1323-
- $ref: '#/components/schemas/AWSNamespaceFiltersExcludeAll'
13241323
- $ref: '#/components/schemas/AWSNamespaceFiltersExcludeOnly'
1325-
- $ref: '#/components/schemas/AWSNamespaceFiltersIncludeAll'
13261324
- $ref: '#/components/schemas/AWSNamespaceFiltersIncludeOnly'
1327-
AWSNamespaceFiltersExcludeAll:
1328-
description: Exclude all namespaces
1329-
properties:
1330-
exclude_all:
1331-
description: Exclude all namespaces
1332-
example: false
1333-
type: boolean
1334-
required:
1335-
- exclude_all
13361325
AWSNamespaceFiltersExcludeOnly:
13371326
description: Exclude only these namespaces
13381327
properties:
@@ -1346,15 +1335,6 @@ components:
13461335
type: array
13471336
required:
13481337
- exclude_only
1349-
AWSNamespaceFiltersIncludeAll:
1350-
description: Include all namespaces
1351-
properties:
1352-
include_all:
1353-
description: Include all namespaces
1354-
example: false
1355-
type: boolean
1356-
required:
1357-
- include_all
13581338
AWSNamespaceFiltersIncludeOnly:
13591339
description: Include only these namespaces
13601340
properties:

src/datadogV2/model/mod.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1352,12 +1352,8 @@ pub mod model_aws_lambda_forwarder_config;
13521352
pub use self::model_aws_lambda_forwarder_config::AWSLambdaForwarderConfig;
13531353
pub mod model_aws_metrics_config;
13541354
pub use self::model_aws_metrics_config::AWSMetricsConfig;
1355-
pub mod model_aws_namespace_filters_exclude_all;
1356-
pub use self::model_aws_namespace_filters_exclude_all::AWSNamespaceFiltersExcludeAll;
13571355
pub mod model_aws_namespace_filters_exclude_only;
13581356
pub use self::model_aws_namespace_filters_exclude_only::AWSNamespaceFiltersExcludeOnly;
1359-
pub mod model_aws_namespace_filters_include_all;
1360-
pub use self::model_aws_namespace_filters_include_all::AWSNamespaceFiltersIncludeAll;
13611357
pub mod model_aws_namespace_filters_include_only;
13621358
pub use self::model_aws_namespace_filters_include_only::AWSNamespaceFiltersIncludeOnly;
13631359
pub mod model_aws_namespace_filters;

src/datadogV2/model/model_aws_namespace_filters.rs

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@ use serde::{Deserialize, Deserializer, Serialize};
88
#[derive(Clone, Debug, PartialEq, Serialize)]
99
#[serde(untagged)]
1010
pub enum AWSNamespaceFilters {
11-
AWSNamespaceFiltersExcludeAll(Box<crate::datadogV2::model::AWSNamespaceFiltersExcludeAll>),
1211
AWSNamespaceFiltersExcludeOnly(Box<crate::datadogV2::model::AWSNamespaceFiltersExcludeOnly>),
13-
AWSNamespaceFiltersIncludeAll(Box<crate::datadogV2::model::AWSNamespaceFiltersIncludeAll>),
1412
AWSNamespaceFiltersIncludeOnly(Box<crate::datadogV2::model::AWSNamespaceFiltersIncludeOnly>),
1513
UnparsedObject(crate::datadog::UnparsedObject),
1614
}
@@ -21,14 +19,6 @@ impl<'de> Deserialize<'de> for AWSNamespaceFilters {
2119
D: Deserializer<'de>,
2220
{
2321
let value: serde_json::Value = Deserialize::deserialize(deserializer)?;
24-
if let Ok(_v) = serde_json::from_value::<
25-
Box<crate::datadogV2::model::AWSNamespaceFiltersExcludeAll>,
26-
>(value.clone())
27-
{
28-
if !_v._unparsed {
29-
return Ok(AWSNamespaceFilters::AWSNamespaceFiltersExcludeAll(_v));
30-
}
31-
}
3222
if let Ok(_v) = serde_json::from_value::<
3323
Box<crate::datadogV2::model::AWSNamespaceFiltersExcludeOnly>,
3424
>(value.clone())
@@ -37,14 +27,6 @@ impl<'de> Deserialize<'de> for AWSNamespaceFilters {
3727
return Ok(AWSNamespaceFilters::AWSNamespaceFiltersExcludeOnly(_v));
3828
}
3929
}
40-
if let Ok(_v) = serde_json::from_value::<
41-
Box<crate::datadogV2::model::AWSNamespaceFiltersIncludeAll>,
42-
>(value.clone())
43-
{
44-
if !_v._unparsed {
45-
return Ok(AWSNamespaceFilters::AWSNamespaceFiltersIncludeAll(_v));
46-
}
47-
}
4830
if let Ok(_v) = serde_json::from_value::<
4931
Box<crate::datadogV2::model::AWSNamespaceFiltersIncludeOnly>,
5032
>(value.clone())

src/datadogV2/model/model_aws_namespace_filters_exclude_all.rs

Lines changed: 0 additions & 94 deletions
This file was deleted.

src/datadogV2/model/model_aws_namespace_filters_include_all.rs

Lines changed: 0 additions & 94 deletions
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2024-11-06T18:44:46.341Z
1+
2024-11-14T20:07:56.996Z

tests/scenarios/cassettes/v2/aws_integration/Create-an-AWS-account-returns-AWS-Account-object-response.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
},
2020
"response": {
2121
"body": {
22-
"string": "{\"data\":{\"id\":\"0696eb1f-06fa-40a6-a623-084a83f61623\",\"type\":\"account\",\"attributes\":{\"account_tags\":[\"key:value\"],\"auth_config\":{\"role_name\":\"DatadogIntegrationRole\",\"external_id\":\"32cd9dafa1d24205ba26a02d157cd16f\"},\"aws_account_id\":\"123456789012\",\"aws_partition\":\"aws\",\"aws_regions\":{\"include_all\":true},\"created_at\":\"2024-11-06T18:44:47.20569681Z\",\"logs_config\":{\"lambda_forwarder\":{\"lambdas\":[\"arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder\"],\"sources\":[\"s3\"]}},\"metrics_config\":{\"enabled\":true,\"automute_enabled\":true,\"collect_custom_metrics\":true,\"collect_cloudwatch_alarms\":true,\"tag_filters\":[{\"namespace\":\"AWS/EC2\",\"tags\":[\"key:value\"]}],\"namespace_filters\":{\"exclude_only\":[\"AWS/SQS\",\"AWS/ElasticMapReduce\"]}},\"modified_at\":\"2024-11-06T18:44:47.20570138Z\",\"resources_config\":{\"cloud_security_posture_management_collection\":false,\"extended_collection\":false},\"traces_config\":{\"xray_services\":{\"include_only\":[]}}}}}",
22+
"string": "{\"data\":{\"id\":\"c2d871fe-ba0c-441d-acc8-d49d28c748f4\",\"type\":\"account\",\"attributes\":{\"account_tags\":[\"key:value\"],\"auth_config\":{\"role_name\":\"DatadogIntegrationRole\",\"external_id\":\"7f40a01ff2444f4f94442f52223ea7cf\"},\"aws_account_id\":\"123456789012\",\"aws_partition\":\"aws\",\"aws_regions\":{\"include_all\":true},\"created_at\":\"2024-11-14T20:07:57.608241244Z\",\"logs_config\":{\"lambda_forwarder\":{\"lambdas\":[\"arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder\"],\"sources\":[\"s3\"]}},\"metrics_config\":{\"enabled\":true,\"automute_enabled\":true,\"collect_custom_metrics\":true,\"collect_cloudwatch_alarms\":true,\"tag_filters\":[{\"namespace\":\"AWS/EC2\",\"tags\":[\"key:value\"]}],\"namespace_filters\":{\"exclude_only\":[\"AWS/SQS\",\"AWS/ElasticMapReduce\"]}},\"modified_at\":\"2024-11-14T20:07:57.60824734Z\",\"resources_config\":{\"cloud_security_posture_management_collection\":false,\"extended_collection\":false},\"traces_config\":{\"xray_services\":{\"include_only\":[]}}}}}",
2323
"encoding": null
2424
},
2525
"headers": {
@@ -32,7 +32,7 @@
3232
"message": "OK"
3333
}
3434
},
35-
"recorded_at": "Wed, 06 Nov 2024 18:44:46 GMT"
35+
"recorded_at": "Thu, 14 Nov 2024 20:07:56 GMT"
3636
},
3737
{
3838
"request": {
@@ -43,7 +43,7 @@
4343
]
4444
},
4545
"method": "delete",
46-
"uri": "https://api.datadoghq.com/api/v2/integration/aws/accounts/0696eb1f-06fa-40a6-a623-084a83f61623"
46+
"uri": "https://api.datadoghq.com/api/v2/integration/aws/accounts/c2d871fe-ba0c-441d-acc8-d49d28c748f4"
4747
},
4848
"response": {
4949
"body": {
@@ -56,7 +56,7 @@
5656
"message": "No Content"
5757
}
5858
},
59-
"recorded_at": "Wed, 06 Nov 2024 18:44:46 GMT"
59+
"recorded_at": "Thu, 14 Nov 2024 20:07:56 GMT"
6060
}
6161
],
6262
"recorded_with": "VCR 6.0.0"
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2024-11-06T18:44:47.513Z
1+
2024-11-14T20:07:57.855Z

tests/scenarios/cassettes/v2/aws_integration/Create-an-AWS-integration-returns-AWS-Account-object-response.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
},
2020
"response": {
2121
"body": {
22-
"string": "{\"data\":{\"id\":\"5b07e0e7-013c-427e-977a-7adb94ff4b40\",\"type\":\"account\",\"attributes\":{\"account_tags\":[\"key:value\"],\"auth_config\":{\"access_key_id\":\"AKIAIOSFODNN7EXAMPLE\"},\"aws_account_id\":\"123456789012\",\"aws_partition\":\"aws\",\"aws_regions\":{\"include_all\":true},\"created_at\":\"2024-11-06T18:44:47.622908005Z\",\"logs_config\":{\"lambda_forwarder\":{\"lambdas\":[\"arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder\"],\"sources\":[\"s3\"]}},\"metrics_config\":{\"enabled\":true,\"automute_enabled\":true,\"collect_custom_metrics\":true,\"collect_cloudwatch_alarms\":true,\"tag_filters\":[{\"namespace\":\"AWS/EC2\",\"tags\":[\"key:value\"]}],\"namespace_filters\":{\"exclude_only\":[\"AWS/SQS\",\"AWS/ElasticMapReduce\"]}},\"modified_at\":\"2024-11-06T18:44:47.62291187Z\",\"resources_config\":{\"cloud_security_posture_management_collection\":false,\"extended_collection\":false},\"traces_config\":{\"xray_services\":{\"include_only\":[]}}}}}",
22+
"string": "{\"data\":{\"id\":\"a1a282b9-6e74-4e56-b423-ec55ccbc995d\",\"type\":\"account\",\"attributes\":{\"account_tags\":[\"key:value\"],\"auth_config\":{\"access_key_id\":\"AKIAIOSFODNN7EXAMPLE\"},\"aws_account_id\":\"123456789012\",\"aws_partition\":\"aws\",\"aws_regions\":{\"include_all\":true},\"created_at\":\"2024-11-14T20:07:57.96162522Z\",\"logs_config\":{\"lambda_forwarder\":{\"lambdas\":[\"arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder\"],\"sources\":[\"s3\"]}},\"metrics_config\":{\"enabled\":true,\"automute_enabled\":true,\"collect_custom_metrics\":true,\"collect_cloudwatch_alarms\":true,\"tag_filters\":[{\"namespace\":\"AWS/EC2\",\"tags\":[\"key:value\"]}],\"namespace_filters\":{\"exclude_only\":[\"AWS/SQS\",\"AWS/ElasticMapReduce\"]}},\"modified_at\":\"2024-11-14T20:07:57.961631497Z\",\"resources_config\":{\"cloud_security_posture_management_collection\":false,\"extended_collection\":false},\"traces_config\":{\"xray_services\":{\"include_only\":[]}}}}}",
2323
"encoding": null
2424
},
2525
"headers": {
@@ -32,7 +32,7 @@
3232
"message": "OK"
3333
}
3434
},
35-
"recorded_at": "Wed, 06 Nov 2024 18:44:47 GMT"
35+
"recorded_at": "Thu, 14 Nov 2024 20:07:57 GMT"
3636
},
3737
{
3838
"request": {
@@ -43,7 +43,7 @@
4343
]
4444
},
4545
"method": "delete",
46-
"uri": "https://api.datadoghq.com/api/v2/integration/aws/accounts/5b07e0e7-013c-427e-977a-7adb94ff4b40"
46+
"uri": "https://api.datadoghq.com/api/v2/integration/aws/accounts/a1a282b9-6e74-4e56-b423-ec55ccbc995d"
4747
},
4848
"response": {
4949
"body": {
@@ -56,7 +56,7 @@
5656
"message": "No Content"
5757
}
5858
},
59-
"recorded_at": "Wed, 06 Nov 2024 18:44:47 GMT"
59+
"recorded_at": "Thu, 14 Nov 2024 20:07:57 GMT"
6060
}
6161
],
6262
"recorded_with": "VCR 6.0.0"

0 commit comments

Comments
 (0)