Skip to content

Commit 37371ff

Browse files
author
ci.datadog-api-spec
committed
Regenerate client from commit 3cfd102e of spec repo
1 parent 94014db commit 37371ff

File tree

37 files changed

+48
-169
lines changed

37 files changed

+48
-169
lines changed

.apigentools-info

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
"spec_versions": {
55
"v1": {
66
"apigentools_version": "1.6.6",
7-
"regenerated": "2024-11-25 11:57:14.459952",
8-
"spec_repo_commit": "80b43a3b"
7+
"regenerated": "2024-11-25 17:56:00.736453",
8+
"spec_repo_commit": "3cfd102e"
99
},
1010
"v2": {
1111
"apigentools_version": "1.6.6",
12-
"regenerated": "2024-11-25 11:57:14.477471",
13-
"spec_repo_commit": "80b43a3b"
12+
"regenerated": "2024-11-25 17:56:00.754382",
13+
"spec_repo_commit": "3cfd102e"
1414
}
1515
}
1616
}

.generator/schemas/v2/openapi.yaml

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

docs/datadog_api_client.v2.model.rst

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -732,27 +732,13 @@ datadog\_api\_client.v2.model.aws\_namespace\_filters module
732732
:members:
733733
:show-inheritance:
734734

735-
datadog\_api\_client.v2.model.aws\_namespace\_filters\_exclude\_all module
736-
--------------------------------------------------------------------------
737-
738-
.. automodule:: datadog_api_client.v2.model.aws_namespace_filters_exclude_all
739-
:members:
740-
:show-inheritance:
741-
742735
datadog\_api\_client.v2.model.aws\_namespace\_filters\_exclude\_only module
743736
---------------------------------------------------------------------------
744737

745738
.. automodule:: datadog_api_client.v2.model.aws_namespace_filters_exclude_only
746739
:members:
747740
:show-inheritance:
748741

749-
datadog\_api\_client.v2.model.aws\_namespace\_filters\_include\_all module
750-
--------------------------------------------------------------------------
751-
752-
.. automodule:: datadog_api_client.v2.model.aws_namespace_filters_include_all
753-
:members:
754-
:show-inheritance:
755-
756742
datadog\_api\_client.v2.model.aws\_namespace\_filters\_include\_only module
757743
---------------------------------------------------------------------------
758744

src/datadog_api_client/v2/model/aws_metrics_config.py

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@
1616
if TYPE_CHECKING:
1717
from datadog_api_client.v2.model.aws_namespace_filters import AWSNamespaceFilters
1818
from datadog_api_client.v2.model.aws_namespace_tag_filter import AWSNamespaceTagFilter
19-
from datadog_api_client.v2.model.aws_namespace_filters_exclude_all import AWSNamespaceFiltersExcludeAll
2019
from datadog_api_client.v2.model.aws_namespace_filters_exclude_only import AWSNamespaceFiltersExcludeOnly
21-
from datadog_api_client.v2.model.aws_namespace_filters_include_all import AWSNamespaceFiltersIncludeAll
2220
from datadog_api_client.v2.model.aws_namespace_filters_include_only import AWSNamespaceFiltersIncludeOnly
2321

2422

