Skip to content

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

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

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:14.459952",
"spec_repo_commit": "80b43a3b"
"regenerated": "2024-11-25 17:56:00.736453",
"spec_repo_commit": "3cfd102e"
},
"v2": {
"apigentools_version": "1.6.6",
"regenerated": "2024-11-25 11:57:14.477471",
"spec_repo_commit": "80b43a3b"
"regenerated": "2024-11-25 17:56:00.754382",
"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
14 changes: 0 additions & 14 deletions docs/datadog_api_client.v2.model.rst
Original file line number Diff line number Diff line change
Expand Up @@ -732,27 +732,13 @@ datadog\_api\_client.v2.model.aws\_namespace\_filters module
:members:
:show-inheritance:

datadog\_api\_client.v2.model.aws\_namespace\_filters\_exclude\_all module
--------------------------------------------------------------------------

.. automodule:: datadog_api_client.v2.model.aws_namespace_filters_exclude_all
:members:
:show-inheritance:

datadog\_api\_client.v2.model.aws\_namespace\_filters\_exclude\_only module
---------------------------------------------------------------------------

.. automodule:: datadog_api_client.v2.model.aws_namespace_filters_exclude_only
:members:
:show-inheritance:

datadog\_api\_client.v2.model.aws\_namespace\_filters\_include\_all module
--------------------------------------------------------------------------

.. automodule:: datadog_api_client.v2.model.aws_namespace_filters_include_all
:members:
:show-inheritance:

datadog\_api\_client.v2.model.aws\_namespace\_filters\_include\_only module
---------------------------------------------------------------------------

Expand Down
9 changes: 1 addition & 8 deletions src/datadog_api_client/v2/model/aws_metrics_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@
if TYPE_CHECKING:
from datadog_api_client.v2.model.aws_namespace_filters import AWSNamespaceFilters
from datadog_api_client.v2.model.aws_namespace_tag_filter import AWSNamespaceTagFilter
from datadog_api_client.v2.model.aws_namespace_filters_exclude_all import AWSNamespaceFiltersExcludeAll
from datadog_api_client.v2.model.aws_namespace_filters_exclude_only import AWSNamespaceFiltersExcludeOnly
from datadog_api_client.v2.model.aws_namespace_filters_include_all import AWSNamespaceFiltersIncludeAll
from datadog_api_client.v2.model.aws_namespace_filters_include_only import AWSNamespaceFiltersIncludeOnly


Expand Down Expand Up @@ -53,12 +51,7 @@ def __init__(
collect_custom_metrics: Union[bool, UnsetType] = unset,
enabled: Union[bool, UnsetType] = unset,
namespace_filters: Union[
AWSNamespaceFilters,
AWSNamespaceFiltersExcludeAll,
AWSNamespaceFiltersExcludeOnly,
AWSNamespaceFiltersIncludeAll,
AWSNamespaceFiltersIncludeOnly,
UnsetType,
AWSNamespaceFilters, AWSNamespaceFiltersExcludeOnly, AWSNamespaceFiltersIncludeOnly, UnsetType
] = unset,
tag_filters: Union[List[AWSNamespaceTagFilter], UnsetType] = unset,
**kwargs,
Expand Down
10 changes: 0 additions & 10 deletions src/datadog_api_client/v2/model/aws_namespace_filters.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,9 @@ def __init__(self, **kwargs):
"""
AWS Metrics namespace filters

:param exclude_all: Exclude all namespaces
:type exclude_all: bool

:param exclude_only: Exclude only these namespaces
:type exclude_only: [str]

:param include_all: Include all namespaces
:type include_all: bool

:param include_only: Include only these namespaces
:type include_only: [str]
"""
Expand All @@ -38,16 +32,12 @@ def _composed_schemas(_):
# code would be run when this module is imported, and these composed
# classes don't exist yet because their module has not finished
# loading
from datadog_api_client.v2.model.aws_namespace_filters_exclude_all import AWSNamespaceFiltersExcludeAll
from datadog_api_client.v2.model.aws_namespace_filters_exclude_only import AWSNamespaceFiltersExcludeOnly
from datadog_api_client.v2.model.aws_namespace_filters_include_all import AWSNamespaceFiltersIncludeAll
from datadog_api_client.v2.model.aws_namespace_filters_include_only import AWSNamespaceFiltersIncludeOnly

return {
"oneOf": [
AWSNamespaceFiltersExcludeAll,
AWSNamespaceFiltersExcludeOnly,
AWSNamespaceFiltersIncludeAll,
AWSNamespaceFiltersIncludeOnly,
],
}

This file was deleted.

This file was deleted.

4 changes: 0 additions & 4 deletions src/datadog_api_client/v2/models/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,7 @@
from datadog_api_client.v2.model.aws_logs_services_response_data_type import AWSLogsServicesResponseDataType
from datadog_api_client.v2.model.aws_metrics_config import AWSMetricsConfig
from datadog_api_client.v2.model.aws_namespace_filters import AWSNamespaceFilters
from datadog_api_client.v2.model.aws_namespace_filters_exclude_all import AWSNamespaceFiltersExcludeAll
from datadog_api_client.v2.model.aws_namespace_filters_exclude_only import AWSNamespaceFiltersExcludeOnly
from datadog_api_client.v2.model.aws_namespace_filters_include_all import AWSNamespaceFiltersIncludeAll
from datadog_api_client.v2.model.aws_namespace_filters_include_only import AWSNamespaceFiltersIncludeOnly
from datadog_api_client.v2.model.aws_namespace_tag_filter import AWSNamespaceTagFilter
from datadog_api_client.v2.model.aws_namespaces_response import AWSNamespacesResponse
Expand Down Expand Up @@ -2189,9 +2187,7 @@
"AWSLogsServicesResponseDataType",
"AWSMetricsConfig",
"AWSNamespaceFilters",
"AWSNamespaceFiltersExcludeAll",
"AWSNamespaceFiltersExcludeOnly",
"AWSNamespaceFiltersIncludeAll",
"AWSNamespaceFiltersIncludeOnly",
"AWSNamespaceTagFilter",
"AWSNamespacesResponse",
Expand Down
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 @@ -10,7 +10,7 @@ interactions:
uri: https://api.datadoghq.com/api/v2/integration/aws/accounts
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":[]}}}}}'
headers:
content-type:
- application/vnd.api+json
Expand All @@ -23,7 +23,7 @@ interactions:
accept:
- '*/*'
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:
string: ''
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 @@ -10,7 +10,7 @@ interactions:
uri: https://api.datadoghq.com/api/v2/integration/aws/accounts
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":[]}}}}}'
headers:
content-type:
- application/vnd.api+json
Expand All @@ -23,7 +23,7 @@ interactions:
accept:
- '*/*'
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:
string: ''
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
@@ -1 +1 @@
2024-11-06T18:44:48.024Z
2024-11-14T20:07:58.346Z
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ interactions:
uri: https://api.datadoghq.com/api/v2/integration/aws/accounts
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"]}}}}}'
headers:
content-type:
- application/vnd.api+json
Expand Down Expand Up @@ -42,7 +42,7 @@ interactions:
accept:
- '*/*'
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:
string: ''
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2024-11-06T18:44:49.460Z
2024-11-14T20:08:00.124Z
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2024-11-06T18:44:49.526Z
2024-11-14T20:08:00.216Z
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ interactions:
uri: https://api.datadoghq.com/api/v2/integration/aws/accounts
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"]}}}}}'
headers:
content-type:
- application/vnd.api+json
Expand All @@ -23,7 +23,7 @@ interactions:
accept:
- '*/*'
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:
string: ''
Expand All @@ -37,7 +37,7 @@ interactions:
accept:
- '*/*'
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:
string: '{"errors":[{"status":"404","title":"Account not found","detail":"AWS
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2024-11-06T18:44:50.507Z
2024-11-14T20:08:01.174Z
Loading