diff --git a/.apigentools-info b/.apigentools-info index 2f8d8c84b..ace44c838 100644 --- a/.apigentools-info +++ b/.apigentools-info @@ -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" } } } \ No newline at end of file diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml index 0a7dc3311..183eb819d 100644 --- a/.generator/schemas/v2/openapi.yaml +++ b/.generator/schemas/v2/openapi.yaml @@ -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: @@ -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: diff --git a/src/datadogV2/model/mod.rs b/src/datadogV2/model/mod.rs index 80a6be94e..ef49252d9 100644 --- a/src/datadogV2/model/mod.rs +++ b/src/datadogV2/model/mod.rs @@ -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; diff --git a/src/datadogV2/model/model_aws_namespace_filters.rs b/src/datadogV2/model/model_aws_namespace_filters.rs index 962c163ff..3ee1fe340 100644 --- a/src/datadogV2/model/model_aws_namespace_filters.rs +++ b/src/datadogV2/model/model_aws_namespace_filters.rs @@ -8,9 +8,7 @@ use serde::{Deserialize, Deserializer, Serialize}; #[derive(Clone, Debug, PartialEq, Serialize)] #[serde(untagged)] pub enum AWSNamespaceFilters { - AWSNamespaceFiltersExcludeAll(Box), AWSNamespaceFiltersExcludeOnly(Box), - AWSNamespaceFiltersIncludeAll(Box), AWSNamespaceFiltersIncludeOnly(Box), UnparsedObject(crate::datadog::UnparsedObject), } @@ -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, - >(value.clone()) - { - if !_v._unparsed { - return Ok(AWSNamespaceFilters::AWSNamespaceFiltersExcludeAll(_v)); - } - } if let Ok(_v) = serde_json::from_value::< Box, >(value.clone()) @@ -37,14 +27,6 @@ impl<'de> Deserialize<'de> for AWSNamespaceFilters { return Ok(AWSNamespaceFilters::AWSNamespaceFiltersExcludeOnly(_v)); } } - if let Ok(_v) = serde_json::from_value::< - Box, - >(value.clone()) - { - if !_v._unparsed { - return Ok(AWSNamespaceFilters::AWSNamespaceFiltersIncludeAll(_v)); - } - } if let Ok(_v) = serde_json::from_value::< Box, >(value.clone()) diff --git a/src/datadogV2/model/model_aws_namespace_filters_exclude_all.rs b/src/datadogV2/model/model_aws_namespace_filters_exclude_all.rs deleted file mode 100644 index 85b478ddd..000000000 --- a/src/datadogV2/model/model_aws_namespace_filters_exclude_all.rs +++ /dev/null @@ -1,94 +0,0 @@ -// Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License. -// This product includes software developed at Datadog (https://www.datadoghq.com/). -// Copyright 2019-Present Datadog, Inc. -use serde::de::{Error, MapAccess, Visitor}; -use serde::{Deserialize, Deserializer, Serialize}; -use serde_with::skip_serializing_none; -use std::fmt::{self, Formatter}; - -/// Exclude all namespaces -#[non_exhaustive] -#[skip_serializing_none] -#[derive(Clone, Debug, PartialEq, Serialize)] -pub struct AWSNamespaceFiltersExcludeAll { - /// Exclude all namespaces - #[serde(rename = "exclude_all")] - pub exclude_all: bool, - #[serde(flatten)] - pub additional_properties: std::collections::BTreeMap, - #[serde(skip)] - #[serde(default)] - pub(crate) _unparsed: bool, -} - -impl AWSNamespaceFiltersExcludeAll { - pub fn new(exclude_all: bool) -> AWSNamespaceFiltersExcludeAll { - AWSNamespaceFiltersExcludeAll { - exclude_all, - additional_properties: std::collections::BTreeMap::new(), - _unparsed: false, - } - } - - pub fn additional_properties( - mut self, - value: std::collections::BTreeMap, - ) -> Self { - self.additional_properties = value; - self - } -} - -impl<'de> Deserialize<'de> for AWSNamespaceFiltersExcludeAll { - fn deserialize(deserializer: D) -> Result - where - D: Deserializer<'de>, - { - struct AWSNamespaceFiltersExcludeAllVisitor; - impl<'a> Visitor<'a> for AWSNamespaceFiltersExcludeAllVisitor { - type Value = AWSNamespaceFiltersExcludeAll; - - fn expecting(&self, f: &mut Formatter<'_>) -> fmt::Result { - f.write_str("a mapping") - } - - fn visit_map(self, mut map: M) -> Result - where - M: MapAccess<'a>, - { - let mut exclude_all: Option = None; - let mut additional_properties: std::collections::BTreeMap< - String, - serde_json::Value, - > = std::collections::BTreeMap::new(); - let mut _unparsed = false; - - while let Some((k, v)) = map.next_entry::()? { - match k.as_str() { - "exclude_all" => { - exclude_all = - Some(serde_json::from_value(v).map_err(M::Error::custom)?); - } - &_ => { - if let Ok(value) = serde_json::from_value(v.clone()) { - additional_properties.insert(k, value); - } - } - } - } - let exclude_all = - exclude_all.ok_or_else(|| M::Error::missing_field("exclude_all"))?; - - let content = AWSNamespaceFiltersExcludeAll { - exclude_all, - additional_properties, - _unparsed, - }; - - Ok(content) - } - } - - deserializer.deserialize_any(AWSNamespaceFiltersExcludeAllVisitor) - } -} diff --git a/src/datadogV2/model/model_aws_namespace_filters_include_all.rs b/src/datadogV2/model/model_aws_namespace_filters_include_all.rs deleted file mode 100644 index f66f0c381..000000000 --- a/src/datadogV2/model/model_aws_namespace_filters_include_all.rs +++ /dev/null @@ -1,94 +0,0 @@ -// Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License. -// This product includes software developed at Datadog (https://www.datadoghq.com/). -// Copyright 2019-Present Datadog, Inc. -use serde::de::{Error, MapAccess, Visitor}; -use serde::{Deserialize, Deserializer, Serialize}; -use serde_with::skip_serializing_none; -use std::fmt::{self, Formatter}; - -/// Include all namespaces -#[non_exhaustive] -#[skip_serializing_none] -#[derive(Clone, Debug, PartialEq, Serialize)] -pub struct AWSNamespaceFiltersIncludeAll { - /// Include all namespaces - #[serde(rename = "include_all")] - pub include_all: bool, - #[serde(flatten)] - pub additional_properties: std::collections::BTreeMap, - #[serde(skip)] - #[serde(default)] - pub(crate) _unparsed: bool, -} - -impl AWSNamespaceFiltersIncludeAll { - pub fn new(include_all: bool) -> AWSNamespaceFiltersIncludeAll { - AWSNamespaceFiltersIncludeAll { - include_all, - additional_properties: std::collections::BTreeMap::new(), - _unparsed: false, - } - } - - pub fn additional_properties( - mut self, - value: std::collections::BTreeMap, - ) -> Self { - self.additional_properties = value; - self - } -} - -impl<'de> Deserialize<'de> for AWSNamespaceFiltersIncludeAll { - fn deserialize(deserializer: D) -> Result - where - D: Deserializer<'de>, - { - struct AWSNamespaceFiltersIncludeAllVisitor; - impl<'a> Visitor<'a> for AWSNamespaceFiltersIncludeAllVisitor { - type Value = AWSNamespaceFiltersIncludeAll; - - fn expecting(&self, f: &mut Formatter<'_>) -> fmt::Result { - f.write_str("a mapping") - } - - fn visit_map(self, mut map: M) -> Result - where - M: MapAccess<'a>, - { - let mut include_all: Option = None; - let mut additional_properties: std::collections::BTreeMap< - String, - serde_json::Value, - > = std::collections::BTreeMap::new(); - let mut _unparsed = false; - - while let Some((k, v)) = map.next_entry::()? { - match k.as_str() { - "include_all" => { - include_all = - Some(serde_json::from_value(v).map_err(M::Error::custom)?); - } - &_ => { - if let Ok(value) = serde_json::from_value(v.clone()) { - additional_properties.insert(k, value); - } - } - } - } - let include_all = - include_all.ok_or_else(|| M::Error::missing_field("include_all"))?; - - let content = AWSNamespaceFiltersIncludeAll { - include_all, - additional_properties, - _unparsed, - }; - - Ok(content) - } - } - - deserializer.deserialize_any(AWSNamespaceFiltersIncludeAllVisitor) - } -} diff --git a/tests/scenarios/cassettes/v2/aws_integration/Create-an-AWS-account-returns-AWS-Account-object-response.frozen b/tests/scenarios/cassettes/v2/aws_integration/Create-an-AWS-account-returns-AWS-Account-object-response.frozen index 8da9363a4..01733f517 100644 --- a/tests/scenarios/cassettes/v2/aws_integration/Create-an-AWS-account-returns-AWS-Account-object-response.frozen +++ b/tests/scenarios/cassettes/v2/aws_integration/Create-an-AWS-account-returns-AWS-Account-object-response.frozen @@ -1 +1 @@ -2024-11-06T18:44:46.341Z \ No newline at end of file +2024-11-14T20:07:56.996Z \ No newline at end of file diff --git a/tests/scenarios/cassettes/v2/aws_integration/Create-an-AWS-account-returns-AWS-Account-object-response.json b/tests/scenarios/cassettes/v2/aws_integration/Create-an-AWS-account-returns-AWS-Account-object-response.json index b20968be2..041bbd798 100644 --- a/tests/scenarios/cassettes/v2/aws_integration/Create-an-AWS-account-returns-AWS-Account-object-response.json +++ b/tests/scenarios/cassettes/v2/aws_integration/Create-an-AWS-account-returns-AWS-Account-object-response.json @@ -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": { @@ -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": { @@ -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": { @@ -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" diff --git a/tests/scenarios/cassettes/v2/aws_integration/Create-an-AWS-integration-returns-AWS-Account-object-response.frozen b/tests/scenarios/cassettes/v2/aws_integration/Create-an-AWS-integration-returns-AWS-Account-object-response.frozen index 4adb1638a..361392da0 100644 --- a/tests/scenarios/cassettes/v2/aws_integration/Create-an-AWS-integration-returns-AWS-Account-object-response.frozen +++ b/tests/scenarios/cassettes/v2/aws_integration/Create-an-AWS-integration-returns-AWS-Account-object-response.frozen @@ -1 +1 @@ -2024-11-06T18:44:47.513Z \ No newline at end of file +2024-11-14T20:07:57.855Z \ No newline at end of file diff --git a/tests/scenarios/cassettes/v2/aws_integration/Create-an-AWS-integration-returns-AWS-Account-object-response.json b/tests/scenarios/cassettes/v2/aws_integration/Create-an-AWS-integration-returns-AWS-Account-object-response.json index 2f4a4d9bb..5f3fd5c5f 100644 --- a/tests/scenarios/cassettes/v2/aws_integration/Create-an-AWS-integration-returns-AWS-Account-object-response.json +++ b/tests/scenarios/cassettes/v2/aws_integration/Create-an-AWS-integration-returns-AWS-Account-object-response.json @@ -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": { @@ -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": { @@ -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": { @@ -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" diff --git a/tests/scenarios/cassettes/v2/aws_integration/Create-an-AWS-integration-returns-Bad-Request-response.frozen b/tests/scenarios/cassettes/v2/aws_integration/Create-an-AWS-integration-returns-Bad-Request-response.frozen index 26a03306f..a21e03e93 100644 --- a/tests/scenarios/cassettes/v2/aws_integration/Create-an-AWS-integration-returns-Bad-Request-response.frozen +++ b/tests/scenarios/cassettes/v2/aws_integration/Create-an-AWS-integration-returns-Bad-Request-response.frozen @@ -1 +1 @@ -2024-11-06T18:44:47.919Z \ No newline at end of file +2024-11-14T20:07:58.234Z \ No newline at end of file diff --git a/tests/scenarios/cassettes/v2/aws_integration/Create-an-AWS-integration-returns-Bad-Request-response.json b/tests/scenarios/cassettes/v2/aws_integration/Create-an-AWS-integration-returns-Bad-Request-response.json index dca558878..6d1c49279 100644 --- a/tests/scenarios/cassettes/v2/aws_integration/Create-an-AWS-integration-returns-Bad-Request-response.json +++ b/tests/scenarios/cassettes/v2/aws_integration/Create-an-AWS-integration-returns-Bad-Request-response.json @@ -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" diff --git a/tests/scenarios/cassettes/v2/aws_integration/Create-an-AWS-integration-returns-Conflict-response.frozen b/tests/scenarios/cassettes/v2/aws_integration/Create-an-AWS-integration-returns-Conflict-response.frozen index 89901ede4..bb6908fda 100644 --- a/tests/scenarios/cassettes/v2/aws_integration/Create-an-AWS-integration-returns-Conflict-response.frozen +++ b/tests/scenarios/cassettes/v2/aws_integration/Create-an-AWS-integration-returns-Conflict-response.frozen @@ -1 +1 @@ -2024-11-06T18:44:48.024Z \ No newline at end of file +2024-11-14T20:07:58.346Z \ No newline at end of file diff --git a/tests/scenarios/cassettes/v2/aws_integration/Create-an-AWS-integration-returns-Conflict-response.json b/tests/scenarios/cassettes/v2/aws_integration/Create-an-AWS-integration-returns-Conflict-response.json index 6a5c70369..5bef62461 100644 --- a/tests/scenarios/cassettes/v2/aws_integration/Create-an-AWS-integration-returns-Conflict-response.json +++ b/tests/scenarios/cassettes/v2/aws_integration/Create-an-AWS-integration-returns-Conflict-response.json @@ -19,7 +19,7 @@ }, "response": { "body": { - "string": "{\"data\":{\"id\":\"7f221537-cb4f-47dc-8666-f77e5ca60750\",\"type\":\"account\",\"attributes\":{\"account_tags\":[\"key:value\"],\"auth_config\":{\"role_name\":\"DatadogIntegrationRole\",\"external_id\":\"8fce2f5d4975420794b61a5455bf78f2\"},\"aws_account_id\":\"123456789012\",\"aws_partition\":\"aws\",\"aws_regions\":{\"include_only\":[\"us-east-1\"]},\"created_at\":\"2024-11-06T18:44:48.579473724Z\",\"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\":false,\"collect_cloudwatch_alarms\":false,\"tag_filters\":[{\"namespace\":\"AWS/EC2\",\"tags\":[\"key:value\"]}],\"namespace_filters\":{\"include_only\":[\"AWS/EC2\"]}},\"modified_at\":\"2024-11-06T18:44:48.579477654Z\",\"resources_config\":{\"cloud_security_posture_management_collection\":false,\"extended_collection\":false},\"traces_config\":{\"xray_services\":{\"include_only\":[\"AWS/AppSync\"]}}}}}", + "string": "{\"data\":{\"id\":\"3827b469-bc3a-41be-bdf0-1d0e6ea413a2\",\"type\":\"account\",\"attributes\":{\"account_tags\":[\"key:value\"],\"auth_config\":{\"role_name\":\"DatadogIntegrationRole\",\"external_id\":\"d2a623a93f7444b29404f25cb5853c05\"},\"aws_account_id\":\"123456789012\",\"aws_partition\":\"aws\",\"aws_regions\":{\"include_only\":[\"us-east-1\"]},\"created_at\":\"2024-11-14T20:07:59.282635727Z\",\"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\":false,\"collect_cloudwatch_alarms\":false,\"tag_filters\":[{\"namespace\":\"AWS/EC2\",\"tags\":[\"key:value\"]}],\"namespace_filters\":{\"include_only\":[\"AWS/EC2\"]}},\"modified_at\":\"2024-11-14T20:07:59.282642012Z\",\"resources_config\":{\"cloud_security_posture_management_collection\":false,\"extended_collection\":false},\"traces_config\":{\"xray_services\":{\"include_only\":[\"AWS/AppSync\"]}}}}}", "encoding": null }, "headers": { @@ -32,7 +32,7 @@ "message": "OK" } }, - "recorded_at": "Wed, 06 Nov 2024 18:44:48 GMT" + "recorded_at": "Thu, 14 Nov 2024 20:07:58 GMT" }, { "request": { @@ -66,7 +66,7 @@ "message": "Conflict" } }, - "recorded_at": "Wed, 06 Nov 2024 18:44:48 GMT" + "recorded_at": "Thu, 14 Nov 2024 20:07:58 GMT" }, { "request": { @@ -77,7 +77,7 @@ ] }, "method": "delete", - "uri": "https://api.datadoghq.com/api/v2/integration/aws/accounts/7f221537-cb4f-47dc-8666-f77e5ca60750" + "uri": "https://api.datadoghq.com/api/v2/integration/aws/accounts/3827b469-bc3a-41be-bdf0-1d0e6ea413a2" }, "response": { "body": { @@ -90,7 +90,7 @@ "message": "No Content" } }, - "recorded_at": "Wed, 06 Nov 2024 18:44:48 GMT" + "recorded_at": "Thu, 14 Nov 2024 20:07:58 GMT" } ], "recorded_with": "VCR 6.0.0" diff --git a/tests/scenarios/cassettes/v2/aws_integration/Delete-an-AWS-integration-returns-Bad-Request-response.frozen b/tests/scenarios/cassettes/v2/aws_integration/Delete-an-AWS-integration-returns-Bad-Request-response.frozen index 27a329cdd..b01bd4235 100644 --- a/tests/scenarios/cassettes/v2/aws_integration/Delete-an-AWS-integration-returns-Bad-Request-response.frozen +++ b/tests/scenarios/cassettes/v2/aws_integration/Delete-an-AWS-integration-returns-Bad-Request-response.frozen @@ -1 +1 @@ -2024-11-06T18:44:49.460Z \ No newline at end of file +2024-11-14T20:08:00.124Z \ No newline at end of file diff --git a/tests/scenarios/cassettes/v2/aws_integration/Delete-an-AWS-integration-returns-Bad-Request-response.json b/tests/scenarios/cassettes/v2/aws_integration/Delete-an-AWS-integration-returns-Bad-Request-response.json index f883de1d1..d37e7dd47 100644 --- a/tests/scenarios/cassettes/v2/aws_integration/Delete-an-AWS-integration-returns-Bad-Request-response.json +++ b/tests/scenarios/cassettes/v2/aws_integration/Delete-an-AWS-integration-returns-Bad-Request-response.json @@ -26,7 +26,7 @@ "message": "Bad Request" } }, - "recorded_at": "Wed, 06 Nov 2024 18:44:49 GMT" + "recorded_at": "Thu, 14 Nov 2024 20:08:00 GMT" } ], "recorded_with": "VCR 6.0.0" diff --git a/tests/scenarios/cassettes/v2/aws_integration/Delete-an-AWS-integration-returns-No-Content-response.frozen b/tests/scenarios/cassettes/v2/aws_integration/Delete-an-AWS-integration-returns-No-Content-response.frozen index 19dc73505..2c11478ca 100644 --- a/tests/scenarios/cassettes/v2/aws_integration/Delete-an-AWS-integration-returns-No-Content-response.frozen +++ b/tests/scenarios/cassettes/v2/aws_integration/Delete-an-AWS-integration-returns-No-Content-response.frozen @@ -1 +1 @@ -2024-11-06T18:44:49.526Z \ No newline at end of file +2024-11-14T20:08:00.216Z \ No newline at end of file diff --git a/tests/scenarios/cassettes/v2/aws_integration/Delete-an-AWS-integration-returns-No-Content-response.json b/tests/scenarios/cassettes/v2/aws_integration/Delete-an-AWS-integration-returns-No-Content-response.json index 40737408c..20a38d96a 100644 --- a/tests/scenarios/cassettes/v2/aws_integration/Delete-an-AWS-integration-returns-No-Content-response.json +++ b/tests/scenarios/cassettes/v2/aws_integration/Delete-an-AWS-integration-returns-No-Content-response.json @@ -19,7 +19,7 @@ }, "response": { "body": { - "string": "{\"data\":{\"id\":\"e733f58b-b8d1-4d0c-b2f5-6438d314ca51\",\"type\":\"account\",\"attributes\":{\"account_tags\":[\"key:value\"],\"auth_config\":{\"role_name\":\"DatadogIntegrationRole\",\"external_id\":\"33e38eb9a16041fc8688ca9afcf82224\"},\"aws_account_id\":\"123456789012\",\"aws_partition\":\"aws\",\"aws_regions\":{\"include_only\":[\"us-east-1\"]},\"created_at\":\"2024-11-06T18:44:50.086633712Z\",\"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\":false,\"collect_cloudwatch_alarms\":false,\"tag_filters\":[{\"namespace\":\"AWS/EC2\",\"tags\":[\"key:value\"]}],\"namespace_filters\":{\"include_only\":[\"AWS/EC2\"]}},\"modified_at\":\"2024-11-06T18:44:50.086637995Z\",\"resources_config\":{\"cloud_security_posture_management_collection\":false,\"extended_collection\":false},\"traces_config\":{\"xray_services\":{\"include_only\":[\"AWS/AppSync\"]}}}}}", + "string": "{\"data\":{\"id\":\"a87fe3df-a75b-4f57-a965-685282b86ff2\",\"type\":\"account\",\"attributes\":{\"account_tags\":[\"key:value\"],\"auth_config\":{\"role_name\":\"DatadogIntegrationRole\",\"external_id\":\"2987d548e222435caced781d432c9dcd\"},\"aws_account_id\":\"123456789012\",\"aws_partition\":\"aws\",\"aws_regions\":{\"include_only\":[\"us-east-1\"]},\"created_at\":\"2024-11-14T20:08:00.791400241Z\",\"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\":false,\"collect_cloudwatch_alarms\":false,\"tag_filters\":[{\"namespace\":\"AWS/EC2\",\"tags\":[\"key:value\"]}],\"namespace_filters\":{\"include_only\":[\"AWS/EC2\"]}},\"modified_at\":\"2024-11-14T20:08:00.791404064Z\",\"resources_config\":{\"cloud_security_posture_management_collection\":false,\"extended_collection\":false},\"traces_config\":{\"xray_services\":{\"include_only\":[\"AWS/AppSync\"]}}}}}", "encoding": null }, "headers": { @@ -32,7 +32,7 @@ "message": "OK" } }, - "recorded_at": "Wed, 06 Nov 2024 18:44:49 GMT" + "recorded_at": "Thu, 14 Nov 2024 20:08:00 GMT" }, { "request": { @@ -43,7 +43,7 @@ ] }, "method": "delete", - "uri": "https://api.datadoghq.com/api/v2/integration/aws/accounts/e733f58b-b8d1-4d0c-b2f5-6438d314ca51" + "uri": "https://api.datadoghq.com/api/v2/integration/aws/accounts/a87fe3df-a75b-4f57-a965-685282b86ff2" }, "response": { "body": { @@ -56,7 +56,7 @@ "message": "No Content" } }, - "recorded_at": "Wed, 06 Nov 2024 18:44:49 GMT" + "recorded_at": "Thu, 14 Nov 2024 20:08:00 GMT" }, { "request": { @@ -67,7 +67,7 @@ ] }, "method": "delete", - "uri": "https://api.datadoghq.com/api/v2/integration/aws/accounts/e733f58b-b8d1-4d0c-b2f5-6438d314ca51" + "uri": "https://api.datadoghq.com/api/v2/integration/aws/accounts/a87fe3df-a75b-4f57-a965-685282b86ff2" }, "response": { "body": { @@ -84,7 +84,7 @@ "message": "Not Found" } }, - "recorded_at": "Wed, 06 Nov 2024 18:44:49 GMT" + "recorded_at": "Thu, 14 Nov 2024 20:08:00 GMT" } ], "recorded_with": "VCR 6.0.0" diff --git a/tests/scenarios/cassettes/v2/aws_integration/Delete-an-AWS-integration-returns-Not-Found-response.frozen b/tests/scenarios/cassettes/v2/aws_integration/Delete-an-AWS-integration-returns-Not-Found-response.frozen index abe0e4a74..e9926dc51 100644 --- a/tests/scenarios/cassettes/v2/aws_integration/Delete-an-AWS-integration-returns-Not-Found-response.frozen +++ b/tests/scenarios/cassettes/v2/aws_integration/Delete-an-AWS-integration-returns-Not-Found-response.frozen @@ -1 +1 @@ -2024-11-06T18:44:50.507Z \ No newline at end of file +2024-11-14T20:08:01.174Z \ No newline at end of file diff --git a/tests/scenarios/cassettes/v2/aws_integration/Delete-an-AWS-integration-returns-Not-Found-response.json b/tests/scenarios/cassettes/v2/aws_integration/Delete-an-AWS-integration-returns-Not-Found-response.json index cb1905636..877b37628 100644 --- a/tests/scenarios/cassettes/v2/aws_integration/Delete-an-AWS-integration-returns-Not-Found-response.json +++ b/tests/scenarios/cassettes/v2/aws_integration/Delete-an-AWS-integration-returns-Not-Found-response.json @@ -19,7 +19,7 @@ }, "response": { "body": { - "string": "{\"data\":{\"id\":\"22e02b17-0d91-46d7-a228-69f7250a9c67\",\"type\":\"account\",\"attributes\":{\"account_tags\":[\"key:value\"],\"auth_config\":{\"role_name\":\"DatadogIntegrationRole\",\"external_id\":\"7d448990acf04682b29cb61691bf86bc\"},\"aws_account_id\":\"123456789012\",\"aws_partition\":\"aws\",\"aws_regions\":{\"include_only\":[\"us-east-1\"]},\"created_at\":\"2024-11-06T18:44:51.024047931Z\",\"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\":false,\"collect_cloudwatch_alarms\":false,\"tag_filters\":[{\"namespace\":\"AWS/EC2\",\"tags\":[\"key:value\"]}],\"namespace_filters\":{\"include_only\":[\"AWS/EC2\"]}},\"modified_at\":\"2024-11-06T18:44:51.024054618Z\",\"resources_config\":{\"cloud_security_posture_management_collection\":false,\"extended_collection\":false},\"traces_config\":{\"xray_services\":{\"include_only\":[\"AWS/AppSync\"]}}}}}", + "string": "{\"data\":{\"id\":\"3b040f61-03f8-4c7c-8511-68563f0c4881\",\"type\":\"account\",\"attributes\":{\"account_tags\":[\"key:value\"],\"auth_config\":{\"role_name\":\"DatadogIntegrationRole\",\"external_id\":\"1db0bd276e134b4fbe07e1cd0525ef50\"},\"aws_account_id\":\"123456789012\",\"aws_partition\":\"aws\",\"aws_regions\":{\"include_only\":[\"us-east-1\"]},\"created_at\":\"2024-11-14T20:08:01.731532142Z\",\"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\":false,\"collect_cloudwatch_alarms\":false,\"tag_filters\":[{\"namespace\":\"AWS/EC2\",\"tags\":[\"key:value\"]}],\"namespace_filters\":{\"include_only\":[\"AWS/EC2\"]}},\"modified_at\":\"2024-11-14T20:08:01.731536786Z\",\"resources_config\":{\"cloud_security_posture_management_collection\":false,\"extended_collection\":false},\"traces_config\":{\"xray_services\":{\"include_only\":[\"AWS/AppSync\"]}}}}}", "encoding": null }, "headers": { @@ -32,7 +32,7 @@ "message": "OK" } }, - "recorded_at": "Wed, 06 Nov 2024 18:44:50 GMT" + "recorded_at": "Thu, 14 Nov 2024 20:08:01 GMT" }, { "request": { @@ -60,7 +60,7 @@ "message": "Not Found" } }, - "recorded_at": "Wed, 06 Nov 2024 18:44:50 GMT" + "recorded_at": "Thu, 14 Nov 2024 20:08:01 GMT" }, { "request": { @@ -71,7 +71,7 @@ ] }, "method": "delete", - "uri": "https://api.datadoghq.com/api/v2/integration/aws/accounts/22e02b17-0d91-46d7-a228-69f7250a9c67" + "uri": "https://api.datadoghq.com/api/v2/integration/aws/accounts/3b040f61-03f8-4c7c-8511-68563f0c4881" }, "response": { "body": { @@ -84,7 +84,7 @@ "message": "No Content" } }, - "recorded_at": "Wed, 06 Nov 2024 18:44:50 GMT" + "recorded_at": "Thu, 14 Nov 2024 20:08:01 GMT" } ], "recorded_with": "VCR 6.0.0" diff --git a/tests/scenarios/cassettes/v2/aws_integration/Generate-a-new-external-ID-returns-AWS-External-ID-object-response.frozen b/tests/scenarios/cassettes/v2/aws_integration/Generate-a-new-external-ID-returns-AWS-External-ID-object-response.frozen index 6095c7802..dcee5089a 100644 --- a/tests/scenarios/cassettes/v2/aws_integration/Generate-a-new-external-ID-returns-AWS-External-ID-object-response.frozen +++ b/tests/scenarios/cassettes/v2/aws_integration/Generate-a-new-external-ID-returns-AWS-External-ID-object-response.frozen @@ -1 +1 @@ -2024-11-06T18:44:51.500Z \ No newline at end of file +2024-11-14T20:08:02.114Z \ No newline at end of file diff --git a/tests/scenarios/cassettes/v2/aws_integration/Generate-a-new-external-ID-returns-AWS-External-ID-object-response.json b/tests/scenarios/cassettes/v2/aws_integration/Generate-a-new-external-ID-returns-AWS-External-ID-object-response.json index 5e2ec6405..55ea2f461 100644 --- a/tests/scenarios/cassettes/v2/aws_integration/Generate-a-new-external-ID-returns-AWS-External-ID-object-response.json +++ b/tests/scenarios/cassettes/v2/aws_integration/Generate-a-new-external-ID-returns-AWS-External-ID-object-response.json @@ -13,7 +13,7 @@ }, "response": { "body": { - "string": "{\"data\":{\"id\":\"external_id\",\"type\":\"external_id\",\"attributes\":{\"external_id\":\"96fc79a77c474e4f863a3c227fb91fef\"}}}", + "string": "{\"data\":{\"id\":\"417e89773bab4d459dc060836ee276be\",\"type\":\"external_id\",\"attributes\":{\"external_id\":\"417e89773bab4d459dc060836ee276be\"}}}", "encoding": null }, "headers": { @@ -26,7 +26,7 @@ "message": "OK" } }, - "recorded_at": "Wed, 06 Nov 2024 18:44:51 GMT" + "recorded_at": "Thu, 14 Nov 2024 20:08:02 GMT" } ], "recorded_with": "VCR 6.0.0" diff --git a/tests/scenarios/cassettes/v2/aws_integration/Generate-new-external-ID-returns-AWS-External-ID-object-response.frozen b/tests/scenarios/cassettes/v2/aws_integration/Generate-new-external-ID-returns-AWS-External-ID-object-response.frozen index 37cfccb87..9e3e97d76 100644 --- a/tests/scenarios/cassettes/v2/aws_integration/Generate-new-external-ID-returns-AWS-External-ID-object-response.frozen +++ b/tests/scenarios/cassettes/v2/aws_integration/Generate-new-external-ID-returns-AWS-External-ID-object-response.frozen @@ -1 +1 @@ -2024-11-06T18:44:51.871Z \ No newline at end of file +2024-11-14T20:08:02.354Z \ No newline at end of file diff --git a/tests/scenarios/cassettes/v2/aws_integration/Generate-new-external-ID-returns-AWS-External-ID-object-response.json b/tests/scenarios/cassettes/v2/aws_integration/Generate-new-external-ID-returns-AWS-External-ID-object-response.json index 162cbde45..42b5198a2 100644 --- a/tests/scenarios/cassettes/v2/aws_integration/Generate-new-external-ID-returns-AWS-External-ID-object-response.json +++ b/tests/scenarios/cassettes/v2/aws_integration/Generate-new-external-ID-returns-AWS-External-ID-object-response.json @@ -13,7 +13,7 @@ }, "response": { "body": { - "string": "{\"data\":{\"id\":\"78feee6b9c374776888068593fa8c0b9\",\"type\":\"external_id\",\"attributes\":{\"external_id\":\"78feee6b9c374776888068593fa8c0b9\"}}}", + "string": "{\"data\":{\"id\":\"02482e8953d346d8a50e512dba92bff3\",\"type\":\"external_id\",\"attributes\":{\"external_id\":\"02482e8953d346d8a50e512dba92bff3\"}}}", "encoding": null }, "headers": { @@ -26,7 +26,7 @@ "message": "OK" } }, - "recorded_at": "Wed, 06 Nov 2024 18:44:51 GMT" + "recorded_at": "Thu, 14 Nov 2024 20:08:02 GMT" } ], "recorded_with": "VCR 6.0.0" diff --git a/tests/scenarios/cassettes/v2/aws_integration/Get-an-AWS-integration-by-config-ID-returns-AWS-Account-object-response.frozen b/tests/scenarios/cassettes/v2/aws_integration/Get-an-AWS-integration-by-config-ID-returns-AWS-Account-object-response.frozen index 312117186..4959cce69 100644 --- a/tests/scenarios/cassettes/v2/aws_integration/Get-an-AWS-integration-by-config-ID-returns-AWS-Account-object-response.frozen +++ b/tests/scenarios/cassettes/v2/aws_integration/Get-an-AWS-integration-by-config-ID-returns-AWS-Account-object-response.frozen @@ -1 +1 @@ -2024-11-06T18:44:52.052Z \ No newline at end of file +2024-11-14T20:08:02.571Z \ No newline at end of file diff --git a/tests/scenarios/cassettes/v2/aws_integration/Get-an-AWS-integration-by-config-ID-returns-AWS-Account-object-response.json b/tests/scenarios/cassettes/v2/aws_integration/Get-an-AWS-integration-by-config-ID-returns-AWS-Account-object-response.json index f1f0c94b5..da07dd693 100644 --- a/tests/scenarios/cassettes/v2/aws_integration/Get-an-AWS-integration-by-config-ID-returns-AWS-Account-object-response.json +++ b/tests/scenarios/cassettes/v2/aws_integration/Get-an-AWS-integration-by-config-ID-returns-AWS-Account-object-response.json @@ -19,7 +19,7 @@ }, "response": { "body": { - "string": "{\"data\":{\"id\":\"db6c660f-0ee0-4479-b1e6-936e5faa7266\",\"type\":\"account\",\"attributes\":{\"account_tags\":[\"key:value\"],\"auth_config\":{\"role_name\":\"DatadogIntegrationRole\",\"external_id\":\"f4c8000f33f94d25bcec9afd6609bb11\"},\"aws_account_id\":\"123456789012\",\"aws_partition\":\"aws\",\"aws_regions\":{\"include_only\":[\"us-east-1\"]},\"created_at\":\"2024-11-06T18:44:52.646520994Z\",\"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\":false,\"collect_cloudwatch_alarms\":false,\"tag_filters\":[{\"namespace\":\"AWS/EC2\",\"tags\":[\"key:value\"]}],\"namespace_filters\":{\"include_only\":[\"AWS/EC2\"]}},\"modified_at\":\"2024-11-06T18:44:52.646525244Z\",\"resources_config\":{\"cloud_security_posture_management_collection\":false,\"extended_collection\":false},\"traces_config\":{\"xray_services\":{\"include_only\":[\"AWS/AppSync\"]}}}}}", + "string": "{\"data\":{\"id\":\"cb0d64ac-ca8e-4c17-9da4-02d8519b0de6\",\"type\":\"account\",\"attributes\":{\"account_tags\":[\"key:value\"],\"auth_config\":{\"role_name\":\"DatadogIntegrationRole\",\"external_id\":\"4e38efc3d9104693974dc774562c0063\"},\"aws_account_id\":\"123456789012\",\"aws_partition\":\"aws\",\"aws_regions\":{\"include_only\":[\"us-east-1\"]},\"created_at\":\"2024-11-14T20:08:03.23291721Z\",\"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\":false,\"collect_cloudwatch_alarms\":false,\"tag_filters\":[{\"namespace\":\"AWS/EC2\",\"tags\":[\"key:value\"]}],\"namespace_filters\":{\"include_only\":[\"AWS/EC2\"]}},\"modified_at\":\"2024-11-14T20:08:03.232922592Z\",\"resources_config\":{\"cloud_security_posture_management_collection\":false,\"extended_collection\":false},\"traces_config\":{\"xray_services\":{\"include_only\":[\"AWS/AppSync\"]}}}}}", "encoding": null }, "headers": { @@ -32,7 +32,7 @@ "message": "OK" } }, - "recorded_at": "Wed, 06 Nov 2024 18:44:52 GMT" + "recorded_at": "Thu, 14 Nov 2024 20:08:02 GMT" }, { "request": { @@ -43,11 +43,11 @@ ] }, "method": "get", - "uri": "https://api.datadoghq.com/api/v2/integration/aws/accounts/db6c660f-0ee0-4479-b1e6-936e5faa7266" + "uri": "https://api.datadoghq.com/api/v2/integration/aws/accounts/cb0d64ac-ca8e-4c17-9da4-02d8519b0de6" }, "response": { "body": { - "string": "{\"data\":{\"id\":\"db6c660f-0ee0-4479-b1e6-936e5faa7266\",\"type\":\"account\",\"attributes\":{\"account_tags\":[\"key:value\"],\"auth_config\":{\"role_name\":\"DatadogIntegrationRole\",\"external_id\":\"f4c8000f33f94d25bcec9afd6609bb11\"},\"aws_account_id\":\"123456789012\",\"aws_partition\":\"aws\",\"aws_regions\":{\"include_only\":[\"us-east-1\"]},\"created_at\":\"2024-11-06T18:44:52.646521Z\",\"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\":false,\"collect_cloudwatch_alarms\":false,\"tag_filters\":[{\"namespace\":\"AWS/EC2\",\"tags\":[\"key:value\"]}],\"namespace_filters\":{\"include_only\":[\"AWS/EC2\"]}},\"modified_at\":\"2024-11-06T18:44:52.646525Z\",\"resources_config\":{\"cloud_security_posture_management_collection\":false,\"extended_collection\":false},\"traces_config\":{\"xray_services\":{\"include_only\":[\"AWS/AppSync\"]}}}}}", + "string": "{\"data\":{\"id\":\"cb0d64ac-ca8e-4c17-9da4-02d8519b0de6\",\"type\":\"account\",\"attributes\":{\"account_tags\":[\"key:value\"],\"auth_config\":{\"role_name\":\"DatadogIntegrationRole\",\"external_id\":\"4e38efc3d9104693974dc774562c0063\"},\"aws_account_id\":\"123456789012\",\"aws_partition\":\"aws\",\"aws_regions\":{\"include_only\":[\"us-east-1\"]},\"created_at\":\"2024-11-14T20:08:03.232917Z\",\"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\":false,\"collect_cloudwatch_alarms\":false,\"tag_filters\":[{\"namespace\":\"AWS/EC2\",\"tags\":[\"key:value\"]}],\"namespace_filters\":{\"include_only\":[\"AWS/EC2\"]}},\"modified_at\":\"2024-11-14T20:08:03.232923Z\",\"resources_config\":{\"cloud_security_posture_management_collection\":false,\"extended_collection\":false},\"traces_config\":{\"xray_services\":{\"include_only\":[\"AWS/AppSync\"]}}}}}", "encoding": null }, "headers": { @@ -60,7 +60,7 @@ "message": "OK" } }, - "recorded_at": "Wed, 06 Nov 2024 18:44:52 GMT" + "recorded_at": "Thu, 14 Nov 2024 20:08:02 GMT" }, { "request": { @@ -71,7 +71,7 @@ ] }, "method": "delete", - "uri": "https://api.datadoghq.com/api/v2/integration/aws/accounts/db6c660f-0ee0-4479-b1e6-936e5faa7266" + "uri": "https://api.datadoghq.com/api/v2/integration/aws/accounts/cb0d64ac-ca8e-4c17-9da4-02d8519b0de6" }, "response": { "body": { @@ -84,7 +84,7 @@ "message": "No Content" } }, - "recorded_at": "Wed, 06 Nov 2024 18:44:52 GMT" + "recorded_at": "Thu, 14 Nov 2024 20:08:02 GMT" } ], "recorded_with": "VCR 6.0.0" diff --git a/tests/scenarios/cassettes/v2/aws_integration/Get-an-AWS-integration-by-config-ID-returns-Bad-Request-response.frozen b/tests/scenarios/cassettes/v2/aws_integration/Get-an-AWS-integration-by-config-ID-returns-Bad-Request-response.frozen index 8de2f0fbb..d666543c8 100644 --- a/tests/scenarios/cassettes/v2/aws_integration/Get-an-AWS-integration-by-config-ID-returns-Bad-Request-response.frozen +++ b/tests/scenarios/cassettes/v2/aws_integration/Get-an-AWS-integration-by-config-ID-returns-Bad-Request-response.frozen @@ -1 +1 @@ -2024-11-06T18:44:53.120Z \ No newline at end of file +2024-11-14T20:08:03.612Z \ No newline at end of file diff --git a/tests/scenarios/cassettes/v2/aws_integration/Get-an-AWS-integration-by-config-ID-returns-Bad-Request-response.json b/tests/scenarios/cassettes/v2/aws_integration/Get-an-AWS-integration-by-config-ID-returns-Bad-Request-response.json index aeabd67e1..66ca5ba2d 100644 --- a/tests/scenarios/cassettes/v2/aws_integration/Get-an-AWS-integration-by-config-ID-returns-Bad-Request-response.json +++ b/tests/scenarios/cassettes/v2/aws_integration/Get-an-AWS-integration-by-config-ID-returns-Bad-Request-response.json @@ -26,7 +26,7 @@ "message": "Bad Request" } }, - "recorded_at": "Wed, 06 Nov 2024 18:44:53 GMT" + "recorded_at": "Thu, 14 Nov 2024 20:08:03 GMT" } ], "recorded_with": "VCR 6.0.0" diff --git a/tests/scenarios/cassettes/v2/aws_integration/Get-an-AWS-integration-by-config-ID-returns-Not-Found-response.frozen b/tests/scenarios/cassettes/v2/aws_integration/Get-an-AWS-integration-by-config-ID-returns-Not-Found-response.frozen index 2abc18523..f611b8f08 100644 --- a/tests/scenarios/cassettes/v2/aws_integration/Get-an-AWS-integration-by-config-ID-returns-Not-Found-response.frozen +++ b/tests/scenarios/cassettes/v2/aws_integration/Get-an-AWS-integration-by-config-ID-returns-Not-Found-response.frozen @@ -1 +1 @@ -2024-11-06T18:44:53.215Z \ No newline at end of file +2024-11-14T20:08:03.716Z \ No newline at end of file diff --git a/tests/scenarios/cassettes/v2/aws_integration/Get-an-AWS-integration-by-config-ID-returns-Not-Found-response.json b/tests/scenarios/cassettes/v2/aws_integration/Get-an-AWS-integration-by-config-ID-returns-Not-Found-response.json index 3677addff..9bede1c34 100644 --- a/tests/scenarios/cassettes/v2/aws_integration/Get-an-AWS-integration-by-config-ID-returns-Not-Found-response.json +++ b/tests/scenarios/cassettes/v2/aws_integration/Get-an-AWS-integration-by-config-ID-returns-Not-Found-response.json @@ -26,7 +26,7 @@ "message": "Not Found" } }, - "recorded_at": "Wed, 06 Nov 2024 18:44:53 GMT" + "recorded_at": "Thu, 14 Nov 2024 20:08:03 GMT" } ], "recorded_with": "VCR 6.0.0" diff --git a/tests/scenarios/cassettes/v2/aws_integration/List-all-AWS-integrations-returns-AWS-Accounts-List-object-response.frozen b/tests/scenarios/cassettes/v2/aws_integration/List-all-AWS-integrations-returns-AWS-Accounts-List-object-response.frozen index 293234322..6148c770d 100644 --- a/tests/scenarios/cassettes/v2/aws_integration/List-all-AWS-integrations-returns-AWS-Accounts-List-object-response.frozen +++ b/tests/scenarios/cassettes/v2/aws_integration/List-all-AWS-integrations-returns-AWS-Accounts-List-object-response.frozen @@ -1 +1 @@ -2024-11-06T18:44:53.338Z \ No newline at end of file +2024-11-14T20:08:03.839Z \ No newline at end of file diff --git a/tests/scenarios/cassettes/v2/aws_integration/List-all-AWS-integrations-returns-AWS-Accounts-List-object-response.json b/tests/scenarios/cassettes/v2/aws_integration/List-all-AWS-integrations-returns-AWS-Accounts-List-object-response.json index c3d2b256a..73acf6ed4 100644 --- a/tests/scenarios/cassettes/v2/aws_integration/List-all-AWS-integrations-returns-AWS-Accounts-List-object-response.json +++ b/tests/scenarios/cassettes/v2/aws_integration/List-all-AWS-integrations-returns-AWS-Accounts-List-object-response.json @@ -13,7 +13,7 @@ }, "response": { "body": { - "string": "{\"data\":[{\"id\":\"e6daa8c4-58b6-42e1-970e-44e6fa812ce0\",\"type\":\"account\",\"attributes\":{\"account_tags\":[],\"auth_config\":{\"access_key_id\":\"AKIA514950102505\"},\"aws_account_id\":\"514950102505\",\"aws_partition\":\"aws\",\"aws_regions\":{\"include_all\":true},\"created_at\":\"2024-09-06T00:18:12.382448Z\",\"logs_config\":{\"lambda_forwarder\":{\"lambdas\":[\"arn:aws:lambda:us-east-1:1234567890:function:datadog-forwarder-Forwarder\"],\"sources\":[]}},\"metrics_config\":{\"enabled\":true,\"automute_enabled\":true,\"collect_custom_metrics\":false,\"collect_cloudwatch_alarms\":false,\"tag_filters\":[],\"namespace_filters\":{\"exclude_only\":[\"AWS/ElasticMapReduce\",\"AWS/SQS\"]}},\"modified_at\":\"2024-09-06T00:18:17.536561Z\",\"resources_config\":{\"cloud_security_posture_management_collection\":false,\"extended_collection\":false},\"traces_config\":{\"xray_services\":{\"include_only\":[]}}}},{\"id\":\"a0c7f96e-a471-488e-84be-c3336e7ab693\",\"type\":\"account\",\"attributes\":{\"account_tags\":[\"$KEY:$VALUE\"],\"auth_config\":{\"role_name\":\"DatadogAWSIntegrationRole\",\"external_id\":\"859ffc73702c40f589cc3b74c5967e27\"},\"aws_account_id\":\"172830950700\",\"aws_partition\":\"aws\",\"aws_regions\":{\"include_only\":[\"us-east-2\",\"us-west-1\",\"eu-west-1\",\"eu-central-1\",\"ap-southeast-1\",\"ap-southeast-2\",\"ap-northeast-1\",\"ap-northeast-2\",\"ap-northeast-3\",\"sa-east-1\",\"ap-south-1\",\"ca-central-1\",\"eu-west-2\",\"eu-west-3\",\"eu-north-1\",\"af-south-1\",\"ap-east-1\",\"ap-south-2\",\"ap-southeast-3\",\"ap-southeast-4\",\"ap-southeast-5\",\"ca-west-1\",\"eu-central-2\",\"eu-south-1\",\"eu-south-2\",\"il-central-1\",\"me-central-1\",\"me-south-1\"]},\"created_at\":\"2024-10-07T13:58:28.577522Z\",\"logs_config\":{\"lambda_forwarder\":{\"lambdas\":[],\"sources\":[]}},\"metrics_config\":{\"enabled\":false,\"automute_enabled\":true,\"collect_custom_metrics\":false,\"collect_cloudwatch_alarms\":false,\"tag_filters\":[{\"namespace\":\"AWS/EC2\",\"tags\":[\"$KEY:$VALUE\"]}],\"namespace_filters\":{\"exclude_only\":[\"AWS/AutoScaling\",\"AWS/ElasticMapReduce\",\"AWS/SQS\"]}},\"modified_at\":\"2024-10-07T13:58:28.577526Z\",\"resources_config\":{\"cloud_security_posture_management_collection\":true,\"extended_collection\":true},\"traces_config\":{\"xray_services\":{\"include_only\":[]}}}},{\"id\":\"3a3d5b83-2ad8-41d8-b82e-a3ba972a9783\",\"type\":\"account\",\"attributes\":{\"account_tags\":[\"$KEY:$VALUE\"],\"auth_config\":{\"role_name\":\"DatadogAWSIntegrationRole\",\"external_id\":\"be10a93f33a64b0ea872da2f48348979\"},\"aws_account_id\":\"172704974400\",\"aws_partition\":\"aws\",\"aws_regions\":{\"include_only\":[\"us-east-2\",\"us-west-1\",\"eu-west-1\",\"eu-central-1\",\"ap-southeast-1\",\"ap-southeast-2\",\"ap-northeast-1\",\"ap-northeast-2\",\"ap-northeast-3\",\"sa-east-1\",\"ap-south-1\",\"ca-central-1\",\"eu-west-2\",\"eu-west-3\",\"eu-north-1\",\"af-south-1\",\"ap-east-1\",\"ap-south-2\",\"ap-southeast-3\",\"ap-southeast-4\",\"ap-southeast-5\",\"ca-west-1\",\"eu-central-2\",\"eu-south-1\",\"eu-south-2\",\"il-central-1\",\"me-central-1\",\"me-south-1\"]},\"created_at\":\"2024-09-23T00:02:26.306293Z\",\"logs_config\":{\"lambda_forwarder\":{\"lambdas\":[],\"sources\":[]}},\"metrics_config\":{\"enabled\":false,\"automute_enabled\":true,\"collect_custom_metrics\":false,\"collect_cloudwatch_alarms\":false,\"tag_filters\":[{\"namespace\":\"AWS/EC2\",\"tags\":[\"$KEY:$VALUE\"]}],\"namespace_filters\":{\"exclude_only\":[\"AWS/AutoScaling\",\"AWS/ElasticMapReduce\",\"AWS/SQS\"]}},\"modified_at\":\"2024-09-23T00:02:26.306297Z\",\"resources_config\":{\"cloud_security_posture_management_collection\":true,\"extended_collection\":true},\"traces_config\":{\"xray_services\":{\"include_only\":[]}}}},{\"id\":\"89a9dae5-cbe3-4fba-b1b2-aae8775ed319\",\"type\":\"account\",\"attributes\":{\"account_tags\":[\"filter:one\",\"filtertwo\"],\"auth_config\":{\"role_name\":\"DatadogAWSIntegrationRole\",\"external_id\":\"e31ada331546486f9099cd5c01eef257\"},\"aws_account_id\":\"001725901256\",\"aws_partition\":\"aws\",\"aws_regions\":{\"include_only\":[\"us-east-2\",\"us-west-2\",\"eu-west-1\",\"eu-central-1\",\"ap-southeast-1\",\"ap-southeast-2\",\"ap-northeast-1\",\"ap-northeast-2\",\"ap-northeast-3\",\"sa-east-1\",\"ap-south-1\",\"ca-central-1\",\"eu-west-2\",\"eu-west-3\",\"eu-north-1\",\"af-south-1\",\"ap-east-1\",\"ap-south-2\",\"ap-southeast-3\",\"ap-southeast-4\",\"ca-west-1\",\"eu-central-2\",\"eu-south-1\",\"eu-south-2\",\"il-central-1\",\"me-central-1\",\"me-south-1\"]},\"created_at\":\"2024-09-09T17:00:58.823444Z\",\"logs_config\":{\"lambda_forwarder\":{\"lambdas\":[],\"sources\":[]}},\"metrics_config\":{\"enabled\":true,\"automute_enabled\":true,\"collect_custom_metrics\":false,\"collect_cloudwatch_alarms\":false,\"tag_filters\":[{\"namespace\":\"AWS/EC2\",\"tags\":[\"testTag\",\"test:Tag2\"]}],\"namespace_filters\":{\"exclude_only\":[\"AWS/ElasticMapReduce\",\"AWS/SQS\"]}},\"modified_at\":\"2024-10-16T14:55:17.947931Z\",\"resources_config\":{\"cloud_security_posture_management_collection\":false},\"traces_config\":{\"xray_services\":{\"include_only\":[]}}}},{\"id\":\"7e1d660d-1142-45b1-a795-dc3900b6bd17\",\"type\":\"account\",\"attributes\":{\"account_tags\":[\"$KEY:$VALUE\"],\"auth_config\":{\"role_name\":\"DatadogAWSIntegrationRole\",\"external_id\":\"f61b52d768394db6851aed2f887ac6f6\"},\"aws_account_id\":\"172830950701\",\"aws_partition\":\"aws\",\"aws_regions\":{\"include_only\":[\"me-south-1\"]},\"created_at\":\"2024-10-17T15:08:40.917209Z\",\"logs_config\":{\"lambda_forwarder\":{\"lambdas\":[],\"sources\":[]}},\"metrics_config\":{\"enabled\":false,\"automute_enabled\":true,\"collect_custom_metrics\":false,\"collect_cloudwatch_alarms\":false,\"tag_filters\":[{\"namespace\":\"AWS/EC2\",\"tags\":[\"$KEY:$VALUE\"]}],\"namespace_filters\":{\"exclude_only\":[\"AWS/AutoScaling\",\"AWS/ElasticMapReduce\",\"AWS/SQS\"]}},\"modified_at\":\"2024-10-18T20:19:53.960435Z\",\"resources_config\":{\"cloud_security_posture_management_collection\":true,\"extended_collection\":true},\"traces_config\":{\"xray_services\":{\"include_only\":[]}}}},{\"id\":\"d52e151c-c608-4e14-9f29-dfeff876bb39\",\"type\":\"account\",\"attributes\":{\"account_tags\":[\"$KEY:$VALUE\"],\"auth_config\":{\"role_name\":\"DatadogAWSIntegrationRole\",\"external_id\":\"c2909403ca9949db82c36adf6e8cdcfa\"},\"aws_account_id\":\"172772261200\",\"aws_partition\":\"aws\",\"aws_regions\":{\"include_only\":[\"us-east-2\",\"us-west-1\",\"eu-west-1\",\"eu-central-1\",\"ap-southeast-1\",\"ap-southeast-2\",\"ap-northeast-1\",\"ap-northeast-2\",\"ap-northeast-3\",\"sa-east-1\",\"ap-south-1\",\"ca-central-1\",\"eu-west-2\",\"eu-west-3\",\"eu-north-1\",\"af-south-1\",\"ap-east-1\",\"ap-south-2\",\"ap-southeast-3\",\"ap-southeast-4\",\"ap-southeast-5\",\"ca-west-1\",\"eu-central-2\",\"eu-south-1\",\"eu-south-2\",\"il-central-1\",\"me-central-1\",\"me-south-1\"]},\"created_at\":\"2024-09-30T18:56:55.042771Z\",\"logs_config\":{\"lambda_forwarder\":{\"lambdas\":[],\"sources\":[]}},\"metrics_config\":{\"enabled\":false,\"automute_enabled\":true,\"collect_custom_metrics\":false,\"collect_cloudwatch_alarms\":false,\"tag_filters\":[{\"namespace\":\"AWS/EC2\",\"tags\":[\"$KEY:$VALUE\"]}],\"namespace_filters\":{\"exclude_only\":[\"AWS/AutoScaling\",\"AWS/ElasticMapReduce\",\"AWS/SQS\"]}},\"modified_at\":\"2024-09-30T18:56:55.042775Z\",\"resources_config\":{\"cloud_security_posture_management_collection\":true,\"extended_collection\":true},\"traces_config\":{\"xray_services\":{\"include_only\":[]}}}},{\"id\":\"d7d74617-832d-4c4d-a8c3-1e69d509ea52\",\"type\":\"account\",\"attributes\":{\"account_tags\":[\"$KEY:$VALUE\"],\"auth_config\":{\"role_name\":\"DatadogAWSIntegrationRole\",\"external_id\":\"2b1dd9fd35b0440ca4bf98ff70ac2e63\"},\"aws_account_id\":\"172772275700\",\"aws_partition\":\"aws\",\"aws_regions\":{\"include_only\":[\"us-east-2\",\"us-west-1\",\"eu-west-1\",\"eu-central-1\",\"ap-southeast-1\",\"ap-southeast-2\",\"ap-northeast-1\",\"ap-northeast-2\",\"ap-northeast-3\",\"sa-east-1\",\"ap-south-1\",\"ca-central-1\",\"eu-west-2\",\"eu-west-3\",\"eu-north-1\",\"af-south-1\",\"ap-east-1\",\"ap-south-2\",\"ap-southeast-3\",\"ap-southeast-4\",\"ap-southeast-5\",\"ca-west-1\",\"eu-central-2\",\"eu-south-1\",\"eu-south-2\",\"il-central-1\",\"me-central-1\",\"me-south-1\"]},\"created_at\":\"2024-09-30T18:59:18.175722Z\",\"logs_config\":{\"lambda_forwarder\":{\"lambdas\":[],\"sources\":[]}},\"metrics_config\":{\"enabled\":false,\"automute_enabled\":true,\"collect_custom_metrics\":false,\"collect_cloudwatch_alarms\":false,\"tag_filters\":[{\"namespace\":\"AWS/EC2\",\"tags\":[\"$KEY:$VALUE\"]}],\"namespace_filters\":{\"exclude_only\":[\"AWS/AutoScaling\",\"AWS/ElasticMapReduce\",\"AWS/SQS\"]}},\"modified_at\":\"2024-09-30T18:59:18.175727Z\",\"resources_config\":{\"cloud_security_posture_management_collection\":true,\"extended_collection\":true},\"traces_config\":{\"xray_services\":{\"include_only\":[]}}}},{\"id\":\"7e5acac6-3ac8-4762-8100-479f03ccffc8\",\"type\":\"account\",\"attributes\":{\"account_tags\":[\"$KEY:$VALUE\"],\"auth_config\":{\"role_name\":\"DatadogAWSIntegrationRole\",\"external_id\":\"04548a334583412aa4e6f5548f4e9989\"},\"aws_account_id\":\"172532181900\",\"aws_partition\":\"aws\",\"aws_regions\":{\"include_only\":[\"us-east-2\",\"us-west-1\",\"eu-west-1\",\"eu-central-1\",\"ap-southeast-1\",\"ap-southeast-2\",\"ap-northeast-1\",\"ap-northeast-2\",\"ap-northeast-3\",\"sa-east-1\",\"ap-south-1\",\"ca-central-1\",\"eu-west-2\",\"eu-west-3\",\"eu-north-1\",\"af-south-1\",\"ap-east-1\",\"ap-south-2\",\"ap-southeast-3\",\"ap-southeast-4\",\"ca-west-1\",\"eu-central-2\",\"eu-south-1\",\"eu-south-2\",\"il-central-1\",\"me-central-1\",\"me-south-1\"]},\"created_at\":\"2024-09-03T00:03:40.248176Z\",\"logs_config\":{\"lambda_forwarder\":{\"lambdas\":[],\"sources\":[]}},\"metrics_config\":{\"enabled\":false,\"automute_enabled\":true,\"collect_custom_metrics\":false,\"collect_cloudwatch_alarms\":false,\"tag_filters\":[{\"namespace\":\"AWS/EC2\",\"tags\":[\"$KEY:$VALUE\"]}],\"namespace_filters\":{\"exclude_only\":[\"AWS/AutoScaling\",\"AWS/ElasticMapReduce\",\"AWS/SQS\"]}},\"modified_at\":\"2024-09-03T00:03:40.24818Z\",\"resources_config\":{\"cloud_security_posture_management_collection\":true,\"extended_collection\":true},\"traces_config\":{\"xray_services\":{\"include_only\":[]}}}}]}", + "string": "{\"data\":[{\"id\":\"90487717-edc3-4f3f-bee4-b8d11ef49494\",\"type\":\"account\",\"attributes\":{\"account_tags\":[\"$KEY:$VALUE\"],\"auth_config\":{\"role_name\":\"DatadogAWSIntegrationRole\",\"external_id\":\"7bf95a4064e7426e8498ffb66f8f9dca\"},\"aws_account_id\":\"173154855500\",\"aws_partition\":\"aws\",\"aws_regions\":{\"include_only\":[\"us-east-2\",\"us-west-1\",\"eu-west-1\",\"eu-central-1\",\"ap-southeast-1\",\"ap-southeast-2\",\"ap-northeast-1\",\"ap-northeast-2\",\"ap-northeast-3\",\"sa-east-1\",\"ap-south-1\",\"ca-central-1\",\"eu-west-2\",\"eu-west-3\",\"eu-north-1\",\"af-south-1\",\"ap-east-1\",\"ap-south-2\",\"ap-southeast-3\",\"ap-southeast-4\",\"ap-southeast-5\",\"ca-west-1\",\"eu-central-2\",\"eu-south-1\",\"eu-south-2\",\"il-central-1\",\"me-central-1\",\"me-south-1\"]},\"created_at\":\"2024-11-14T01:42:36.223632Z\",\"logs_config\":{\"lambda_forwarder\":{\"lambdas\":[],\"sources\":[]}},\"metrics_config\":{\"enabled\":false,\"automute_enabled\":true,\"collect_custom_metrics\":false,\"collect_cloudwatch_alarms\":false,\"tag_filters\":[{\"namespace\":\"AWS/EC2\",\"tags\":[\"$KEY:$VALUE\"]}],\"namespace_filters\":{\"exclude_only\":[\"AWS/AutoScaling\",\"AWS/ElasticMapReduce\",\"AWS/SQS\"]}},\"modified_at\":\"2024-11-14T01:42:36.223638Z\",\"resources_config\":{\"cloud_security_posture_management_collection\":true,\"extended_collection\":true},\"traces_config\":{\"xray_services\":{\"include_only\":[]}}}},{\"id\":\"e6daa8c4-58b6-42e1-970e-44e6fa812ce0\",\"type\":\"account\",\"attributes\":{\"account_tags\":[],\"auth_config\":{\"access_key_id\":\"AKIA514950102505\"},\"aws_account_id\":\"514950102505\",\"aws_partition\":\"aws\",\"aws_regions\":{\"include_all\":true},\"created_at\":\"2024-09-06T00:18:12.382448Z\",\"logs_config\":{\"lambda_forwarder\":{\"lambdas\":[\"arn:aws:lambda:us-east-1:1234567890:function:datadog-forwarder-Forwarder\"],\"sources\":[]}},\"metrics_config\":{\"enabled\":true,\"automute_enabled\":true,\"collect_custom_metrics\":false,\"collect_cloudwatch_alarms\":false,\"tag_filters\":[],\"namespace_filters\":{\"exclude_only\":[\"AWS/ElasticMapReduce\",\"AWS/SQS\"]}},\"modified_at\":\"2024-09-06T00:18:17.536561Z\",\"resources_config\":{\"cloud_security_posture_management_collection\":false,\"extended_collection\":false},\"traces_config\":{\"xray_services\":{\"include_only\":[]}}}},{\"id\":\"a0c7f96e-a471-488e-84be-c3336e7ab693\",\"type\":\"account\",\"attributes\":{\"account_tags\":[\"$KEY:$VALUE\"],\"auth_config\":{\"role_name\":\"DatadogAWSIntegrationRole\",\"external_id\":\"859ffc73702c40f589cc3b74c5967e27\"},\"aws_account_id\":\"172830950700\",\"aws_partition\":\"aws\",\"aws_regions\":{\"include_only\":[\"us-east-2\",\"us-west-1\",\"eu-west-1\",\"eu-central-1\",\"ap-southeast-1\",\"ap-southeast-2\",\"ap-northeast-1\",\"ap-northeast-2\",\"ap-northeast-3\",\"sa-east-1\",\"ap-south-1\",\"ca-central-1\",\"eu-west-2\",\"eu-west-3\",\"eu-north-1\",\"af-south-1\",\"ap-east-1\",\"ap-south-2\",\"ap-southeast-3\",\"ap-southeast-4\",\"ap-southeast-5\",\"ca-west-1\",\"eu-central-2\",\"eu-south-1\",\"eu-south-2\",\"il-central-1\",\"me-central-1\",\"me-south-1\"]},\"created_at\":\"2024-10-07T13:58:28.577522Z\",\"logs_config\":{\"lambda_forwarder\":{\"lambdas\":[],\"sources\":[]}},\"metrics_config\":{\"enabled\":false,\"automute_enabled\":true,\"collect_custom_metrics\":false,\"collect_cloudwatch_alarms\":false,\"tag_filters\":[{\"namespace\":\"AWS/EC2\",\"tags\":[\"$KEY:$VALUE\"]}],\"namespace_filters\":{\"exclude_only\":[\"AWS/AutoScaling\",\"AWS/ElasticMapReduce\",\"AWS/SQS\"]}},\"modified_at\":\"2024-10-07T13:58:28.577526Z\",\"resources_config\":{\"cloud_security_posture_management_collection\":true,\"extended_collection\":true},\"traces_config\":{\"xray_services\":{\"include_only\":[]}}}},{\"id\":\"3a3d5b83-2ad8-41d8-b82e-a3ba972a9783\",\"type\":\"account\",\"attributes\":{\"account_tags\":[\"$KEY:$VALUE\"],\"auth_config\":{\"role_name\":\"DatadogAWSIntegrationRole\",\"external_id\":\"be10a93f33a64b0ea872da2f48348979\"},\"aws_account_id\":\"172704974400\",\"aws_partition\":\"aws\",\"aws_regions\":{\"include_only\":[\"us-east-2\",\"us-west-1\",\"eu-west-1\",\"eu-central-1\",\"ap-southeast-1\",\"ap-southeast-2\",\"ap-northeast-1\",\"ap-northeast-2\",\"ap-northeast-3\",\"sa-east-1\",\"ap-south-1\",\"ca-central-1\",\"eu-west-2\",\"eu-west-3\",\"eu-north-1\",\"af-south-1\",\"ap-east-1\",\"ap-south-2\",\"ap-southeast-3\",\"ap-southeast-4\",\"ap-southeast-5\",\"ca-west-1\",\"eu-central-2\",\"eu-south-1\",\"eu-south-2\",\"il-central-1\",\"me-central-1\",\"me-south-1\"]},\"created_at\":\"2024-09-23T00:02:26.306293Z\",\"logs_config\":{\"lambda_forwarder\":{\"lambdas\":[],\"sources\":[]}},\"metrics_config\":{\"enabled\":false,\"automute_enabled\":true,\"collect_custom_metrics\":false,\"collect_cloudwatch_alarms\":false,\"tag_filters\":[{\"namespace\":\"AWS/EC2\",\"tags\":[\"$KEY:$VALUE\"]}],\"namespace_filters\":{\"exclude_only\":[\"AWS/AutoScaling\",\"AWS/ElasticMapReduce\",\"AWS/SQS\"]}},\"modified_at\":\"2024-09-23T00:02:26.306297Z\",\"resources_config\":{\"cloud_security_posture_management_collection\":true,\"extended_collection\":true},\"traces_config\":{\"xray_services\":{\"include_only\":[]}}}},{\"id\":\"89a9dae5-cbe3-4fba-b1b2-aae8775ed319\",\"type\":\"account\",\"attributes\":{\"account_tags\":[\"filter:one\",\"filtertwo\"],\"auth_config\":{\"role_name\":\"DatadogAWSIntegrationRole\",\"external_id\":\"e31ada331546486f9099cd5c01eef257\"},\"aws_account_id\":\"001725901256\",\"aws_partition\":\"aws\",\"aws_regions\":{\"include_only\":[\"us-east-2\",\"us-west-2\",\"eu-west-1\",\"eu-central-1\",\"ap-southeast-1\",\"ap-southeast-2\",\"ap-northeast-1\",\"ap-northeast-2\",\"ap-northeast-3\",\"sa-east-1\",\"ap-south-1\",\"ca-central-1\",\"eu-west-2\",\"eu-west-3\",\"eu-north-1\",\"af-south-1\",\"ap-east-1\",\"ap-south-2\",\"ap-southeast-3\",\"ap-southeast-4\",\"ca-west-1\",\"eu-central-2\",\"eu-south-1\",\"eu-south-2\",\"il-central-1\",\"me-central-1\",\"me-south-1\"]},\"created_at\":\"2024-09-09T17:00:58.823444Z\",\"logs_config\":{\"lambda_forwarder\":{\"lambdas\":[],\"sources\":[]}},\"metrics_config\":{\"enabled\":true,\"automute_enabled\":true,\"collect_custom_metrics\":false,\"collect_cloudwatch_alarms\":false,\"tag_filters\":[{\"namespace\":\"AWS/EC2\",\"tags\":[\"testTag\",\"test:Tag2\"]}],\"namespace_filters\":{\"exclude_only\":[\"AWS/ElasticMapReduce\",\"AWS/SQS\"]}},\"modified_at\":\"2024-10-16T14:55:17.947931Z\",\"resources_config\":{\"cloud_security_posture_management_collection\":false},\"traces_config\":{\"xray_services\":{\"include_only\":[]}}}},{\"id\":\"7e1d660d-1142-45b1-a795-dc3900b6bd17\",\"type\":\"account\",\"attributes\":{\"account_tags\":[\"$KEY:$VALUE\"],\"auth_config\":{\"role_name\":\"DatadogAWSIntegrationRole\",\"external_id\":\"f61b52d768394db6851aed2f887ac6f6\"},\"aws_account_id\":\"172830950701\",\"aws_partition\":\"aws\",\"aws_regions\":{\"include_only\":[\"me-south-1\"]},\"created_at\":\"2024-10-17T15:08:40.917209Z\",\"logs_config\":{\"lambda_forwarder\":{\"lambdas\":[],\"sources\":[]}},\"metrics_config\":{\"enabled\":false,\"automute_enabled\":true,\"collect_custom_metrics\":false,\"collect_cloudwatch_alarms\":false,\"tag_filters\":[{\"namespace\":\"AWS/EC2\",\"tags\":[\"$KEY:$VALUE\"]}],\"namespace_filters\":{\"exclude_only\":[\"AWS/AutoScaling\",\"AWS/ElasticMapReduce\",\"AWS/SQS\"]}},\"modified_at\":\"2024-10-18T20:19:53.960435Z\",\"resources_config\":{\"cloud_security_posture_management_collection\":true,\"extended_collection\":true},\"traces_config\":{\"xray_services\":{\"include_only\":[]}}}},{\"id\":\"d52e151c-c608-4e14-9f29-dfeff876bb39\",\"type\":\"account\",\"attributes\":{\"account_tags\":[\"$KEY:$VALUE\"],\"auth_config\":{\"role_name\":\"DatadogAWSIntegrationRole\",\"external_id\":\"c2909403ca9949db82c36adf6e8cdcfa\"},\"aws_account_id\":\"172772261200\",\"aws_partition\":\"aws\",\"aws_regions\":{\"include_only\":[\"us-east-2\",\"us-west-1\",\"eu-west-1\",\"eu-central-1\",\"ap-southeast-1\",\"ap-southeast-2\",\"ap-northeast-1\",\"ap-northeast-2\",\"ap-northeast-3\",\"sa-east-1\",\"ap-south-1\",\"ca-central-1\",\"eu-west-2\",\"eu-west-3\",\"eu-north-1\",\"af-south-1\",\"ap-east-1\",\"ap-south-2\",\"ap-southeast-3\",\"ap-southeast-4\",\"ap-southeast-5\",\"ca-west-1\",\"eu-central-2\",\"eu-south-1\",\"eu-south-2\",\"il-central-1\",\"me-central-1\",\"me-south-1\"]},\"created_at\":\"2024-09-30T18:56:55.042771Z\",\"logs_config\":{\"lambda_forwarder\":{\"lambdas\":[],\"sources\":[]}},\"metrics_config\":{\"enabled\":false,\"automute_enabled\":true,\"collect_custom_metrics\":false,\"collect_cloudwatch_alarms\":false,\"tag_filters\":[{\"namespace\":\"AWS/EC2\",\"tags\":[\"$KEY:$VALUE\"]}],\"namespace_filters\":{\"exclude_only\":[\"AWS/AutoScaling\",\"AWS/ElasticMapReduce\",\"AWS/SQS\"]}},\"modified_at\":\"2024-09-30T18:56:55.042775Z\",\"resources_config\":{\"cloud_security_posture_management_collection\":true,\"extended_collection\":true},\"traces_config\":{\"xray_services\":{\"include_only\":[]}}}},{\"id\":\"d7d74617-832d-4c4d-a8c3-1e69d509ea52\",\"type\":\"account\",\"attributes\":{\"account_tags\":[\"$KEY:$VALUE\"],\"auth_config\":{\"role_name\":\"DatadogAWSIntegrationRole\",\"external_id\":\"2b1dd9fd35b0440ca4bf98ff70ac2e63\"},\"aws_account_id\":\"172772275700\",\"aws_partition\":\"aws\",\"aws_regions\":{\"include_only\":[\"us-east-2\",\"us-west-1\",\"eu-west-1\",\"eu-central-1\",\"ap-southeast-1\",\"ap-southeast-2\",\"ap-northeast-1\",\"ap-northeast-2\",\"ap-northeast-3\",\"sa-east-1\",\"ap-south-1\",\"ca-central-1\",\"eu-west-2\",\"eu-west-3\",\"eu-north-1\",\"af-south-1\",\"ap-east-1\",\"ap-south-2\",\"ap-southeast-3\",\"ap-southeast-4\",\"ap-southeast-5\",\"ca-west-1\",\"eu-central-2\",\"eu-south-1\",\"eu-south-2\",\"il-central-1\",\"me-central-1\",\"me-south-1\"]},\"created_at\":\"2024-09-30T18:59:18.175722Z\",\"logs_config\":{\"lambda_forwarder\":{\"lambdas\":[],\"sources\":[]}},\"metrics_config\":{\"enabled\":false,\"automute_enabled\":true,\"collect_custom_metrics\":false,\"collect_cloudwatch_alarms\":false,\"tag_filters\":[{\"namespace\":\"AWS/EC2\",\"tags\":[\"$KEY:$VALUE\"]}],\"namespace_filters\":{\"exclude_only\":[\"AWS/AutoScaling\",\"AWS/ElasticMapReduce\",\"AWS/SQS\"]}},\"modified_at\":\"2024-09-30T18:59:18.175727Z\",\"resources_config\":{\"cloud_security_posture_management_collection\":true,\"extended_collection\":true},\"traces_config\":{\"xray_services\":{\"include_only\":[]}}}},{\"id\":\"7e5acac6-3ac8-4762-8100-479f03ccffc8\",\"type\":\"account\",\"attributes\":{\"account_tags\":[\"$KEY:$VALUE\"],\"auth_config\":{\"role_name\":\"DatadogAWSIntegrationRole\",\"external_id\":\"04548a334583412aa4e6f5548f4e9989\"},\"aws_account_id\":\"172532181900\",\"aws_partition\":\"aws\",\"aws_regions\":{\"include_only\":[\"us-east-2\",\"us-west-1\",\"eu-west-1\",\"eu-central-1\",\"ap-southeast-1\",\"ap-southeast-2\",\"ap-northeast-1\",\"ap-northeast-2\",\"ap-northeast-3\",\"sa-east-1\",\"ap-south-1\",\"ca-central-1\",\"eu-west-2\",\"eu-west-3\",\"eu-north-1\",\"af-south-1\",\"ap-east-1\",\"ap-south-2\",\"ap-southeast-3\",\"ap-southeast-4\",\"ca-west-1\",\"eu-central-2\",\"eu-south-1\",\"eu-south-2\",\"il-central-1\",\"me-central-1\",\"me-south-1\"]},\"created_at\":\"2024-09-03T00:03:40.248176Z\",\"logs_config\":{\"lambda_forwarder\":{\"lambdas\":[],\"sources\":[]}},\"metrics_config\":{\"enabled\":false,\"automute_enabled\":true,\"collect_custom_metrics\":false,\"collect_cloudwatch_alarms\":false,\"tag_filters\":[{\"namespace\":\"AWS/EC2\",\"tags\":[\"$KEY:$VALUE\"]}],\"namespace_filters\":{\"exclude_only\":[\"AWS/AutoScaling\",\"AWS/ElasticMapReduce\",\"AWS/SQS\"]}},\"modified_at\":\"2024-09-03T00:03:40.24818Z\",\"resources_config\":{\"cloud_security_posture_management_collection\":true,\"extended_collection\":true},\"traces_config\":{\"xray_services\":{\"include_only\":[]}}}},{\"id\":\"bcb235b2-b123-4535-9cda-216b8cbc7bbf\",\"type\":\"account\",\"attributes\":{\"account_tags\":[],\"auth_config\":{\"role_name\":\"testacc-datadog-integration-role\",\"external_id\":\"c5e2342b15064065855f8a2d62b7ef1a\"},\"aws_account_id\":\"101515698539\",\"aws_partition\":\"aws\",\"aws_regions\":{\"include_all\":true},\"created_at\":\"2024-11-13T19:25:47.575229Z\",\"logs_config\":{\"lambda_forwarder\":{\"lambdas\":[],\"sources\":[]}},\"metrics_config\":{\"enabled\":true,\"automute_enabled\":true,\"collect_custom_metrics\":false,\"collect_cloudwatch_alarms\":false,\"tag_filters\":[],\"namespace_filters\":{\"exclude_only\":[\"AWS/ElasticMapReduce\",\"AWS/SQS\"]}},\"modified_at\":\"2024-11-13T19:25:47.575234Z\",\"resources_config\":{\"cloud_security_posture_management_collection\":false,\"extended_collection\":false},\"traces_config\":{\"xray_services\":{\"include_only\":[]}}}},{\"id\":\"690e414b-037e-41a6-b8b4-80370fa6d258\",\"type\":\"account\",\"attributes\":{\"account_tags\":[],\"auth_config\":{\"role_name\":\"testacc-datadog-integration-role\",\"external_id\":\"8d8512965ed944e89c4c06f7d584f7cd\"},\"aws_account_id\":\"995010056565\",\"aws_partition\":\"aws\",\"aws_regions\":{\"include_all\":true},\"created_at\":\"2024-11-13T19:25:49.327842Z\",\"logs_config\":{\"lambda_forwarder\":{\"lambdas\":[],\"sources\":[]}},\"metrics_config\":{\"enabled\":true,\"automute_enabled\":true,\"collect_custom_metrics\":false,\"collect_cloudwatch_alarms\":false,\"tag_filters\":[],\"namespace_filters\":{\"exclude_only\":[\"AWS/ElasticMapReduce\",\"AWS/SQS\"]}},\"modified_at\":\"2024-11-13T19:25:49.327848Z\",\"resources_config\":{\"cloud_security_posture_management_collection\":false,\"extended_collection\":false},\"traces_config\":{\"xray_services\":{\"include_only\":[]}}}}]}", "encoding": null }, "headers": { @@ -26,7 +26,7 @@ "message": "OK" } }, - "recorded_at": "Wed, 06 Nov 2024 18:44:53 GMT" + "recorded_at": "Thu, 14 Nov 2024 20:08:03 GMT" } ], "recorded_with": "VCR 6.0.0" diff --git a/tests/scenarios/cassettes/v2/aws_integration/List-available-namespaces-returns-AWS-Namespaces-List-object-response.frozen b/tests/scenarios/cassettes/v2/aws_integration/List-available-namespaces-returns-AWS-Namespaces-List-object-response.frozen index e1b33d2db..1c8531611 100644 --- a/tests/scenarios/cassettes/v2/aws_integration/List-available-namespaces-returns-AWS-Namespaces-List-object-response.frozen +++ b/tests/scenarios/cassettes/v2/aws_integration/List-available-namespaces-returns-AWS-Namespaces-List-object-response.frozen @@ -1 +1 @@ -2024-11-06T18:44:53.502Z \ No newline at end of file +2024-11-14T20:08:04.012Z \ No newline at end of file diff --git a/tests/scenarios/cassettes/v2/aws_integration/List-available-namespaces-returns-AWS-Namespaces-List-object-response.json b/tests/scenarios/cassettes/v2/aws_integration/List-available-namespaces-returns-AWS-Namespaces-List-object-response.json index ef703ea7f..f93343b9a 100644 --- a/tests/scenarios/cassettes/v2/aws_integration/List-available-namespaces-returns-AWS-Namespaces-List-object-response.json +++ b/tests/scenarios/cassettes/v2/aws_integration/List-available-namespaces-returns-AWS-Namespaces-List-object-response.json @@ -26,7 +26,7 @@ "message": "OK" } }, - "recorded_at": "Wed, 06 Nov 2024 18:44:53 GMT" + "recorded_at": "Thu, 14 Nov 2024 20:08:04 GMT" } ], "recorded_with": "VCR 6.0.0" diff --git a/tests/scenarios/cassettes/v2/aws_integration/List-namespaces-returns-AWS-Namespaces-List-object-response.frozen b/tests/scenarios/cassettes/v2/aws_integration/List-namespaces-returns-AWS-Namespaces-List-object-response.frozen index f663dde1f..4846f88f7 100644 --- a/tests/scenarios/cassettes/v2/aws_integration/List-namespaces-returns-AWS-Namespaces-List-object-response.frozen +++ b/tests/scenarios/cassettes/v2/aws_integration/List-namespaces-returns-AWS-Namespaces-List-object-response.frozen @@ -1 +1 @@ -2024-11-06T18:44:53.574Z \ No newline at end of file +2024-11-14T20:08:04.107Z \ No newline at end of file diff --git a/tests/scenarios/cassettes/v2/aws_integration/List-namespaces-returns-AWS-Namespaces-List-object-response.json b/tests/scenarios/cassettes/v2/aws_integration/List-namespaces-returns-AWS-Namespaces-List-object-response.json index ef703ea7f..f93343b9a 100644 --- a/tests/scenarios/cassettes/v2/aws_integration/List-namespaces-returns-AWS-Namespaces-List-object-response.json +++ b/tests/scenarios/cassettes/v2/aws_integration/List-namespaces-returns-AWS-Namespaces-List-object-response.json @@ -26,7 +26,7 @@ "message": "OK" } }, - "recorded_at": "Wed, 06 Nov 2024 18:44:53 GMT" + "recorded_at": "Thu, 14 Nov 2024 20:08:04 GMT" } ], "recorded_with": "VCR 6.0.0" diff --git a/tests/scenarios/cassettes/v2/aws_integration/Update-an-AWS-integration-returns-AWS-Account-object-response.frozen b/tests/scenarios/cassettes/v2/aws_integration/Update-an-AWS-integration-returns-AWS-Account-object-response.frozen index 7d9884c79..e17c97ca7 100644 --- a/tests/scenarios/cassettes/v2/aws_integration/Update-an-AWS-integration-returns-AWS-Account-object-response.frozen +++ b/tests/scenarios/cassettes/v2/aws_integration/Update-an-AWS-integration-returns-AWS-Account-object-response.frozen @@ -1 +1 @@ -2024-11-06T18:44:53.669Z \ No newline at end of file +2024-11-14T20:08:04.208Z \ No newline at end of file diff --git a/tests/scenarios/cassettes/v2/aws_integration/Update-an-AWS-integration-returns-AWS-Account-object-response.json b/tests/scenarios/cassettes/v2/aws_integration/Update-an-AWS-integration-returns-AWS-Account-object-response.json index 040ab637d..569bf9645 100644 --- a/tests/scenarios/cassettes/v2/aws_integration/Update-an-AWS-integration-returns-AWS-Account-object-response.json +++ b/tests/scenarios/cassettes/v2/aws_integration/Update-an-AWS-integration-returns-AWS-Account-object-response.json @@ -19,7 +19,7 @@ }, "response": { "body": { - "string": "{\"data\":{\"id\":\"06b62294-36d7-4bbe-a8b8-7c93736dc0ee\",\"type\":\"account\",\"attributes\":{\"account_tags\":[\"key:value\"],\"auth_config\":{\"role_name\":\"DatadogIntegrationRole\",\"external_id\":\"c16e1ceb4ac64293ba91f020191fa781\"},\"aws_account_id\":\"123456789012\",\"aws_partition\":\"aws\",\"aws_regions\":{\"include_only\":[\"us-east-1\"]},\"created_at\":\"2024-11-06T18:44:54.297075743Z\",\"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\":false,\"collect_cloudwatch_alarms\":false,\"tag_filters\":[{\"namespace\":\"AWS/EC2\",\"tags\":[\"key:value\"]}],\"namespace_filters\":{\"include_only\":[\"AWS/EC2\"]}},\"modified_at\":\"2024-11-06T18:44:54.297079976Z\",\"resources_config\":{\"cloud_security_posture_management_collection\":false,\"extended_collection\":false},\"traces_config\":{\"xray_services\":{\"include_only\":[\"AWS/AppSync\"]}}}}}", + "string": "{\"data\":{\"id\":\"da257b29-9c21-471f-9f5d-41ccfbedd320\",\"type\":\"account\",\"attributes\":{\"account_tags\":[\"key:value\"],\"auth_config\":{\"role_name\":\"DatadogIntegrationRole\",\"external_id\":\"532ab1a205b74240a3ca14407209b4a6\"},\"aws_account_id\":\"123456789012\",\"aws_partition\":\"aws\",\"aws_regions\":{\"include_only\":[\"us-east-1\"]},\"created_at\":\"2024-11-14T20:08:04.788732465Z\",\"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\":false,\"collect_cloudwatch_alarms\":false,\"tag_filters\":[{\"namespace\":\"AWS/EC2\",\"tags\":[\"key:value\"]}],\"namespace_filters\":{\"include_only\":[\"AWS/EC2\"]}},\"modified_at\":\"2024-11-14T20:08:04.788740678Z\",\"resources_config\":{\"cloud_security_posture_management_collection\":false,\"extended_collection\":false},\"traces_config\":{\"xray_services\":{\"include_only\":[\"AWS/AppSync\"]}}}}}", "encoding": null }, "headers": { @@ -32,7 +32,7 @@ "message": "OK" } }, - "recorded_at": "Wed, 06 Nov 2024 18:44:53 GMT" + "recorded_at": "Thu, 14 Nov 2024 20:08:04 GMT" }, { "request": { @@ -49,11 +49,11 @@ ] }, "method": "patch", - "uri": "https://api.datadoghq.com/api/v2/integration/aws/accounts/06b62294-36d7-4bbe-a8b8-7c93736dc0ee" + "uri": "https://api.datadoghq.com/api/v2/integration/aws/accounts/da257b29-9c21-471f-9f5d-41ccfbedd320" }, "response": { "body": { - "string": "{\"data\":{\"id\":\"06b62294-36d7-4bbe-a8b8-7c93736dc0ee\",\"type\":\"account\",\"attributes\":{\"account_tags\":[\"key:value\"],\"auth_config\":{\"role_name\":\"DatadogIntegrationRole\",\"external_id\":\"c16e1ceb4ac64293ba91f020191fa781\"},\"aws_account_id\":\"123456789012\",\"aws_partition\":\"aws\",\"aws_regions\":{\"include_only\":[\"us-east-1\"]},\"created_at\":\"2024-11-06T18:44:54.297076Z\",\"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\":{\"include_only\":[\"AWS/EC2\"]}},\"modified_at\":\"2024-11-06T18:44:54.489623544Z\",\"resources_config\":{\"cloud_security_posture_management_collection\":false,\"extended_collection\":false},\"traces_config\":{\"xray_services\":{\"include_only\":[\"AWS/AppSync\"]}}}}}", + "string": "{\"data\":{\"id\":\"da257b29-9c21-471f-9f5d-41ccfbedd320\",\"type\":\"account\",\"attributes\":{\"account_tags\":[\"key:value\"],\"auth_config\":{\"role_name\":\"DatadogIntegrationRole\",\"external_id\":\"532ab1a205b74240a3ca14407209b4a6\"},\"aws_account_id\":\"123456789012\",\"aws_partition\":\"aws\",\"aws_regions\":{\"include_only\":[\"us-east-1\"]},\"created_at\":\"2024-11-14T20:08:04.788732Z\",\"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\":{\"include_only\":[\"AWS/EC2\"]}},\"modified_at\":\"2024-11-14T20:08:04.980569196Z\",\"resources_config\":{\"cloud_security_posture_management_collection\":false,\"extended_collection\":false},\"traces_config\":{\"xray_services\":{\"include_only\":[\"AWS/AppSync\"]}}}}}", "encoding": null }, "headers": { @@ -66,7 +66,7 @@ "message": "OK" } }, - "recorded_at": "Wed, 06 Nov 2024 18:44:53 GMT" + "recorded_at": "Thu, 14 Nov 2024 20:08:04 GMT" }, { "request": { @@ -77,7 +77,7 @@ ] }, "method": "delete", - "uri": "https://api.datadoghq.com/api/v2/integration/aws/accounts/06b62294-36d7-4bbe-a8b8-7c93736dc0ee" + "uri": "https://api.datadoghq.com/api/v2/integration/aws/accounts/da257b29-9c21-471f-9f5d-41ccfbedd320" }, "response": { "body": { @@ -90,7 +90,7 @@ "message": "No Content" } }, - "recorded_at": "Wed, 06 Nov 2024 18:44:53 GMT" + "recorded_at": "Thu, 14 Nov 2024 20:08:04 GMT" } ], "recorded_with": "VCR 6.0.0" diff --git a/tests/scenarios/cassettes/v2/aws_integration/Update-an-AWS-integration-returns-Bad-Request-response.frozen b/tests/scenarios/cassettes/v2/aws_integration/Update-an-AWS-integration-returns-Bad-Request-response.frozen index a20f0bad4..2eba167cd 100644 --- a/tests/scenarios/cassettes/v2/aws_integration/Update-an-AWS-integration-returns-Bad-Request-response.frozen +++ b/tests/scenarios/cassettes/v2/aws_integration/Update-an-AWS-integration-returns-Bad-Request-response.frozen @@ -1 +1 @@ -2024-11-06T18:44:54.767Z \ No newline at end of file +2024-11-14T20:08:05.214Z \ No newline at end of file diff --git a/tests/scenarios/cassettes/v2/aws_integration/Update-an-AWS-integration-returns-Bad-Request-response.json b/tests/scenarios/cassettes/v2/aws_integration/Update-an-AWS-integration-returns-Bad-Request-response.json index a90a733e2..6a5989cfb 100644 --- a/tests/scenarios/cassettes/v2/aws_integration/Update-an-AWS-integration-returns-Bad-Request-response.json +++ b/tests/scenarios/cassettes/v2/aws_integration/Update-an-AWS-integration-returns-Bad-Request-response.json @@ -19,7 +19,7 @@ }, "response": { "body": { - "string": "{\"data\":{\"id\":\"6e045c0b-458a-4ec1-8654-6ac491320939\",\"type\":\"account\",\"attributes\":{\"account_tags\":[\"key:value\"],\"auth_config\":{\"role_name\":\"DatadogIntegrationRole\",\"external_id\":\"00d5e0f623574d388e9717154bcbf7f2\"},\"aws_account_id\":\"123456789012\",\"aws_partition\":\"aws\",\"aws_regions\":{\"include_only\":[\"us-east-1\"]},\"created_at\":\"2024-11-06T18:44:55.461251746Z\",\"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\":false,\"collect_cloudwatch_alarms\":false,\"tag_filters\":[{\"namespace\":\"AWS/EC2\",\"tags\":[\"key:value\"]}],\"namespace_filters\":{\"include_only\":[\"AWS/EC2\"]}},\"modified_at\":\"2024-11-06T18:44:55.461256677Z\",\"resources_config\":{\"cloud_security_posture_management_collection\":false,\"extended_collection\":false},\"traces_config\":{\"xray_services\":{\"include_only\":[\"AWS/AppSync\"]}}}}}", + "string": "{\"data\":{\"id\":\"0592afaa-a119-45f1-95ab-236ae090500a\",\"type\":\"account\",\"attributes\":{\"account_tags\":[\"key:value\"],\"auth_config\":{\"role_name\":\"DatadogIntegrationRole\",\"external_id\":\"c1b6bd9935234ad789a9f144fc028bff\"},\"aws_account_id\":\"123456789012\",\"aws_partition\":\"aws\",\"aws_regions\":{\"include_only\":[\"us-east-1\"]},\"created_at\":\"2024-11-14T20:08:05.881756591Z\",\"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\":false,\"collect_cloudwatch_alarms\":false,\"tag_filters\":[{\"namespace\":\"AWS/EC2\",\"tags\":[\"key:value\"]}],\"namespace_filters\":{\"include_only\":[\"AWS/EC2\"]}},\"modified_at\":\"2024-11-14T20:08:05.881761604Z\",\"resources_config\":{\"cloud_security_posture_management_collection\":false,\"extended_collection\":false},\"traces_config\":{\"xray_services\":{\"include_only\":[\"AWS/AppSync\"]}}}}}", "encoding": null }, "headers": { @@ -32,7 +32,7 @@ "message": "OK" } }, - "recorded_at": "Wed, 06 Nov 2024 18:44:54 GMT" + "recorded_at": "Thu, 14 Nov 2024 20:08:05 GMT" }, { "request": { @@ -49,7 +49,7 @@ ] }, "method": "patch", - "uri": "https://api.datadoghq.com/api/v2/integration/aws/accounts/6e045c0b-458a-4ec1-8654-6ac491320939" + "uri": "https://api.datadoghq.com/api/v2/integration/aws/accounts/0592afaa-a119-45f1-95ab-236ae090500a" }, "response": { "body": { @@ -66,7 +66,7 @@ "message": "Bad Request" } }, - "recorded_at": "Wed, 06 Nov 2024 18:44:54 GMT" + "recorded_at": "Thu, 14 Nov 2024 20:08:05 GMT" }, { "request": { @@ -77,7 +77,7 @@ ] }, "method": "delete", - "uri": "https://api.datadoghq.com/api/v2/integration/aws/accounts/6e045c0b-458a-4ec1-8654-6ac491320939" + "uri": "https://api.datadoghq.com/api/v2/integration/aws/accounts/0592afaa-a119-45f1-95ab-236ae090500a" }, "response": { "body": { @@ -90,7 +90,7 @@ "message": "No Content" } }, - "recorded_at": "Wed, 06 Nov 2024 18:44:54 GMT" + "recorded_at": "Thu, 14 Nov 2024 20:08:05 GMT" } ], "recorded_with": "VCR 6.0.0" diff --git a/tests/scenarios/cassettes/v2/aws_integration/Update-an-AWS-integration-returns-Not-Found-response.frozen b/tests/scenarios/cassettes/v2/aws_integration/Update-an-AWS-integration-returns-Not-Found-response.frozen index 7d82ab53f..6bec363d4 100644 --- a/tests/scenarios/cassettes/v2/aws_integration/Update-an-AWS-integration-returns-Not-Found-response.frozen +++ b/tests/scenarios/cassettes/v2/aws_integration/Update-an-AWS-integration-returns-Not-Found-response.frozen @@ -1 +1 @@ -2024-11-06T18:44:55.829Z \ No newline at end of file +2024-11-14T20:08:06.418Z \ No newline at end of file diff --git a/tests/scenarios/cassettes/v2/aws_integration/Update-an-AWS-integration-returns-Not-Found-response.json b/tests/scenarios/cassettes/v2/aws_integration/Update-an-AWS-integration-returns-Not-Found-response.json index 19d8f40e7..0396a25cd 100644 --- a/tests/scenarios/cassettes/v2/aws_integration/Update-an-AWS-integration-returns-Not-Found-response.json +++ b/tests/scenarios/cassettes/v2/aws_integration/Update-an-AWS-integration-returns-Not-Found-response.json @@ -32,7 +32,7 @@ "message": "Not Found" } }, - "recorded_at": "Wed, 06 Nov 2024 18:44:55 GMT" + "recorded_at": "Thu, 14 Nov 2024 20:08:06 GMT" } ], "recorded_with": "VCR 6.0.0"