@@ -53,12 +51,7 @@ def __init__(
5351
collect_custom_metrics: Union[bool, UnsetType] = unset,
5452
enabled: Union[bool, UnsetType] = unset,
5553
namespace_filters: Union[
56-
AWSNamespaceFilters,
57-
AWSNamespaceFiltersExcludeAll,
58-
AWSNamespaceFiltersExcludeOnly,
59-
AWSNamespaceFiltersIncludeAll,
60-
AWSNamespaceFiltersIncludeOnly,
61-
UnsetType,
54+
AWSNamespaceFilters, AWSNamespaceFiltersExcludeOnly, AWSNamespaceFiltersIncludeOnly, UnsetType
6255
] = unset,
6356
tag_filters: Union[List[AWSNamespaceTagFilter], UnsetType] = unset,
6457
**kwargs,

src/datadog_api_client/v2/model/aws_namespace_filters.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,9 @@ def __init__(self, **kwargs):
1515
"""
1616
AWS Metrics namespace filters
1717
18-
:param exclude_all: Exclude all namespaces
19-
:type exclude_all: bool
20-
2118
:param exclude_only: Exclude only these namespaces
2219
:type exclude_only: [str]
2320
24-
:param include_all: Include all namespaces
25-
:type include_all: bool
26-
2721
:param include_only: Include only these namespaces
2822
:type include_only: [str]
2923
"""
@@ -38,16 +32,12 @@ def _composed_schemas(_):
3832
# code would be run when this module is imported, and these composed
3933
# classes don't exist yet because their module has not finished
4034
# loading
41-
from datadog_api_client.v2.model.aws_namespace_filters_exclude_all import AWSNamespaceFiltersExcludeAll
4235
from datadog_api_client.v2.model.aws_namespace_filters_exclude_only import AWSNamespaceFiltersExcludeOnly
43-
from datadog_api_client.v2.model.aws_namespace_filters_include_all import AWSNamespaceFiltersIncludeAll
4436
from datadog_api_client.v2.model.aws_namespace_filters_include_only import AWSNamespaceFiltersIncludeOnly
4537

4638
return {
4739
"oneOf": [
48-
AWSNamespaceFiltersExcludeAll,
4940
AWSNamespaceFiltersExcludeOnly,
50-
AWSNamespaceFiltersIncludeAll,
5141
AWSNamespaceFiltersIncludeOnly,
5242
],
5343
}

src/datadog_api_client/v2/model/aws_namespace_filters_exclude_all.py

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

src/datadog_api_client/v2/model/aws_namespace_filters_include_all.py

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

src/datadog_api_client/v2/models/__init__.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,7 @@
3636
from datadog_api_client.v2.model.aws_logs_services_response_data_type import AWSLogsServicesResponseDataType
3737
from datadog_api_client.v2.model.aws_metrics_config import AWSMetricsConfig
3838
from datadog_api_client.v2.model.aws_namespace_filters import AWSNamespaceFilters
39-
from datadog_api_client.v2.model.aws_namespace_filters_exclude_all import AWSNamespaceFiltersExcludeAll
4039
from datadog_api_client.v2.model.aws_namespace_filters_exclude_only import AWSNamespaceFiltersExcludeOnly
41-
from datadog_api_client.v2.model.aws_namespace_filters_include_all import AWSNamespaceFiltersIncludeAll
4240
from datadog_api_client.v2.model.aws_namespace_filters_include_only import AWSNamespaceFiltersIncludeOnly
4341
from datadog_api_client.v2.model.aws_namespace_tag_filter import AWSNamespaceTagFilter
4442
from datadog_api_client.v2.model.aws_namespaces_response import AWSNamespacesResponse
@@ -2189,9 +2187,7 @@
21892187
"AWSLogsServicesResponseDataType",
21902188
"AWSMetricsConfig",
21912189
"AWSNamespaceFilters",
2192-
"AWSNamespaceFiltersExcludeAll",
21932190
"AWSNamespaceFiltersExcludeOnly",
2194-
"AWSNamespaceFiltersIncludeAll",
21952191
"AWSNamespaceFiltersIncludeOnly",
21962192
"AWSNamespaceTagFilter",
21972193
"AWSNamespacesResponse",
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2024-11-06T18:44:46.341Z
1+
2024-11-14T20:07:56.996Z

tests/v2/cassettes/test_scenarios/test_create_an_aws_account_returns_aws_account_object_response.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ interactions:
1010
uri: https://api.datadoghq.com/api/v2/integration/aws/accounts
1111
response:
1212
body:
13-
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":[]}}}}}'
13+
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":[]}}}}}'
1414
headers:
1515
content-type:
1616
- application/vnd.api+json
@@ -23,7 +23,7 @@ interactions:
2323
accept:
2424
- '*/*'
2525
method: DELETE
26-
uri: https://api.datadoghq.com/api/v2/integration/aws/accounts/0696eb1f-06fa-40a6-a623-084a83f61623
26+
uri: https://api.datadoghq.com/api/v2/integration/aws/accounts/c2d871fe-ba0c-441d-acc8-d49d28c748f4
2727
response:
2828
body:
2929
string: ''
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2024-11-06T18:44:47.513Z
1+
2024-11-14T20:07:57.855Z

tests/v2/cassettes/test_scenarios/test_create_an_aws_integration_returns_aws_account_object_response.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ interactions:
1010
uri: https://api.datadoghq.com/api/v2/integration/aws/accounts
1111
response:
1212
body:
13-
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":[]}}}}}'
13+
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":[]}}}}}'
1414
headers:
1515
content-type:
1616
- application/vnd.api+json
@@ -23,7 +23,7 @@ interactions:
2323
accept:
2424
- '*/*'
2525
method: DELETE
26-
uri: https://api.datadoghq.com/api/v2/integration/aws/accounts/5b07e0e7-013c-427e-977a-7adb94ff4b40
26+
uri: https://api.datadoghq.com/api/v2/integration/aws/accounts/a1a282b9-6e74-4e56-b423-ec55ccbc995d
2727
response:
2828
body:
2929
string: ''
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2024-11-06T18:44:47.919Z
1+
2024-11-14T20:07:58.234Z
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2024-11-06T18:44:48.024Z
1+
2024-11-14T20:07:58.346Z

tests/v2/cassettes/test_scenarios/test_create_an_aws_integration_returns_conflict_response.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ interactions:
1010
uri: https://api.datadoghq.com/api/v2/integration/aws/accounts
1111
response:
1212
body:
13-
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"]}}}}}'
13+
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"]}}}}}'
1414
headers:
1515
content-type:
1616
- application/vnd.api+json
@@ -42,7 +42,7 @@ interactions:
4242
accept:
4343
- '*/*'
4444
method: DELETE
45-
uri: https://api.datadoghq.com/api/v2/integration/aws/accounts/7f221537-cb4f-47dc-8666-f77e5ca60750
45+
uri: https://api.datadoghq.com/api/v2/integration/aws/accounts/3827b469-bc3a-41be-bdf0-1d0e6ea413a2
4646
response:
4747
body:
4848
string: ''
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2024-11-06T18:44:49.460Z
1+
2024-11-14T20:08:00.124Z
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2024-11-06T18:44:49.526Z
1+
2024-11-14T20:08:00.216Z

tests/v2/cassettes/test_scenarios/test_delete_an_aws_integration_returns_no_content_response.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ interactions:
1010
uri: https://api.datadoghq.com/api/v2/integration/aws/accounts
1111
response:
1212
body:
13-
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"]}}}}}'
13+
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"]}}}}}'
1414
headers:
1515
content-type:
1616
- application/vnd.api+json
@@ -23,7 +23,7 @@ interactions:
2323
accept:
2424
- '*/*'
2525
method: DELETE
26-
uri: https://api.datadoghq.com/api/v2/integration/aws/accounts/e733f58b-b8d1-4d0c-b2f5-6438d314ca51
26+
uri: https://api.datadoghq.com/api/v2/integration/aws/accounts/a87fe3df-a75b-4f57-a965-685282b86ff2
2727
response:
2828
body:
2929
string: ''
@@ -37,7 +37,7 @@ interactions:
3737
accept:
3838
- '*/*'
3939
method: DELETE
40-
uri: https://api.datadoghq.com/api/v2/integration/aws/accounts/e733f58b-b8d1-4d0c-b2f5-6438d314ca51
40+
uri: https://api.datadoghq.com/api/v2/integration/aws/accounts/a87fe3df-a75b-4f57-a965-685282b86ff2
4141
response:
4242
body:
4343
string: '{"errors":[{"status":"404","title":"Account not found","detail":"AWS
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2024-11-06T18:44:50.507Z
1+
2024-11-14T20:08:01.174Z

0 commit comments

Comments
 (0)