Skip to content

Commit 86101d1

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 (#3306)
Co-authored-by: ci.datadog-api-spec <packages@datadoghq.com>
1 parent 7fdcc4e commit 86101d1

23 files changed

Lines changed: 598 additions & 41 deletions

‎.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:

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
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;
1415
import com.datadog.api.client.v2.model.AWSLambdaForwarderConfig;
1516
import com.datadog.api.client.v2.model.AWSLambdaForwarderConfigLogSourceConfig;
1617
import com.datadog.api.client.v2.model.AWSLogSourceTagFilter;
@@ -19,6 +20,7 @@
1920
import com.datadog.api.client.v2.model.AWSNamespaceTagFilter;
2021
import com.datadog.api.client.v2.model.AWSResourcesConfig;
2122
import com.datadog.api.client.v2.model.AWSTracesConfig;
23+
import com.datadog.api.client.v2.model.DataExportConfig;
2224
import java.util.Collections;
2325

2426
public class Example {
@@ -41,6 +43,16 @@ public static void main(String[] args) {
4143
"wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY")))
4244
.awsAccountId("123456789012")
4345
.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"))))
4456
.logsConfig(
4557
new AWSLogsConfig()
4658
.lambdaForwarder(

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
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;
1415
import com.datadog.api.client.v2.model.AWSLambdaForwarderConfig;
1516
import com.datadog.api.client.v2.model.AWSLambdaForwarderConfigLogSourceConfig;
1617
import com.datadog.api.client.v2.model.AWSLogSourceTagFilter;
@@ -19,6 +20,7 @@
1920
import com.datadog.api.client.v2.model.AWSNamespaceTagFilter;
2021
import com.datadog.api.client.v2.model.AWSResourcesConfig;
2122
import com.datadog.api.client.v2.model.AWSTracesConfig;
23+
import com.datadog.api.client.v2.model.DataExportConfig;
2224
import java.util.Collections;
2325

2426
public class Example {
@@ -38,6 +40,16 @@ public static void main(String[] args) {
3840
new AWSAuthConfigRole().roleName("DatadogIntegrationRole")))
3941
.awsAccountId("123456789012")
4042
.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"))))
4153
.logsConfig(
4254
new AWSLogsConfig()
4355
.lambdaForwarder(

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
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;
1415
import com.datadog.api.client.v2.model.AWSLambdaForwarderConfig;
1516
import com.datadog.api.client.v2.model.AWSLambdaForwarderConfigLogSourceConfig;
1617
import com.datadog.api.client.v2.model.AWSLogSourceTagFilter;
@@ -19,6 +20,7 @@
1920
import com.datadog.api.client.v2.model.AWSNamespaceTagFilter;
2021
import com.datadog.api.client.v2.model.AWSResourcesConfig;
2122
import com.datadog.api.client.v2.model.AWSTracesConfig;
23+
import com.datadog.api.client.v2.model.DataExportConfig;
2224
import java.util.Collections;
2325

2426
public class Example {
@@ -41,6 +43,16 @@ public static void main(String[] args) {
4143
new AWSAuthConfigRole().roleName("DatadogIntegrationRole")))
4244
.awsAccountId("123456789012")
4345
.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"))))
4456
.logsConfig(
4557
new AWSLogsConfig()
4658
.lambdaForwarder(

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

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
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,
3031
AWSAccountCreateRequestAttributes.JSON_PROPERTY_LOGS_CONFIG,
3132
AWSAccountCreateRequestAttributes.JSON_PROPERTY_METRICS_CONFIG,
3233
AWSAccountCreateRequestAttributes.JSON_PROPERTY_RESOURCES_CONFIG,
@@ -51,6 +52,9 @@ public class AWSAccountCreateRequestAttributes {
5152
public static final String JSON_PROPERTY_AWS_REGIONS = "aws_regions";
5253
private AWSRegions awsRegions;
5354

55+
public static final String JSON_PROPERTY_CCM_CONFIG = "ccm_config";
56+
private AWSCCMConfig ccmConfig;
57+
5458
public static final String JSON_PROPERTY_LOGS_CONFIG = "logs_config";
5559
private AWSLogsConfig logsConfig;
5660

@@ -210,6 +214,28 @@ public void setAwsRegions(AWSRegions awsRegions) {
210214
this.awsRegions = awsRegions;
211215
}
212216

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+
213239
public AWSAccountCreateRequestAttributes logsConfig(AWSLogsConfig logsConfig) {
214240
this.logsConfig = logsConfig;
215241
this.unparsed |= logsConfig.unparsed;
@@ -360,6 +386,7 @@ public boolean equals(Object o) {
360386
&& Objects.equals(this.awsAccountId, awsAccountCreateRequestAttributes.awsAccountId)
361387
&& Objects.equals(this.awsPartition, awsAccountCreateRequestAttributes.awsPartition)
362388
&& Objects.equals(this.awsRegions, awsAccountCreateRequestAttributes.awsRegions)
389+
&& Objects.equals(this.ccmConfig, awsAccountCreateRequestAttributes.ccmConfig)
363390
&& Objects.equals(this.logsConfig, awsAccountCreateRequestAttributes.logsConfig)
364391
&& Objects.equals(this.metricsConfig, awsAccountCreateRequestAttributes.metricsConfig)
365392
&& Objects.equals(this.resourcesConfig, awsAccountCreateRequestAttributes.resourcesConfig)
@@ -376,6 +403,7 @@ public int hashCode() {
376403
awsAccountId,
377404
awsPartition,
378405
awsRegions,
406+
ccmConfig,
379407
logsConfig,
380408
metricsConfig,
381409
resourcesConfig,
@@ -392,6 +420,7 @@ public String toString() {
392420
sb.append(" awsAccountId: ").append(toIndentedString(awsAccountId)).append("\n");
393421
sb.append(" awsPartition: ").append(toIndentedString(awsPartition)).append("\n");
394422
sb.append(" awsRegions: ").append(toIndentedString(awsRegions)).append("\n");
423+
sb.append(" ccmConfig: ").append(toIndentedString(ccmConfig)).append("\n");
395424
sb.append(" logsConfig: ").append(toIndentedString(logsConfig)).append("\n");
396425
sb.append(" metricsConfig: ").append(toIndentedString(metricsConfig)).append("\n");
397426
sb.append(" resourcesConfig: ").append(toIndentedString(resourcesConfig)).append("\n");

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

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
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,
3132
AWSAccountResponseAttributes.JSON_PROPERTY_CREATED_AT,
3233
AWSAccountResponseAttributes.JSON_PROPERTY_LOGS_CONFIG,
3334
AWSAccountResponseAttributes.JSON_PROPERTY_METRICS_CONFIG,
@@ -54,6 +55,9 @@ public class AWSAccountResponseAttributes {
5455
public static final String JSON_PROPERTY_AWS_REGIONS = "aws_regions";
5556
private AWSRegions awsRegions;
5657

58+
public static final String JSON_PROPERTY_CCM_CONFIG = "ccm_config";
59+
private AWSCCMConfig ccmConfig;
60+
5761
public static final String JSON_PROPERTY_CREATED_AT = "created_at";
5862
private OffsetDateTime createdAt;
5963

@@ -214,6 +218,28 @@ public void setAwsRegions(AWSRegions awsRegions) {
214218
this.awsRegions = awsRegions;
215219
}
216220

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+
217243
/**
218244
* Timestamp of when the account integration was created.
219245
*
@@ -387,6 +413,7 @@ public boolean equals(Object o) {
387413
&& Objects.equals(this.awsAccountId, awsAccountResponseAttributes.awsAccountId)
388414
&& Objects.equals(this.awsPartition, awsAccountResponseAttributes.awsPartition)
389415
&& Objects.equals(this.awsRegions, awsAccountResponseAttributes.awsRegions)
416+
&& Objects.equals(this.ccmConfig, awsAccountResponseAttributes.ccmConfig)
390417
&& Objects.equals(this.createdAt, awsAccountResponseAttributes.createdAt)
391418
&& Objects.equals(this.logsConfig, awsAccountResponseAttributes.logsConfig)
392419
&& Objects.equals(this.metricsConfig, awsAccountResponseAttributes.metricsConfig)
@@ -405,6 +432,7 @@ public int hashCode() {
405432
awsAccountId,
406433
awsPartition,
407434
awsRegions,
435+
ccmConfig,
408436
createdAt,
409437
logsConfig,
410438
metricsConfig,
@@ -423,6 +451,7 @@ public String toString() {
423451
sb.append(" awsAccountId: ").append(toIndentedString(awsAccountId)).append("\n");
424452
sb.append(" awsPartition: ").append(toIndentedString(awsPartition)).append("\n");
425453
sb.append(" awsRegions: ").append(toIndentedString(awsRegions)).append("\n");
454+
sb.append(" ccmConfig: ").append(toIndentedString(ccmConfig)).append("\n");
426455
sb.append(" createdAt: ").append(toIndentedString(createdAt)).append("\n");
427456
sb.append(" logsConfig: ").append(toIndentedString(logsConfig)).append("\n");
428457
sb.append(" metricsConfig: ").append(toIndentedString(metricsConfig)).append("\n");

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

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
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,
3031
AWSAccountUpdateRequestAttributes.JSON_PROPERTY_LOGS_CONFIG,
3132
AWSAccountUpdateRequestAttributes.JSON_PROPERTY_METRICS_CONFIG,
3233
AWSAccountUpdateRequestAttributes.JSON_PROPERTY_RESOURCES_CONFIG,
@@ -51,6 +52,9 @@ public class AWSAccountUpdateRequestAttributes {
5152
public static final String JSON_PROPERTY_AWS_REGIONS = "aws_regions";
5253
private AWSRegions awsRegions;
5354

55+
public static final String JSON_PROPERTY_CCM_CONFIG = "ccm_config";
56+
private AWSCCMConfig ccmConfig;
57+
5458
public static final String JSON_PROPERTY_LOGS_CONFIG = "logs_config";
5559
private AWSLogsConfig logsConfig;
5660

@@ -205,6 +209,28 @@ public void setAwsRegions(AWSRegions awsRegions) {
205209
this.awsRegions = awsRegions;
206210
}
207211

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+
208234
public AWSAccountUpdateRequestAttributes logsConfig(AWSLogsConfig logsConfig) {
209235
this.logsConfig = logsConfig;
210236
this.unparsed |= logsConfig.unparsed;
@@ -355,6 +381,7 @@ public boolean equals(Object o) {
355381
&& Objects.equals(this.awsAccountId, awsAccountUpdateRequestAttributes.awsAccountId)
356382
&& Objects.equals(this.awsPartition, awsAccountUpdateRequestAttributes.awsPartition)
357383
&& Objects.equals(this.awsRegions, awsAccountUpdateRequestAttributes.awsRegions)
384+
&& Objects.equals(this.ccmConfig, awsAccountUpdateRequestAttributes.ccmConfig)
358385
&& Objects.equals(this.logsConfig, awsAccountUpdateRequestAttributes.logsConfig)
359386
&& Objects.equals(this.metricsConfig, awsAccountUpdateRequestAttributes.metricsConfig)
360387
&& Objects.equals(this.resourcesConfig, awsAccountUpdateRequestAttributes.resourcesConfig)
@@ -371,6 +398,7 @@ public int hashCode() {
371398
awsAccountId,
372399
awsPartition,
373400
awsRegions,
401+
ccmConfig,
374402
logsConfig,
375403
metricsConfig,
376404
resourcesConfig,
@@ -387,6 +415,7 @@ public String toString() {
387415
sb.append(" awsAccountId: ").append(toIndentedString(awsAccountId)).append("\n");
388416
sb.append(" awsPartition: ").append(toIndentedString(awsPartition)).append("\n");
389417
sb.append(" awsRegions: ").append(toIndentedString(awsRegions)).append("\n");
418+
sb.append(" ccmConfig: ").append(toIndentedString(ccmConfig)).append("\n");
390419
sb.append(" logsConfig: ").append(toIndentedString(logsConfig)).append("\n");
391420
sb.append(" metricsConfig: ").append(toIndentedString(metricsConfig)).append("\n");
392421
sb.append(" resourcesConfig: ").append(toIndentedString(resourcesConfig)).append("\n");

0 commit comments

Comments
 (0)