Skip to content

Commit 741dcdb

Browse files
api-clients-generation-pipeline[bot]ci.datadog-api-spec
api-clients-generation-pipeline[bot]
and
ci.datadog-api-spec
authored
Update specs for AWS account updates and creation for CCM configs (#3001)
Co-authored-by: ci.datadog-api-spec <packages@datadoghq.com>
1 parent 177d72f commit 741dcdb

24 files changed

+272
-31
lines changed

‎.generator/schemas/v2/openapi.yaml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1496,6 +1496,8 @@ components:
14961496
$ref: '#/components/schemas/AWSAccountPartition'
14971497
aws_regions:
14981498
$ref: '#/components/schemas/AWSRegions'
1499+
ccm_config:
1500+
$ref: '#/components/schemas/AWSCCMConfig'
14991501
logs_config:
15001502
$ref: '#/components/schemas/AWSLogsConfig'
15011503
metrics_config:
@@ -1561,6 +1563,8 @@ components:
15611563
$ref: '#/components/schemas/AWSAccountPartition'
15621564
aws_regions:
15631565
$ref: '#/components/schemas/AWSRegions'
1566+
ccm_config:
1567+
$ref: '#/components/schemas/AWSCCMConfig'
15641568
created_at:
15651569
description: Timestamp of when the account integration was created.
15661570
format: date-time
@@ -1634,6 +1638,8 @@ components:
16341638
$ref: '#/components/schemas/AWSAccountPartition'
16351639
aws_regions:
16361640
$ref: '#/components/schemas/AWSRegions'
1641+
ccm_config:
1642+
$ref: '#/components/schemas/AWSCCMConfig'
16371643
logs_config:
16381644
$ref: '#/components/schemas/AWSLogsConfig'
16391645
metrics_config:
@@ -1765,6 +1771,15 @@ components:
17651771
required:
17661772
- role_name
17671773
type: object
1774+
AWSCCMConfig:
1775+
description: AWS Cloud Cost Management config.
1776+
properties:
1777+
data_export_configs:
1778+
description: List of data export configurations for Cost and Usage Reports.
1779+
items:
1780+
$ref: '#/components/schemas/DataExportConfig'
1781+
type: array
1782+
type: object
17681783
AWSCredentials:
17691784
description: The definition of `AWSCredentials` object.
17701785
oneOf:
@@ -16354,6 +16369,30 @@ components:
1635416369
example: canceled
1635516370
type: string
1635616371
type: object
16372+
DataExportConfig:
16373+
description: AWS Cost and Usage Report data export configuration.
16374+
properties:
16375+
bucket_name:
16376+
description: Name of the S3 bucket where the Cost and Usage Report is stored.
16377+
example: billing
16378+
type: string
16379+
bucket_region:
16380+
description: AWS region of the S3 bucket.
16381+
example: us-east-1
16382+
type: string
16383+
report_name:
16384+
description: Name of the Cost and Usage Report.
16385+
example: cost-and-usage-report
16386+
type: string
16387+
report_prefix:
16388+
description: S3 prefix where the Cost and Usage Report is stored.
16389+
example: reports
16390+
type: string
16391+
report_type:
16392+
description: Type of the Cost and Usage Report.
16393+
example: CUR2.0
16394+
type: string
16395+
type: object
1635716396
DataRelationshipsTeams:
1635816397
description: Associates teams with this schedule in a data structure.
1635916398
properties:

‎docs/datadog_api_client.v2.model.rst‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2279,6 +2279,13 @@ datadog\_api\_client.v2.model.aws\_traces\_config module
22792279
:members:
22802280
:show-inheritance:
22812281

2282+
datadog\_api\_client.v2.model.awsccm\_config module
2283+
---------------------------------------------------
2284+
2285+
.. automodule:: datadog_api_client.v2.model.awsccm_config
2286+
:members:
2287+
:show-inheritance:
2288+
22822289
datadog\_api\_client.v2.model.azure\_credentials module
22832290
-------------------------------------------------------
22842291

@@ -6451,6 +6458,13 @@ datadog\_api\_client.v2.model.data\_deletion\_response\_meta module
64516458
:members:
64526459
:show-inheritance:
64536460

6461+
datadog\_api\_client.v2.model.data\_export\_config module
6462+
---------------------------------------------------------
6463+
6464+
.. automodule:: datadog_api_client.v2.model.data_export_config
6465+
:members:
6466+
:show-inheritance:
6467+
64546468
datadog\_api\_client.v2.model.data\_relationships\_teams module
64556469
---------------------------------------------------------------
64566470

‎examples/v2/aws-integration/CreateAWSAccount.py‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
from datadog_api_client.v2.model.aws_namespace_tag_filter import AWSNamespaceTagFilter
2121
from datadog_api_client.v2.model.aws_resources_config import AWSResourcesConfig
2222
from datadog_api_client.v2.model.aws_traces_config import AWSTracesConfig
23+
from datadog_api_client.v2.model.awsccm_config import AWSCCMConfig
24+
from datadog_api_client.v2.model.data_export_config import DataExportConfig
2325

2426
body = AWSAccountCreateRequest(
2527
data=AWSAccountCreateRequestData(
@@ -33,6 +35,17 @@
3335
),
3436
aws_account_id="123456789012",
3537
aws_partition=AWSAccountPartition.AWS,
38+
ccm_config=AWSCCMConfig(
39+
data_export_configs=[
40+
DataExportConfig(
41+
bucket_name="my-bucket",
42+
bucket_region="us-east-1",
43+
report_name="my-report",
44+
report_prefix="reports",
45+
report_type="CUR2.0",
46+
),
47+
],
48+
),
3649
logs_config=AWSLogsConfig(
3750
lambda_forwarder=AWSLambdaForwarderConfig(
3851
lambdas=[

‎examples/v2/aws-integration/CreateAWSAccount_1716720881.py‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
from datadog_api_client.v2.model.aws_namespace_tag_filter import AWSNamespaceTagFilter
2121
from datadog_api_client.v2.model.aws_resources_config import AWSResourcesConfig
2222
from datadog_api_client.v2.model.aws_traces_config import AWSTracesConfig
23+
from datadog_api_client.v2.model.awsccm_config import AWSCCMConfig
24+
from datadog_api_client.v2.model.data_export_config import DataExportConfig
2325

2426
body = AWSAccountCreateRequest(
2527
data=AWSAccountCreateRequestData(
@@ -32,6 +34,17 @@
3234
),
3335
aws_account_id="123456789012",
3436
aws_partition=AWSAccountPartition.AWS,
37+
ccm_config=AWSCCMConfig(
38+
data_export_configs=[
39+
DataExportConfig(
40+
bucket_name="my-bucket",
41+
bucket_region="us-east-1",
42+
report_name="my-report",
43+
report_prefix="reports",
44+
report_type="CUR2.0",
45+
),
46+
],
47+
),
3548
logs_config=AWSLogsConfig(
3649
lambda_forwarder=AWSLambdaForwarderConfig(
3750
lambdas=[

‎examples/v2/aws-integration/UpdateAWSAccount.py‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
from datadog_api_client.v2.model.aws_namespace_tag_filter import AWSNamespaceTagFilter
2222
from datadog_api_client.v2.model.aws_resources_config import AWSResourcesConfig
2323
from datadog_api_client.v2.model.aws_traces_config import AWSTracesConfig
24+
from datadog_api_client.v2.model.awsccm_config import AWSCCMConfig
25+
from datadog_api_client.v2.model.data_export_config import DataExportConfig
2426

2527
# there is a valid "aws_account_v2" in the system
2628
AWS_ACCOUNT_V2_DATA_ID = environ["AWS_ACCOUNT_V2_DATA_ID"]
@@ -36,6 +38,17 @@
3638
),
3739
aws_account_id="123456789012",
3840
aws_partition=AWSAccountPartition.AWS,
41+
ccm_config=AWSCCMConfig(
42+
data_export_configs=[
43+
DataExportConfig(
44+
bucket_name="updated-bucket",
45+
bucket_region="us-west-2",
46+
report_name="updated-report",
47+
report_prefix="cost-reports",
48+
report_type="CUR2.0",
49+
),
50+
],
51+
),
3952
logs_config=AWSLogsConfig(
4053
lambda_forwarder=AWSLambdaForwarderConfig(
4154
lambdas=[

‎src/datadog_api_client/v2/model/aws_account_create_request_attributes.py‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
from datadog_api_client.v2.model.aws_auth_config import AWSAuthConfig
1919
from datadog_api_client.v2.model.aws_account_partition import AWSAccountPartition
2020
from datadog_api_client.v2.model.aws_regions import AWSRegions
21+
from datadog_api_client.v2.model.awsccm_config import AWSCCMConfig
2122
from datadog_api_client.v2.model.aws_logs_config import AWSLogsConfig
2223
from datadog_api_client.v2.model.aws_metrics_config import AWSMetricsConfig
2324
from datadog_api_client.v2.model.aws_resources_config import AWSResourcesConfig
@@ -34,6 +35,7 @@ def openapi_types(_):
3435
from datadog_api_client.v2.model.aws_auth_config import AWSAuthConfig
3536
from datadog_api_client.v2.model.aws_account_partition import AWSAccountPartition
3637
from datadog_api_client.v2.model.aws_regions import AWSRegions
38+
from datadog_api_client.v2.model.awsccm_config import AWSCCMConfig
3739
from datadog_api_client.v2.model.aws_logs_config import AWSLogsConfig
3840
from datadog_api_client.v2.model.aws_metrics_config import AWSMetricsConfig
3941
from datadog_api_client.v2.model.aws_resources_config import AWSResourcesConfig
@@ -45,6 +47,7 @@ def openapi_types(_):
4547
"aws_account_id": (str,),
4648
"aws_partition": (AWSAccountPartition,),
4749
"aws_regions": (AWSRegions,),
50+
"ccm_config": (AWSCCMConfig,),
4851
"logs_config": (AWSLogsConfig,),
4952
"metrics_config": (AWSMetricsConfig,),
5053
"resources_config": (AWSResourcesConfig,),
@@ -57,6 +60,7 @@ def openapi_types(_):
5760
"aws_account_id": "aws_account_id",
5861
"aws_partition": "aws_partition",
5962
"aws_regions": "aws_regions",
63+
"ccm_config": "ccm_config",
6064
"logs_config": "logs_config",
6165
"metrics_config": "metrics_config",
6266
"resources_config": "resources_config",
@@ -70,6 +74,7 @@ def __init__(
7074
aws_partition: AWSAccountPartition,
7175
account_tags: Union[List[str], none_type, UnsetType] = unset,
7276
aws_regions: Union[AWSRegions, AWSRegionsIncludeAll, AWSRegionsIncludeOnly, UnsetType] = unset,
77+
ccm_config: Union[AWSCCMConfig, UnsetType] = unset,
7378
logs_config: Union[AWSLogsConfig, UnsetType] = unset,
7479
metrics_config: Union[AWSMetricsConfig, UnsetType] = unset,
7580
resources_config: Union[AWSResourcesConfig, UnsetType] = unset,
@@ -96,6 +101,9 @@ def __init__(
96101
:param aws_regions: AWS Regions to collect data from. Defaults to ``include_all``.
97102
:type aws_regions: AWSRegions, optional
98103
104+
:param ccm_config: AWS Cloud Cost Management config.
105+
:type ccm_config: AWSCCMConfig, optional
106+
99107
:param logs_config: AWS Logs Collection config.
100108
:type logs_config: AWSLogsConfig, optional
101109
@@ -112,6 +120,8 @@ def __init__(
112120
kwargs["account_tags"] = account_tags
113121
if aws_regions is not unset:
114122
kwargs["aws_regions"] = aws_regions
123+
if ccm_config is not unset:
124+
kwargs["ccm_config"] = ccm_config
115125
if logs_config is not unset:
116126
kwargs["logs_config"] = logs_config
117127
if metrics_config is not unset:

‎src/datadog_api_client/v2/model/aws_account_response_attributes.py‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
from datadog_api_client.v2.model.aws_auth_config import AWSAuthConfig
2020
from datadog_api_client.v2.model.aws_account_partition import AWSAccountPartition
2121
from datadog_api_client.v2.model.aws_regions import AWSRegions
22+
from datadog_api_client.v2.model.awsccm_config import AWSCCMConfig
2223
from datadog_api_client.v2.model.aws_logs_config import AWSLogsConfig
2324
from datadog_api_client.v2.model.aws_metrics_config import AWSMetricsConfig
2425
from datadog_api_client.v2.model.aws_resources_config import AWSResourcesConfig
@@ -35,6 +36,7 @@ def openapi_types(_):
3536
from datadog_api_client.v2.model.aws_auth_config import AWSAuthConfig
3637
from datadog_api_client.v2.model.aws_account_partition import AWSAccountPartition
3738
from datadog_api_client.v2.model.aws_regions import AWSRegions
39+
from datadog_api_client.v2.model.awsccm_config import AWSCCMConfig
3840
from datadog_api_client.v2.model.aws_logs_config import AWSLogsConfig
3941
from datadog_api_client.v2.model.aws_metrics_config import AWSMetricsConfig
4042
from datadog_api_client.v2.model.aws_resources_config import AWSResourcesConfig
@@ -46,6 +48,7 @@ def openapi_types(_):
4648
"aws_account_id": (str,),
4749
"aws_partition": (AWSAccountPartition,),
4850
"aws_regions": (AWSRegions,),
51+
"ccm_config": (AWSCCMConfig,),
4952
"created_at": (datetime,),
5053
"logs_config": (AWSLogsConfig,),
5154
"metrics_config": (AWSMetricsConfig,),
@@ -60,6 +63,7 @@ def openapi_types(_):
6063
"aws_account_id": "aws_account_id",
6164
"aws_partition": "aws_partition",
6265
"aws_regions": "aws_regions",
66+
"ccm_config": "ccm_config",
6367
"created_at": "created_at",
6468
"logs_config": "logs_config",
6569
"metrics_config": "metrics_config",
@@ -79,6 +83,7 @@ def __init__(
7983
auth_config: Union[AWSAuthConfig, AWSAuthConfigKeys, AWSAuthConfigRole, UnsetType] = unset,
8084
aws_partition: Union[AWSAccountPartition, UnsetType] = unset,
8185
aws_regions: Union[AWSRegions, AWSRegionsIncludeAll, AWSRegionsIncludeOnly, UnsetType] = unset,
86+
ccm_config: Union[AWSCCMConfig, UnsetType] = unset,
8287
created_at: Union[datetime, UnsetType] = unset,
8388
logs_config: Union[AWSLogsConfig, UnsetType] = unset,
8489
metrics_config: Union[AWSMetricsConfig, UnsetType] = unset,
@@ -107,6 +112,9 @@ def __init__(
107112
:param aws_regions: AWS Regions to collect data from. Defaults to ``include_all``.
108113
:type aws_regions: AWSRegions, optional
109114
115+
:param ccm_config: AWS Cloud Cost Management config.
116+
:type ccm_config: AWSCCMConfig, optional
117+
110118
:param created_at: Timestamp of when the account integration was created.
111119
:type created_at: datetime, optional
112120
@@ -133,6 +141,8 @@ def __init__(
133141
kwargs["aws_partition"] = aws_partition
134142
if aws_regions is not unset:
135143
kwargs["aws_regions"] = aws_regions
144+
if ccm_config is not unset:
145+
kwargs["ccm_config"] = ccm_config
136146
if created_at is not unset:
137147
kwargs["created_at"] = created_at
138148
if logs_config is not unset:

‎src/datadog_api_client/v2/model/aws_account_update_request_attributes.py‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
from datadog_api_client.v2.model.aws_auth_config import AWSAuthConfig
1919
from datadog_api_client.v2.model.aws_account_partition import AWSAccountPartition
2020
from datadog_api_client.v2.model.aws_regions import AWSRegions
21+
from datadog_api_client.v2.model.awsccm_config import AWSCCMConfig
2122
from datadog_api_client.v2.model.aws_logs_config import AWSLogsConfig
2223
from datadog_api_client.v2.model.aws_metrics_config import AWSMetricsConfig
2324
from datadog_api_client.v2.model.aws_resources_config import AWSResourcesConfig
@@ -34,6 +35,7 @@ def openapi_types(_):
3435
from datadog_api_client.v2.model.aws_auth_config import AWSAuthConfig
3536
from datadog_api_client.v2.model.aws_account_partition import AWSAccountPartition
3637
from datadog_api_client.v2.model.aws_regions import AWSRegions
38+
from datadog_api_client.v2.model.awsccm_config import AWSCCMConfig
3739
from datadog_api_client.v2.model.aws_logs_config import AWSLogsConfig
3840
from datadog_api_client.v2.model.aws_metrics_config import AWSMetricsConfig
3941
from datadog_api_client.v2.model.aws_resources_config import AWSResourcesConfig
@@ -45,6 +47,7 @@ def openapi_types(_):
4547
"aws_account_id": (str,),
4648
"aws_partition": (AWSAccountPartition,),
4749
"aws_regions": (AWSRegions,),
50+
"ccm_config": (AWSCCMConfig,),
4851
"logs_config": (AWSLogsConfig,),
4952
"metrics_config": (AWSMetricsConfig,),
5053
"resources_config": (AWSResourcesConfig,),
@@ -57,6 +60,7 @@ def openapi_types(_):
5760
"aws_account_id": "aws_account_id",
5861
"aws_partition": "aws_partition",
5962
"aws_regions": "aws_regions",
63+
"ccm_config": "ccm_config",
6064
"logs_config": "logs_config",
6165
"metrics_config": "metrics_config",
6266
"resources_config": "resources_config",
@@ -70,6 +74,7 @@ def __init__(
7074
auth_config: Union[AWSAuthConfig, AWSAuthConfigKeys, AWSAuthConfigRole, UnsetType] = unset,
7175
aws_partition: Union[AWSAccountPartition, UnsetType] = unset,
7276
aws_regions: Union[AWSRegions, AWSRegionsIncludeAll, AWSRegionsIncludeOnly, UnsetType] = unset,
77+
ccm_config: Union[AWSCCMConfig, UnsetType] = unset,
7378
logs_config: Union[AWSLogsConfig, UnsetType] = unset,
7479
metrics_config: Union[AWSMetricsConfig, UnsetType] = unset,
7580
resources_config: Union[AWSResourcesConfig, UnsetType] = unset,
@@ -96,6 +101,9 @@ def __init__(
96101
:param aws_regions: AWS Regions to collect data from. Defaults to ``include_all``.
97102
:type aws_regions: AWSRegions, optional
98103
104+
:param ccm_config: AWS Cloud Cost Management config.
105+
:type ccm_config: AWSCCMConfig, optional
106+
99107
:param logs_config: AWS Logs Collection config.
100108
:type logs_config: AWSLogsConfig, optional
101109
@@ -116,6 +124,8 @@ def __init__(
116124
kwargs["aws_partition"] = aws_partition
117125
if aws_regions is not unset:
118126
kwargs["aws_regions"] = aws_regions
127+
if ccm_config is not unset:
128+
kwargs["ccm_config"] = ccm_config
119129
if logs_config is not unset:
120130
kwargs["logs_config"] = logs_config
121131
if metrics_config is not unset:

0 commit comments

Comments
 (0)