Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove support for namespace_filters.include/exclude_all in v2 AWS Integrations API #386

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .apigentools-info
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
"spec_versions": {
"v1": {
"apigentools_version": "1.6.6",
"regenerated": "2024-11-25 11:57:13.522086",
"spec_repo_commit": "80b43a3b"
"regenerated": "2024-11-25 17:55:57.446086",
"spec_repo_commit": "3cfd102e"
},
"v2": {
"apigentools_version": "1.6.6",
"regenerated": "2024-11-25 11:57:13.541019",
"spec_repo_commit": "80b43a3b"
"regenerated": "2024-11-25 17:55:57.465824",
"spec_repo_commit": "3cfd102e"
}
}
}
20 changes: 0 additions & 20 deletions .generator/schemas/v2/openapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1320,19 +1320,8 @@ components:
AWSNamespaceFilters:
description: AWS Metrics namespace filters
oneOf:
- $ref: '#/components/schemas/AWSNamespaceFiltersExcludeAll'
- $ref: '#/components/schemas/AWSNamespaceFiltersExcludeOnly'
- $ref: '#/components/schemas/AWSNamespaceFiltersIncludeAll'
- $ref: '#/components/schemas/AWSNamespaceFiltersIncludeOnly'
AWSNamespaceFiltersExcludeAll:
description: Exclude all namespaces
properties:
exclude_all:
description: Exclude all namespaces
example: false
type: boolean
required:
- exclude_all
AWSNamespaceFiltersExcludeOnly:
description: Exclude only these namespaces
properties:
Expand All @@ -1346,15 +1335,6 @@ components:
type: array
required:
- exclude_only
AWSNamespaceFiltersIncludeAll:
description: Include all namespaces
properties:
include_all:
description: Include all namespaces
example: false
type: boolean
required:
- include_all
AWSNamespaceFiltersIncludeOnly:
description: Include only these namespaces
properties:
Expand Down
4 changes: 0 additions & 4 deletions src/datadogV2/model/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1352,12 +1352,8 @@ pub mod model_aws_lambda_forwarder_config;
pub use self::model_aws_lambda_forwarder_config::AWSLambdaForwarderConfig;
pub mod model_aws_metrics_config;
pub use self::model_aws_metrics_config::AWSMetricsConfig;
pub mod model_aws_namespace_filters_exclude_all;
pub use self::model_aws_namespace_filters_exclude_all::AWSNamespaceFiltersExcludeAll;
pub mod model_aws_namespace_filters_exclude_only;
pub use self::model_aws_namespace_filters_exclude_only::AWSNamespaceFiltersExcludeOnly;
pub mod model_aws_namespace_filters_include_all;
pub use self::model_aws_namespace_filters_include_all::AWSNamespaceFiltersIncludeAll;
pub mod model_aws_namespace_filters_include_only;
pub use self::model_aws_namespace_filters_include_only::AWSNamespaceFiltersIncludeOnly;
pub mod model_aws_namespace_filters;
Expand Down
18 changes: 0 additions & 18 deletions src/datadogV2/model/model_aws_namespace_filters.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ use serde::{Deserialize, Deserializer, Serialize};
#[derive(Clone, Debug, PartialEq, Serialize)]
#[serde(untagged)]
pub enum AWSNamespaceFilters {
AWSNamespaceFiltersExcludeAll(Box<crate::datadogV2::model::AWSNamespaceFiltersExcludeAll>),
AWSNamespaceFiltersExcludeOnly(Box<crate::datadogV2::model::AWSNamespaceFiltersExcludeOnly>),
AWSNamespaceFiltersIncludeAll(Box<crate::datadogV2::model::AWSNamespaceFiltersIncludeAll>),
AWSNamespaceFiltersIncludeOnly(Box<crate::datadogV2::model::AWSNamespaceFiltersIncludeOnly>),
UnparsedObject(crate::datadog::UnparsedObject),
}
Expand All @@ -21,14 +19,6 @@ impl<'de> Deserialize<'de> for AWSNamespaceFilters {
D: Deserializer<'de>,
{
let value: serde_json::Value = Deserialize::deserialize(deserializer)?;
if let Ok(_v) = serde_json::from_value::<
Box<crate::datadogV2::model::AWSNamespaceFiltersExcludeAll>,
>(value.clone())
{
if !_v._unparsed {
return Ok(AWSNamespaceFilters::AWSNamespaceFiltersExcludeAll(_v));
}
}
if let Ok(_v) = serde_json::from_value::<
Box<crate::datadogV2::model::AWSNamespaceFiltersExcludeOnly>,
>(value.clone())
Expand All @@ -37,14 +27,6 @@ impl<'de> Deserialize<'de> for AWSNamespaceFilters {
return Ok(AWSNamespaceFilters::AWSNamespaceFiltersExcludeOnly(_v));
}
}
if let Ok(_v) = serde_json::from_value::<
Box<crate::datadogV2::model::AWSNamespaceFiltersIncludeAll>,
>(value.clone())
{
if !_v._unparsed {
return Ok(AWSNamespaceFilters::AWSNamespaceFiltersIncludeAll(_v));
}
}
if let Ok(_v) = serde_json::from_value::<
Box<crate::datadogV2::model::AWSNamespaceFiltersIncludeOnly>,
>(value.clone())
Expand Down
94 changes: 0 additions & 94 deletions src/datadogV2/model/model_aws_namespace_filters_exclude_all.rs

This file was deleted.

94 changes: 0 additions & 94 deletions src/datadogV2/model/model_aws_namespace_filters_include_all.rs

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1 +1 @@
2024-11-06T18:44:46.341Z
2024-11-14T20:07:56.996Z
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
},
"response": {
"body": {
"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\":[]}}}}}",
"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\":[]}}}}}",
"encoding": null
},
"headers": {
Expand All @@ -32,7 +32,7 @@
"message": "OK"
}
},
"recorded_at": "Wed, 06 Nov 2024 18:44:46 GMT"
"recorded_at": "Thu, 14 Nov 2024 20:07:56 GMT"
},
{
"request": {
Expand All @@ -43,7 +43,7 @@
]
},
"method": "delete",
"uri": "https://api.datadoghq.com/api/v2/integration/aws/accounts/0696eb1f-06fa-40a6-a623-084a83f61623"
"uri": "https://api.datadoghq.com/api/v2/integration/aws/accounts/c2d871fe-ba0c-441d-acc8-d49d28c748f4"
},
"response": {
"body": {
Expand All @@ -56,7 +56,7 @@
"message": "No Content"
}
},
"recorded_at": "Wed, 06 Nov 2024 18:44:46 GMT"
"recorded_at": "Thu, 14 Nov 2024 20:07:56 GMT"
}
],
"recorded_with": "VCR 6.0.0"
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2024-11-06T18:44:47.513Z
2024-11-14T20:07:57.855Z
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
},
"response": {
"body": {
"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\":[]}}}}}",
"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\":[]}}}}}",
"encoding": null
},
"headers": {
Expand All @@ -32,7 +32,7 @@
"message": "OK"
}
},
"recorded_at": "Wed, 06 Nov 2024 18:44:47 GMT"
"recorded_at": "Thu, 14 Nov 2024 20:07:57 GMT"
},
{
"request": {
Expand All @@ -43,7 +43,7 @@
]
},
"method": "delete",
"uri": "https://api.datadoghq.com/api/v2/integration/aws/accounts/5b07e0e7-013c-427e-977a-7adb94ff4b40"
"uri": "https://api.datadoghq.com/api/v2/integration/aws/accounts/a1a282b9-6e74-4e56-b423-ec55ccbc995d"
},
"response": {
"body": {
Expand All @@ -56,7 +56,7 @@
"message": "No Content"
}
},
"recorded_at": "Wed, 06 Nov 2024 18:44:47 GMT"
"recorded_at": "Thu, 14 Nov 2024 20:07:57 GMT"
}
],
"recorded_with": "VCR 6.0.0"
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2024-11-06T18:44:47.919Z
2024-11-14T20:07:58.234Z
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"message": "Bad Request"
}
},
"recorded_at": "Wed, 06 Nov 2024 18:44:47 GMT"
"recorded_at": "Thu, 14 Nov 2024 20:07:58 GMT"
}
],
"recorded_with": "VCR 6.0.0"
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2024-11-06T18:44:48.024Z
2024-11-14T20:07:58.346Z
Loading