Skip to content

Commit 7cd7d55

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 (#3368)
Co-authored-by: ci.datadog-api-spec <packages@datadoghq.com>
1 parent 00ccc5b commit 7cd7d55

23 files changed

Lines changed: 41 additions & 598 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:

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import com.datadog.api.client.v2.model.AWSAccountType;
1212
import com.datadog.api.client.v2.model.AWSAuthConfig;
1313
import com.datadog.api.client.v2.model.AWSAuthConfigKeys;
14-
import com.datadog.api.client.v2.model.AWSCCMConfig;
1514
import com.datadog.api.client.v2.model.AWSLambdaForwarderConfig;
1615
import com.datadog.api.client.v2.model.AWSLambdaForwarderConfigLogSourceConfig;
1716
import com.datadog.api.client.v2.model.AWSLogSourceTagFilter;
@@ -20,7 +19,6 @@
2019
import com.datadog.api.client.v2.model.AWSNamespaceTagFilter;
2120
import com.datadog.api.client.v2.model.AWSResourcesConfig;
2221
import com.datadog.api.client.v2.model.AWSTracesConfig;
23-
import com.datadog.api.client.v2.model.DataExportConfig;
2422
import java.util.Collections;
2523

2624
public class Example {
@@ -43,16 +41,6 @@ public static void main(String[] args) {
4341
"wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY")))
4442
.awsAccountId("123456789012")
4543
.awsPartition(AWSAccountPartition.AWS)
46-
.ccmConfig(
47-
new AWSCCMConfig()
48-
.dataExportConfigs(
49-
Collections.singletonList(
50-
new DataExportConfig()
51-
.bucketName("my-bucket")
52-
.bucketRegion("us-east-1")
53-
.reportName("my-report")
54-
.reportPrefix("reports")
55-
.reportType("CUR2.0"))))
5644
.logsConfig(
5745
new AWSLogsConfig()
5846
.lambdaForwarder(

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import com.datadog.api.client.v2.model.AWSAccountType;
1212
import com.datadog.api.client.v2.model.AWSAuthConfig;
1313
import com.datadog.api.client.v2.model.AWSAuthConfigRole;
14-
import com.datadog.api.client.v2.model.AWSCCMConfig;
1514
import com.datadog.api.client.v2.model.AWSLambdaForwarderConfig;
1615
import com.datadog.api.client.v2.model.AWSLambdaForwarderConfigLogSourceConfig;
1716
import com.datadog.api.client.v2.model.AWSLogSourceTagFilter;
@@ -20,7 +19,6 @@
2019
import com.datadog.api.client.v2.model.AWSNamespaceTagFilter;
2120
import com.datadog.api.client.v2.model.AWSResourcesConfig;
2221
import com.datadog.api.client.v2.model.AWSTracesConfig;
23-
import com.datadog.api.client.v2.model.DataExportConfig;
2422
import java.util.Collections;
2523

2624
public class Example {
@@ -40,16 +38,6 @@ public static void main(String[] args) {
4038
new AWSAuthConfigRole().roleName("DatadogIntegrationRole")))
4139
.awsAccountId("123456789012")
4240
.awsPartition(AWSAccountPartition.AWS)
43-
.ccmConfig(
44-
new AWSCCMConfig()
45-
.dataExportConfigs(
46-
Collections.singletonList(
47-
new DataExportConfig()
48-
.bucketName("my-bucket")
49-
.bucketRegion("us-east-1")
50-
.reportName("my-report")
51-
.reportPrefix("reports")
52-
.reportType("CUR2.0"))))
5341
.logsConfig(
5442
new AWSLogsConfig()
5543
.lambdaForwarder(

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import com.datadog.api.client.v2.model.AWSAccountUpdateRequestData;
1212
import com.datadog.api.client.v2.model.AWSAuthConfig;
1313
import com.datadog.api.client.v2.model.AWSAuthConfigRole;
14-
import com.datadog.api.client.v2.model.AWSCCMConfig;
1514
import com.datadog.api.client.v2.model.AWSLambdaForwarderConfig;
1615
import com.datadog.api.client.v2.model.AWSLambdaForwarderConfigLogSourceConfig;
1716
import com.datadog.api.client.v2.model.AWSLogSourceTagFilter;
@@ -20,7 +19,6 @@
2019
import com.datadog.api.client.v2.model.AWSNamespaceTagFilter;
2120
import com.datadog.api.client.v2.model.AWSResourcesConfig;
2221
import com.datadog.api.client.v2.model.AWSTracesConfig;
23-
import com.datadog.api.client.v2.model.DataExportConfig;
2422
import java.util.Collections;
2523

2624
public class Example {
@@ -43,16 +41,6 @@ public static void main(String[] args) {
4341
new AWSAuthConfigRole().roleName("DatadogIntegrationRole")))
4442
.awsAccountId("123456789012")
4543
.awsPartition(AWSAccountPartition.AWS)
46-
.ccmConfig(
47-
new AWSCCMConfig()
48-
.dataExportConfigs(
49-
Collections.singletonList(
50-
new DataExportConfig()
51-
.bucketName("updated-bucket")
52-
.bucketRegion("us-west-2")
53-
.reportName("updated-report")
54-
.reportPrefix("cost-reports")
55-
.reportType("CUR2.0"))))
5644
.logsConfig(
5745
new AWSLogsConfig()
5846
.lambdaForwarder(

‎src/main/java/com/datadog/api/client/v2/model/AWSAccountCreateRequestAttributes.java‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
AWSAccountCreateRequestAttributes.JSON_PROPERTY_AWS_ACCOUNT_ID,
2828
AWSAccountCreateRequestAttributes.JSON_PROPERTY_AWS_PARTITION,
2929
AWSAccountCreateRequestAttributes.JSON_PROPERTY_AWS_REGIONS,
30-
AWSAccountCreateRequestAttributes.JSON_PROPERTY_CCM_CONFIG,
3130
AWSAccountCreateRequestAttributes.JSON_PROPERTY_LOGS_CONFIG,
3231
AWSAccountCreateRequestAttributes.JSON_PROPERTY_METRICS_CONFIG,
3332
AWSAccountCreateRequestAttributes.JSON_PROPERTY_RESOURCES_CONFIG,
@@ -52,9 +51,6 @@ public class AWSAccountCreateRequestAttributes {
5251
public static final String JSON_PROPERTY_AWS_REGIONS = "aws_regions";
5352
private AWSRegions awsRegions;
5453

55-
public static final String JSON_PROPERTY_CCM_CONFIG = "ccm_config";
56-
private AWSCCMConfig ccmConfig;
57-
5854
public static final String JSON_PROPERTY_LOGS_CONFIG = "logs_config";
5955
private AWSLogsConfig logsConfig;
6056

@@ -214,28 +210,6 @@ public void setAwsRegions(AWSRegions awsRegions) {
214210
this.awsRegions = awsRegions;
215211
}
216212

217-
public AWSAccountCreateRequestAttributes ccmConfig(AWSCCMConfig ccmConfig) {
218-
this.ccmConfig = ccmConfig;
219-
this.unparsed |= ccmConfig.unparsed;
220-
return this;
221-
}
222-
223-
/**
224-
* AWS Cloud Cost Management config.
225-
*
226-
* @return ccmConfig
227-
*/
228-
@jakarta.annotation.Nullable
229-
@JsonProperty(JSON_PROPERTY_CCM_CONFIG)
230-
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
231-
public AWSCCMConfig getCcmConfig() {
232-
return ccmConfig;
233-
}
234-
235-
public void setCcmConfig(AWSCCMConfig ccmConfig) {
236-
this.ccmConfig = ccmConfig;
237-
}
238-
239213
public AWSAccountCreateRequestAttributes logsConfig(AWSLogsConfig logsConfig) {
240214
this.logsConfig = logsConfig;
241215
this.unparsed |= logsConfig.unparsed;
@@ -386,7 +360,6 @@ public boolean equals(Object o) {
386360
&& Objects.equals(this.awsAccountId, awsAccountCreateRequestAttributes.awsAccountId)
387361
&& Objects.equals(this.awsPartition, awsAccountCreateRequestAttributes.awsPartition)
388362
&& Objects.equals(this.awsRegions, awsAccountCreateRequestAttributes.awsRegions)
389-
&& Objects.equals(this.ccmConfig, awsAccountCreateRequestAttributes.ccmConfig)
390363
&& Objects.equals(this.logsConfig, awsAccountCreateRequestAttributes.logsConfig)
391364
&& Objects.equals(this.metricsConfig, awsAccountCreateRequestAttributes.metricsConfig)
392365
&& Objects.equals(this.resourcesConfig, awsAccountCreateRequestAttributes.resourcesConfig)
@@ -403,7 +376,6 @@ public int hashCode() {
403376
awsAccountId,
404377
awsPartition,
405378
awsRegions,
406-
ccmConfig,
407379
logsConfig,
408380
metricsConfig,
409381
resourcesConfig,
@@ -420,7 +392,6 @@ public String toString() {
420392
sb.append(" awsAccountId: ").append(toIndentedString(awsAccountId)).append("\n");
421393
sb.append(" awsPartition: ").append(toIndentedString(awsPartition)).append("\n");
422394
sb.append(" awsRegions: ").append(toIndentedString(awsRegions)).append("\n");
423-
sb.append(" ccmConfig: ").append(toIndentedString(ccmConfig)).append("\n");
424395
sb.append(" logsConfig: ").append(toIndentedString(logsConfig)).append("\n");
425396
sb.append(" metricsConfig: ").append(toIndentedString(metricsConfig)).append("\n");
426397
sb.append(" resourcesConfig: ").append(toIndentedString(resourcesConfig)).append("\n");

‎src/main/java/com/datadog/api/client/v2/model/AWSAccountResponseAttributes.java‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
AWSAccountResponseAttributes.JSON_PROPERTY_AWS_ACCOUNT_ID,
2929
AWSAccountResponseAttributes.JSON_PROPERTY_AWS_PARTITION,
3030
AWSAccountResponseAttributes.JSON_PROPERTY_AWS_REGIONS,
31-
AWSAccountResponseAttributes.JSON_PROPERTY_CCM_CONFIG,
3231
AWSAccountResponseAttributes.JSON_PROPERTY_CREATED_AT,
3332
AWSAccountResponseAttributes.JSON_PROPERTY_LOGS_CONFIG,
3433
AWSAccountResponseAttributes.JSON_PROPERTY_METRICS_CONFIG,
@@ -55,9 +54,6 @@ public class AWSAccountResponseAttributes {
5554
public static final String JSON_PROPERTY_AWS_REGIONS = "aws_regions";
5655
private AWSRegions awsRegions;
5756

58-
public static final String JSON_PROPERTY_CCM_CONFIG = "ccm_config";
59-
private AWSCCMConfig ccmConfig;
60-
6157
public static final String JSON_PROPERTY_CREATED_AT = "created_at";
6258
private OffsetDateTime createdAt;
6359

@@ -218,28 +214,6 @@ public void setAwsRegions(AWSRegions awsRegions) {
218214
this.awsRegions = awsRegions;
219215
}
220216

221-
public AWSAccountResponseAttributes ccmConfig(AWSCCMConfig ccmConfig) {
222-
this.ccmConfig = ccmConfig;
223-
this.unparsed |= ccmConfig.unparsed;
224-
return this;
225-
}
226-
227-
/**
228-
* AWS Cloud Cost Management config.
229-
*
230-
* @return ccmConfig
231-
*/
232-
@jakarta.annotation.Nullable
233-
@JsonProperty(JSON_PROPERTY_CCM_CONFIG)
234-
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
235-
public AWSCCMConfig getCcmConfig() {
236-
return ccmConfig;
237-
}
238-
239-
public void setCcmConfig(AWSCCMConfig ccmConfig) {
240-
this.ccmConfig = ccmConfig;
241-
}
242-
243217
/**
244218
* Timestamp of when the account integration was created.
245219
*
@@ -413,7 +387,6 @@ public boolean equals(Object o) {
413387
&& Objects.equals(this.awsAccountId, awsAccountResponseAttributes.awsAccountId)
414388
&& Objects.equals(this.awsPartition, awsAccountResponseAttributes.awsPartition)
415389
&& Objects.equals(this.awsRegions, awsAccountResponseAttributes.awsRegions)
416-
&& Objects.equals(this.ccmConfig, awsAccountResponseAttributes.ccmConfig)
417390
&& Objects.equals(this.createdAt, awsAccountResponseAttributes.createdAt)
418391
&& Objects.equals(this.logsConfig, awsAccountResponseAttributes.logsConfig)
419392
&& Objects.equals(this.metricsConfig, awsAccountResponseAttributes.metricsConfig)
@@ -432,7 +405,6 @@ public int hashCode() {
432405
awsAccountId,
433406
awsPartition,
434407
awsRegions,
435-
ccmConfig,
436408
createdAt,
437409
logsConfig,
438410
metricsConfig,
@@ -451,7 +423,6 @@ public String toString() {
451423
sb.append(" awsAccountId: ").append(toIndentedString(awsAccountId)).append("\n");
452424
sb.append(" awsPartition: ").append(toIndentedString(awsPartition)).append("\n");
453425
sb.append(" awsRegions: ").append(toIndentedString(awsRegions)).append("\n");
454-
sb.append(" ccmConfig: ").append(toIndentedString(ccmConfig)).append("\n");
455426
sb.append(" createdAt: ").append(toIndentedString(createdAt)).append("\n");
456427
sb.append(" logsConfig: ").append(toIndentedString(logsConfig)).append("\n");
457428
sb.append(" metricsConfig: ").append(toIndentedString(metricsConfig)).append("\n");

‎src/main/java/com/datadog/api/client/v2/model/AWSAccountUpdateRequestAttributes.java‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
AWSAccountUpdateRequestAttributes.JSON_PROPERTY_AWS_ACCOUNT_ID,
2828
AWSAccountUpdateRequestAttributes.JSON_PROPERTY_AWS_PARTITION,
2929
AWSAccountUpdateRequestAttributes.JSON_PROPERTY_AWS_REGIONS,
30-
AWSAccountUpdateRequestAttributes.JSON_PROPERTY_CCM_CONFIG,
3130
AWSAccountUpdateRequestAttributes.JSON_PROPERTY_LOGS_CONFIG,
3231
AWSAccountUpdateRequestAttributes.JSON_PROPERTY_METRICS_CONFIG,
3332
AWSAccountUpdateRequestAttributes.JSON_PROPERTY_RESOURCES_CONFIG,
@@ -52,9 +51,6 @@ public class AWSAccountUpdateRequestAttributes {
5251
public static final String JSON_PROPERTY_AWS_REGIONS = "aws_regions";
5352
private AWSRegions awsRegions;
5453

55-
public static final String JSON_PROPERTY_CCM_CONFIG = "ccm_config";
56-
private AWSCCMConfig ccmConfig;
57-
5854
public static final String JSON_PROPERTY_LOGS_CONFIG = "logs_config";
5955
private AWSLogsConfig logsConfig;
6056

@@ -209,28 +205,6 @@ public void setAwsRegions(AWSRegions awsRegions) {
209205
this.awsRegions = awsRegions;
210206
}
211207

212-
public AWSAccountUpdateRequestAttributes ccmConfig(AWSCCMConfig ccmConfig) {
213-
this.ccmConfig = ccmConfig;
214-
this.unparsed |= ccmConfig.unparsed;
215-
return this;
216-
}
217-
218-
/**
219-
* AWS Cloud Cost Management config.
220-
*
221-
* @return ccmConfig
222-
*/
223-
@jakarta.annotation.Nullable
224-
@JsonProperty(JSON_PROPERTY_CCM_CONFIG)
225-
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
226-
public AWSCCMConfig getCcmConfig() {
227-
return ccmConfig;
228-
}
229-
230-
public void setCcmConfig(AWSCCMConfig ccmConfig) {
231-
this.ccmConfig = ccmConfig;
232-
}
233-
234208
public AWSAccountUpdateRequestAttributes logsConfig(AWSLogsConfig logsConfig) {
235209
this.logsConfig = logsConfig;
236210
this.unparsed |= logsConfig.unparsed;
@@ -381,7 +355,6 @@ public boolean equals(Object o) {
381355
&& Objects.equals(this.awsAccountId, awsAccountUpdateRequestAttributes.awsAccountId)
382356
&& Objects.equals(this.awsPartition, awsAccountUpdateRequestAttributes.awsPartition)
383357
&& Objects.equals(this.awsRegions, awsAccountUpdateRequestAttributes.awsRegions)
384-
&& Objects.equals(this.ccmConfig, awsAccountUpdateRequestAttributes.ccmConfig)
385358
&& Objects.equals(this.logsConfig, awsAccountUpdateRequestAttributes.logsConfig)
386359
&& Objects.equals(this.metricsConfig, awsAccountUpdateRequestAttributes.metricsConfig)
387360
&& Objects.equals(this.resourcesConfig, awsAccountUpdateRequestAttributes.resourcesConfig)
@@ -398,7 +371,6 @@ public int hashCode() {
398371
awsAccountId,
399372
awsPartition,
400373
awsRegions,
401-
ccmConfig,
402374
logsConfig,
403375
metricsConfig,
404376
resourcesConfig,
@@ -415,7 +387,6 @@ public String toString() {
415387
sb.append(" awsAccountId: ").append(toIndentedString(awsAccountId)).append("\n");
416388
sb.append(" awsPartition: ").append(toIndentedString(awsPartition)).append("\n");
417389
sb.append(" awsRegions: ").append(toIndentedString(awsRegions)).append("\n");
418-
sb.append(" ccmConfig: ").append(toIndentedString(ccmConfig)).append("\n");
419390
sb.append(" logsConfig: ").append(toIndentedString(logsConfig)).append("\n");
420391
sb.append(" metricsConfig: ").append(toIndentedString(metricsConfig)).append("\n");
421392
sb.append(" resourcesConfig: ").append(toIndentedString(resourcesConfig)).append("\n");

0 commit comments

Comments
 (0)