Skip to content

Commit a76b93f

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

24 files changed

Lines changed: 31 additions & 272 deletions

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

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1485,8 +1485,6 @@ components:
14851485
$ref: '#/components/schemas/AWSAccountPartition'
14861486
aws_regions:
14871487
$ref: '#/components/schemas/AWSRegions'
1488-
ccm_config:
1489-
$ref: '#/components/schemas/AWSCCMConfig'
14901488
logs_config:
14911489
$ref: '#/components/schemas/AWSLogsConfig'
14921490
metrics_config:
@@ -1552,8 +1550,6 @@ components:
15521550
$ref: '#/components/schemas/AWSAccountPartition'
15531551
aws_regions:
15541552
$ref: '#/components/schemas/AWSRegions'
1555-
ccm_config:
1556-
$ref: '#/components/schemas/AWSCCMConfig'
15571553
created_at:
15581554
description: Timestamp of when the account integration was created.
15591555
format: date-time
@@ -1627,8 +1623,6 @@ components:
16271623
$ref: '#/components/schemas/AWSAccountPartition'
16281624
aws_regions:
16291625
$ref: '#/components/schemas/AWSRegions'
1630-
ccm_config:
1631-
$ref: '#/components/schemas/AWSCCMConfig'
16321626
logs_config:
16331627
$ref: '#/components/schemas/AWSLogsConfig'
16341628
metrics_config:
@@ -1760,15 +1754,6 @@ components:
17601754
required:
17611755
- role_name
17621756
type: object
1763-
AWSCCMConfig:
1764-
description: AWS Cloud Cost Management config.
1765-
properties:
1766-
data_export_configs:
1767-
description: List of data export configurations for Cost and Usage Reports.
1768-
items:
1769-
$ref: '#/components/schemas/DataExportConfig'
1770-
type: array
1771-
type: object
17721757
AWSCredentials:
17731758
description: The definition of `AWSCredentials` object.
17741759
oneOf:
@@ -16814,30 +16799,6 @@ components:
1681416799
example: canceled
1681516800
type: string
1681616801
type: object
16817-
DataExportConfig:
16818-
description: AWS Cost and Usage Report data export configuration.
16819-
properties:
16820-
bucket_name:
16821-
description: Name of the S3 bucket where the Cost and Usage Report is stored.
16822-
example: billing
16823-
type: string
16824-
bucket_region:
16825-
description: AWS region of the S3 bucket.
16826-
example: us-east-1
16827-
type: string
16828-
report_name:
16829-
description: Name of the Cost and Usage Report.
16830-
example: cost-and-usage-report
16831-
type: string
16832-
report_prefix:
16833-
description: S3 prefix where the Cost and Usage Report is stored.
16834-
example: reports
16835-
type: string
16836-
report_type:
16837-
description: Type of the Cost and Usage Report.
16838-
example: CUR2.0
16839-
type: string
16840-
type: object
1684116802
DataRelationshipsTeams:
1684216803
description: Associates teams with this schedule in a data structure.
1684316804
properties:

‎docs/datadog_api_client.v2.model.rst‎

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

2352-
datadog\_api\_client.v2.model.awsccm\_config module
2353-
---------------------------------------------------
2354-
2355-
.. automodule:: datadog_api_client.v2.model.awsccm_config
2356-
:members:
2357-
:show-inheritance:
2358-
23592352
datadog\_api\_client.v2.model.azure\_credentials module
23602353
-------------------------------------------------------
23612354

@@ -6598,13 +6591,6 @@ datadog\_api\_client.v2.model.data\_deletion\_response\_meta module
65986591
:members:
65996592
:show-inheritance:
66006593

6601-
datadog\_api\_client.v2.model.data\_export\_config module
6602-
---------------------------------------------------------
6603-
6604-
.. automodule:: datadog_api_client.v2.model.data_export_config
6605-
:members:
6606-
:show-inheritance:
6607-
66086594
datadog\_api\_client.v2.model.data\_relationships\_teams module
66096595
---------------------------------------------------------------
66106596

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
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
2523

2624
body = AWSAccountCreateRequest(
2725
data=AWSAccountCreateRequestData(
@@ -35,17 +33,6 @@
3533
),
3634
aws_account_id="123456789012",
3735
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-
),
4936
logs_config=AWSLogsConfig(
5037
lambda_forwarder=AWSLambdaForwarderConfig(
5138
lambdas=[

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
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
2523

2624
body = AWSAccountCreateRequest(
2725
data=AWSAccountCreateRequestData(
@@ -34,17 +32,6 @@
3432
),
3533
aws_account_id="123456789012",
3634
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-
),
4835
logs_config=AWSLogsConfig(
4936
lambda_forwarder=AWSLambdaForwarderConfig(
5037
lambdas=[

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
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
2624

2725
# there is a valid "aws_account_v2" in the system
2826
AWS_ACCOUNT_V2_DATA_ID = environ["AWS_ACCOUNT_V2_DATA_ID"]
@@ -38,17 +36,6 @@
3836
),
3937
aws_account_id="123456789012",
4038
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-
),
5239
logs_config=AWSLogsConfig(
5340
lambda_forwarder=AWSLambdaForwarderConfig(
5441
lambdas=[

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
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
2221
from datadog_api_client.v2.model.aws_logs_config import AWSLogsConfig
2322
from datadog_api_client.v2.model.aws_metrics_config import AWSMetricsConfig
2423
from datadog_api_client.v2.model.aws_resources_config import AWSResourcesConfig
@@ -35,7 +34,6 @@ def openapi_types(_):
3534
from datadog_api_client.v2.model.aws_auth_config import AWSAuthConfig
3635
from datadog_api_client.v2.model.aws_account_partition import AWSAccountPartition
3736
from datadog_api_client.v2.model.aws_regions import AWSRegions
38-
from datadog_api_client.v2.model.awsccm_config import AWSCCMConfig
3937
from datadog_api_client.v2.model.aws_logs_config import AWSLogsConfig
4038
from datadog_api_client.v2.model.aws_metrics_config import AWSMetricsConfig
4139
from datadog_api_client.v2.model.aws_resources_config import AWSResourcesConfig
@@ -47,7 +45,6 @@ def openapi_types(_):
4745
"aws_account_id": (str,),
4846
"aws_partition": (AWSAccountPartition,),
4947
"aws_regions": (AWSRegions,),
50-
"ccm_config": (AWSCCMConfig,),
5148
"logs_config": (AWSLogsConfig,),
5249
"metrics_config": (AWSMetricsConfig,),
5350
"resources_config": (AWSResourcesConfig,),
@@ -60,7 +57,6 @@ def openapi_types(_):
6057
"aws_account_id": "aws_account_id",
6158
"aws_partition": "aws_partition",
6259
"aws_regions": "aws_regions",
63-
"ccm_config": "ccm_config",
6460
"logs_config": "logs_config",
6561
"metrics_config": "metrics_config",
6662
"resources_config": "resources_config",
@@ -74,7 +70,6 @@ def __init__(
7470
aws_partition: AWSAccountPartition,
7571
account_tags: Union[List[str], none_type, UnsetType] = unset,
7672
aws_regions: Union[AWSRegions, AWSRegionsIncludeAll, AWSRegionsIncludeOnly, UnsetType] = unset,
77-
ccm_config: Union[AWSCCMConfig, UnsetType] = unset,
7873
logs_config: Union[AWSLogsConfig, UnsetType] = unset,
7974
metrics_config: Union[AWSMetricsConfig, UnsetType] = unset,
8075
resources_config: Union[AWSResourcesConfig, UnsetType] = unset,
@@ -101,9 +96,6 @@ def __init__(
10196
:param aws_regions: AWS Regions to collect data from. Defaults to ``include_all``.
10297
:type aws_regions: AWSRegions, optional
10398
104-
:param ccm_config: AWS Cloud Cost Management config.
105-
:type ccm_config: AWSCCMConfig, optional
106-
10799
:param logs_config: AWS Logs Collection config.
108100
:type logs_config: AWSLogsConfig, optional
109101
@@ -120,8 +112,6 @@ def __init__(
120112
kwargs["account_tags"] = account_tags
121113
if aws_regions is not unset:
122114
kwargs["aws_regions"] = aws_regions
123-
if ccm_config is not unset:
124-
kwargs["ccm_config"] = ccm_config
125115
if logs_config is not unset:
126116
kwargs["logs_config"] = logs_config
127117
if metrics_config is not unset:

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
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
2322
from datadog_api_client.v2.model.aws_logs_config import AWSLogsConfig
2423
from datadog_api_client.v2.model.aws_metrics_config import AWSMetricsConfig
2524
from datadog_api_client.v2.model.aws_resources_config import AWSResourcesConfig
@@ -36,7 +35,6 @@ def openapi_types(_):
3635
from datadog_api_client.v2.model.aws_auth_config import AWSAuthConfig
3736
from datadog_api_client.v2.model.aws_account_partition import AWSAccountPartition
3837
from datadog_api_client.v2.model.aws_regions import AWSRegions
39-
from datadog_api_client.v2.model.awsccm_config import AWSCCMConfig
4038
from datadog_api_client.v2.model.aws_logs_config import AWSLogsConfig
4139
from datadog_api_client.v2.model.aws_metrics_config import AWSMetricsConfig
4240
from datadog_api_client.v2.model.aws_resources_config import AWSResourcesConfig
@@ -48,7 +46,6 @@ def openapi_types(_):
4846
"aws_account_id": (str,),
4947
"aws_partition": (AWSAccountPartition,),
5048
"aws_regions": (AWSRegions,),
51-
"ccm_config": (AWSCCMConfig,),
5249
"created_at": (datetime,),
5350
"logs_config": (AWSLogsConfig,),
5451
"metrics_config": (AWSMetricsConfig,),
@@ -63,7 +60,6 @@ def openapi_types(_):
6360
"aws_account_id": "aws_account_id",
6461
"aws_partition": "aws_partition",
6562
"aws_regions": "aws_regions",
66-
"ccm_config": "ccm_config",
6763
"created_at": "created_at",
6864
"logs_config": "logs_config",
6965
"metrics_config": "metrics_config",
@@ -83,7 +79,6 @@ def __init__(
8379
auth_config: Union[AWSAuthConfig, AWSAuthConfigKeys, AWSAuthConfigRole, UnsetType] = unset,
8480
aws_partition: Union[AWSAccountPartition, UnsetType] = unset,
8581
aws_regions: Union[AWSRegions, AWSRegionsIncludeAll, AWSRegionsIncludeOnly, UnsetType] = unset,
86-
ccm_config: Union[AWSCCMConfig, UnsetType] = unset,
8782
created_at: Union[datetime, UnsetType] = unset,
8883
logs_config: Union[AWSLogsConfig, UnsetType] = unset,
8984
metrics_config: Union[AWSMetricsConfig, UnsetType] = unset,
@@ -112,9 +107,6 @@ def __init__(
112107
:param aws_regions: AWS Regions to collect data from. Defaults to ``include_all``.
113108
:type aws_regions: AWSRegions, optional
114109
115-
:param ccm_config: AWS Cloud Cost Management config.
116-
:type ccm_config: AWSCCMConfig, optional
117-
118110
:param created_at: Timestamp of when the account integration was created.
119111
:type created_at: datetime, optional
120112
@@ -141,8 +133,6 @@ def __init__(
141133
kwargs["aws_partition"] = aws_partition
142134
if aws_regions is not unset:
143135
kwargs["aws_regions"] = aws_regions
144-
if ccm_config is not unset:
145-
kwargs["ccm_config"] = ccm_config
146136
if created_at is not unset:
147137
kwargs["created_at"] = created_at
148138
if logs_config is not unset:

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
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
2221
from datadog_api_client.v2.model.aws_logs_config import AWSLogsConfig
2322
from datadog_api_client.v2.model.aws_metrics_config import AWSMetricsConfig
2423
from datadog_api_client.v2.model.aws_resources_config import AWSResourcesConfig
@@ -35,7 +34,6 @@ def openapi_types(_):
3534
from datadog_api_client.v2.model.aws_auth_config import AWSAuthConfig
3635
from datadog_api_client.v2.model.aws_account_partition import AWSAccountPartition
3736
from datadog_api_client.v2.model.aws_regions import AWSRegions
38-
from datadog_api_client.v2.model.awsccm_config import AWSCCMConfig
3937
from datadog_api_client.v2.model.aws_logs_config import AWSLogsConfig
4038
from datadog_api_client.v2.model.aws_metrics_config import AWSMetricsConfig
4139
from datadog_api_client.v2.model.aws_resources_config import AWSResourcesConfig
@@ -47,7 +45,6 @@ def openapi_types(_):
4745
"aws_account_id": (str,),
4846
"aws_partition": (AWSAccountPartition,),
4947
"aws_regions": (AWSRegions,),
50-
"ccm_config": (AWSCCMConfig,),
5148
"logs_config": (AWSLogsConfig,),
5249
"metrics_config": (AWSMetricsConfig,),
5350
"resources_config": (AWSResourcesConfig,),
@@ -60,7 +57,6 @@ def openapi_types(_):
6057
"aws_account_id": "aws_account_id",
6158
"aws_partition": "aws_partition",
6259
"aws_regions": "aws_regions",
63-
"ccm_config": "ccm_config",
6460
"logs_config": "logs_config",
6561
"metrics_config": "metrics_config",
6662
"resources_config": "resources_config",
@@ -74,7 +70,6 @@ def __init__(
7470
auth_config: Union[AWSAuthConfig, AWSAuthConfigKeys, AWSAuthConfigRole, UnsetType] = unset,
7571
aws_partition: Union[AWSAccountPartition, UnsetType] = unset,
7672
aws_regions: Union[AWSRegions, AWSRegionsIncludeAll, AWSRegionsIncludeOnly, UnsetType] = unset,
77-
ccm_config: Union[AWSCCMConfig, UnsetType] = unset,
7873
logs_config: Union[AWSLogsConfig, UnsetType] = unset,
7974
metrics_config: Union[AWSMetricsConfig, UnsetType] = unset,
8075
resources_config: Union[AWSResourcesConfig, UnsetType] = unset,
@@ -101,9 +96,6 @@ def __init__(
10196
:param aws_regions: AWS Regions to collect data from. Defaults to ``include_all``.
10297
:type aws_regions: AWSRegions, optional
10398
104-
:param ccm_config: AWS Cloud Cost Management config.
105-
:type ccm_config: AWSCCMConfig, optional
106-
10799
:param logs_config: AWS Logs Collection config.
108100
:type logs_config: AWSLogsConfig, optional
109101
@@ -124,8 +116,6 @@ def __init__(
124116
kwargs["aws_partition"] = aws_partition
125117
if aws_regions is not unset:
126118
kwargs["aws_regions"] = aws_regions
127-
if ccm_config is not unset:
128-
kwargs["ccm_config"] = ccm_config
129119
if logs_config is not unset:
130120
kwargs["logs_config"] = logs_config
131121
if metrics_config is not unset:

0 commit comments

Comments
 (0)