Update specs for AWS account updates and creation for CCM configs

.generator/schemas/v2/openapi.yaml

@@ -1496,6 +1496,8 @@ components:
           $ref: '#/components/schemas/AWSAccountPartition'
         aws_regions:
           $ref: '#/components/schemas/AWSRegions'
+        ccm_config:
+          $ref: '#/components/schemas/AWSCCMConfig'
         logs_config:
           $ref: '#/components/schemas/AWSLogsConfig'
         metrics_config:
@@ -1561,6 +1563,8 @@ components:
           $ref: '#/components/schemas/AWSAccountPartition'
         aws_regions:
           $ref: '#/components/schemas/AWSRegions'
+        ccm_config:
+          $ref: '#/components/schemas/AWSCCMConfig'
         created_at:
           description: Timestamp of when the account integration was created.
           format: date-time
@@ -1634,6 +1638,8 @@ components:
           $ref: '#/components/schemas/AWSAccountPartition'
         aws_regions:
           $ref: '#/components/schemas/AWSRegions'
+        ccm_config:
+          $ref: '#/components/schemas/AWSCCMConfig'
         logs_config:
           $ref: '#/components/schemas/AWSLogsConfig'
         metrics_config:
@@ -1765,6 +1771,15 @@ components:
       required:
       - role_name
       type: object
+    AWSCCMConfig:
+      description: AWS Cloud Cost Management config.
+      properties:
+        data_export_configs:
+          description: List of data export configurations for Cost and Usage Reports.
+          items:
+            $ref: '#/components/schemas/DataExportConfig'
+          type: array
+      type: object
     AWSCredentials:
       description: The definition of `AWSCredentials` object.
       oneOf:
@@ -16354,6 +16369,30 @@ components:
           example: canceled
           type: string
       type: object
+    DataExportConfig:
+      description: AWS Cost and Usage Report data export configuration.
+      properties:
+        bucket_name:
+          description: Name of the S3 bucket where the Cost and Usage Report is stored.
+          example: billing
+          type: string
+        bucket_region:
+          description: AWS region of the S3 bucket.
+          example: us-east-1
+          type: string
+        report_name:
+          description: Name of the Cost and Usage Report.
+          example: cost-and-usage-report
+          type: string
+        report_prefix:
+          description: S3 prefix where the Cost and Usage Report is stored.
+          example: reports
+          type: string
+        report_type:
+          description: Type of the Cost and Usage Report.
+          example: CUR2.0
+          type: string
+      type: object
     DataRelationshipsTeams:
       description: Associates teams with this schedule in a data structure.
       properties:

examples/v2/aws-integration/CreateAWSAccount.java

@@ -11,6 +11,7 @@
 import com.datadog.api.client.v2.model.AWSAccountType;
 import com.datadog.api.client.v2.model.AWSAuthConfig;
 import com.datadog.api.client.v2.model.AWSAuthConfigKeys;
+import com.datadog.api.client.v2.model.AWSCCMConfig;
 import com.datadog.api.client.v2.model.AWSLambdaForwarderConfig;
 import com.datadog.api.client.v2.model.AWSLambdaForwarderConfigLogSourceConfig;
 import com.datadog.api.client.v2.model.AWSLogSourceTagFilter;
@@ -19,6 +20,7 @@
 import com.datadog.api.client.v2.model.AWSNamespaceTagFilter;
 import com.datadog.api.client.v2.model.AWSResourcesConfig;
 import com.datadog.api.client.v2.model.AWSTracesConfig;
+import com.datadog.api.client.v2.model.DataExportConfig;
 import java.util.Collections;
 
 public class Example {
@@ -41,6 +43,16 @@ public static void main(String[] args) {
                                             "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY")))
                             .awsAccountId("123456789012")
                             .awsPartition(AWSAccountPartition.AWS)
+                            .ccmConfig(
+                                new AWSCCMConfig()
+                                    .dataExportConfigs(
+                                        Collections.singletonList(
+                                            new DataExportConfig()
+                                                .bucketName("my-bucket")
+                                                .bucketRegion("us-east-1")
+                                                .reportName("my-report")
+                                                .reportPrefix("reports")
+                                                .reportType("CUR2.0"))))
                             .logsConfig(
                                 new AWSLogsConfig()
                                     .lambdaForwarder(

examples/v2/aws-integration/CreateAWSAccount_1716720881.java

@@ -11,6 +11,7 @@
 import com.datadog.api.client.v2.model.AWSAccountType;
 import com.datadog.api.client.v2.model.AWSAuthConfig;
 import com.datadog.api.client.v2.model.AWSAuthConfigRole;
+import com.datadog.api.client.v2.model.AWSCCMConfig;
 import com.datadog.api.client.v2.model.AWSLambdaForwarderConfig;
 import com.datadog.api.client.v2.model.AWSLambdaForwarderConfigLogSourceConfig;
 import com.datadog.api.client.v2.model.AWSLogSourceTagFilter;
@@ -19,6 +20,7 @@
 import com.datadog.api.client.v2.model.AWSNamespaceTagFilter;
 import com.datadog.api.client.v2.model.AWSResourcesConfig;
 import com.datadog.api.client.v2.model.AWSTracesConfig;
+import com.datadog.api.client.v2.model.DataExportConfig;
 import java.util.Collections;
 
 public class Example {
@@ -38,6 +40,16 @@ public static void main(String[] args) {
                                     new AWSAuthConfigRole().roleName("DatadogIntegrationRole")))
                             .awsAccountId("123456789012")
                             .awsPartition(AWSAccountPartition.AWS)
+                            .ccmConfig(
+                                new AWSCCMConfig()
+                                    .dataExportConfigs(
+                                        Collections.singletonList(
+                                            new DataExportConfig()
+                                                .bucketName("my-bucket")
+                                                .bucketRegion("us-east-1")
+                                                .reportName("my-report")
+                                                .reportPrefix("reports")
+                                                .reportType("CUR2.0"))))
                             .logsConfig(
                                 new AWSLogsConfig()
                                     .lambdaForwarder(

examples/v2/aws-integration/UpdateAWSAccount.java

@@ -11,6 +11,7 @@
 import com.datadog.api.client.v2.model.AWSAccountUpdateRequestData;
 import com.datadog.api.client.v2.model.AWSAuthConfig;
 import com.datadog.api.client.v2.model.AWSAuthConfigRole;
+import com.datadog.api.client.v2.model.AWSCCMConfig;
 import com.datadog.api.client.v2.model.AWSLambdaForwarderConfig;
 import com.datadog.api.client.v2.model.AWSLambdaForwarderConfigLogSourceConfig;
 import com.datadog.api.client.v2.model.AWSLogSourceTagFilter;
@@ -19,6 +20,7 @@
 import com.datadog.api.client.v2.model.AWSNamespaceTagFilter;
 import com.datadog.api.client.v2.model.AWSResourcesConfig;
 import com.datadog.api.client.v2.model.AWSTracesConfig;
+import com.datadog.api.client.v2.model.DataExportConfig;
 import java.util.Collections;
 
 public class Example {
@@ -41,6 +43,16 @@ public static void main(String[] args) {
                                     new AWSAuthConfigRole().roleName("DatadogIntegrationRole")))
                             .awsAccountId("123456789012")
                             .awsPartition(AWSAccountPartition.AWS)
+                            .ccmConfig(
+                                new AWSCCMConfig()
+                                    .dataExportConfigs(
+                                        Collections.singletonList(
+                                            new DataExportConfig()
+                                                .bucketName("updated-bucket")
+                                                .bucketRegion("us-west-2")
+                                                .reportName("updated-report")
+                                                .reportPrefix("cost-reports")
+                                                .reportType("CUR2.0"))))
                             .logsConfig(
                                 new AWSLogsConfig()
                                     .lambdaForwarder(

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

@@ -27,6 +27,7 @@
   AWSAccountCreateRequestAttributes.JSON_PROPERTY_AWS_ACCOUNT_ID,
   AWSAccountCreateRequestAttributes.JSON_PROPERTY_AWS_PARTITION,
   AWSAccountCreateRequestAttributes.JSON_PROPERTY_AWS_REGIONS,
+  AWSAccountCreateRequestAttributes.JSON_PROPERTY_CCM_CONFIG,
   AWSAccountCreateRequestAttributes.JSON_PROPERTY_LOGS_CONFIG,
   AWSAccountCreateRequestAttributes.JSON_PROPERTY_METRICS_CONFIG,
   AWSAccountCreateRequestAttributes.JSON_PROPERTY_RESOURCES_CONFIG,
@@ -51,6 +52,9 @@ public class AWSAccountCreateRequestAttributes {
   public static final String JSON_PROPERTY_AWS_REGIONS = "aws_regions";
   private AWSRegions awsRegions;
 
+  public static final String JSON_PROPERTY_CCM_CONFIG = "ccm_config";
+  private AWSCCMConfig ccmConfig;
+
   public static final String JSON_PROPERTY_LOGS_CONFIG = "logs_config";
   private AWSLogsConfig logsConfig;
 
@@ -210,6 +214,28 @@ public void setAwsRegions(AWSRegions awsRegions) {
     this.awsRegions = awsRegions;
   }
 
+  public AWSAccountCreateRequestAttributes ccmConfig(AWSCCMConfig ccmConfig) {
+    this.ccmConfig = ccmConfig;
+    this.unparsed |= ccmConfig.unparsed;
+    return this;
+  }
+
+  /**
+   * AWS Cloud Cost Management config.
+   *
+   * @return ccmConfig
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_CCM_CONFIG)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public AWSCCMConfig getCcmConfig() {
+    return ccmConfig;
+  }
+
+  public void setCcmConfig(AWSCCMConfig ccmConfig) {
+    this.ccmConfig = ccmConfig;
+  }
+
   public AWSAccountCreateRequestAttributes logsConfig(AWSLogsConfig logsConfig) {
     this.logsConfig = logsConfig;
     this.unparsed |= logsConfig.unparsed;
@@ -360,6 +386,7 @@ public boolean equals(Object o) {
         && Objects.equals(this.awsAccountId, awsAccountCreateRequestAttributes.awsAccountId)
         && Objects.equals(this.awsPartition, awsAccountCreateRequestAttributes.awsPartition)
         && Objects.equals(this.awsRegions, awsAccountCreateRequestAttributes.awsRegions)
+        && Objects.equals(this.ccmConfig, awsAccountCreateRequestAttributes.ccmConfig)
         && Objects.equals(this.logsConfig, awsAccountCreateRequestAttributes.logsConfig)
         && Objects.equals(this.metricsConfig, awsAccountCreateRequestAttributes.metricsConfig)
         && Objects.equals(this.resourcesConfig, awsAccountCreateRequestAttributes.resourcesConfig)
@@ -376,6 +403,7 @@ public int hashCode() {
         awsAccountId,
         awsPartition,
         awsRegions,
+        ccmConfig,
         logsConfig,
         metricsConfig,
         resourcesConfig,
@@ -392,6 +420,7 @@ public String toString() {
     sb.append("    awsAccountId: ").append(toIndentedString(awsAccountId)).append("\n");
     sb.append("    awsPartition: ").append(toIndentedString(awsPartition)).append("\n");
     sb.append("    awsRegions: ").append(toIndentedString(awsRegions)).append("\n");
+    sb.append("    ccmConfig: ").append(toIndentedString(ccmConfig)).append("\n");
     sb.append("    logsConfig: ").append(toIndentedString(logsConfig)).append("\n");
     sb.append("    metricsConfig: ").append(toIndentedString(metricsConfig)).append("\n");
     sb.append("    resourcesConfig: ").append(toIndentedString(resourcesConfig)).append("\n");

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

@@ -28,6 +28,7 @@
   AWSAccountResponseAttributes.JSON_PROPERTY_AWS_ACCOUNT_ID,
   AWSAccountResponseAttributes.JSON_PROPERTY_AWS_PARTITION,
   AWSAccountResponseAttributes.JSON_PROPERTY_AWS_REGIONS,
+  AWSAccountResponseAttributes.JSON_PROPERTY_CCM_CONFIG,
   AWSAccountResponseAttributes.JSON_PROPERTY_CREATED_AT,
   AWSAccountResponseAttributes.JSON_PROPERTY_LOGS_CONFIG,
   AWSAccountResponseAttributes.JSON_PROPERTY_METRICS_CONFIG,
@@ -54,6 +55,9 @@ public class AWSAccountResponseAttributes {
   public static final String JSON_PROPERTY_AWS_REGIONS = "aws_regions";
   private AWSRegions awsRegions;
 
+  public static final String JSON_PROPERTY_CCM_CONFIG = "ccm_config";
+  private AWSCCMConfig ccmConfig;
+
   public static final String JSON_PROPERTY_CREATED_AT = "created_at";
   private OffsetDateTime createdAt;
 
@@ -214,6 +218,28 @@ public void setAwsRegions(AWSRegions awsRegions) {
     this.awsRegions = awsRegions;
   }
 
+  public AWSAccountResponseAttributes ccmConfig(AWSCCMConfig ccmConfig) {
+    this.ccmConfig = ccmConfig;
+    this.unparsed |= ccmConfig.unparsed;
+    return this;
+  }
+
+  /**
+   * AWS Cloud Cost Management config.
+   *
+   * @return ccmConfig
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_CCM_CONFIG)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public AWSCCMConfig getCcmConfig() {
+    return ccmConfig;
+  }
+
+  public void setCcmConfig(AWSCCMConfig ccmConfig) {
+    this.ccmConfig = ccmConfig;
+  }
+
   /**
    * Timestamp of when the account integration was created.
    *
@@ -387,6 +413,7 @@ public boolean equals(Object o) {
         && Objects.equals(this.awsAccountId, awsAccountResponseAttributes.awsAccountId)
         && Objects.equals(this.awsPartition, awsAccountResponseAttributes.awsPartition)
         && Objects.equals(this.awsRegions, awsAccountResponseAttributes.awsRegions)
+        && Objects.equals(this.ccmConfig, awsAccountResponseAttributes.ccmConfig)
         && Objects.equals(this.createdAt, awsAccountResponseAttributes.createdAt)
         && Objects.equals(this.logsConfig, awsAccountResponseAttributes.logsConfig)
         && Objects.equals(this.metricsConfig, awsAccountResponseAttributes.metricsConfig)
@@ -405,6 +432,7 @@ public int hashCode() {
         awsAccountId,
         awsPartition,
         awsRegions,
+        ccmConfig,
         createdAt,
         logsConfig,
         metricsConfig,
@@ -423,6 +451,7 @@ public String toString() {
     sb.append("    awsAccountId: ").append(toIndentedString(awsAccountId)).append("\n");
     sb.append("    awsPartition: ").append(toIndentedString(awsPartition)).append("\n");
     sb.append("    awsRegions: ").append(toIndentedString(awsRegions)).append("\n");
+    sb.append("    ccmConfig: ").append(toIndentedString(ccmConfig)).append("\n");
     sb.append("    createdAt: ").append(toIndentedString(createdAt)).append("\n");
     sb.append("    logsConfig: ").append(toIndentedString(logsConfig)).append("\n");
     sb.append("    metricsConfig: ").append(toIndentedString(metricsConfig)).append("\n");

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

@@ -27,6 +27,7 @@
   AWSAccountUpdateRequestAttributes.JSON_PROPERTY_AWS_ACCOUNT_ID,
   AWSAccountUpdateRequestAttributes.JSON_PROPERTY_AWS_PARTITION,
   AWSAccountUpdateRequestAttributes.JSON_PROPERTY_AWS_REGIONS,
+  AWSAccountUpdateRequestAttributes.JSON_PROPERTY_CCM_CONFIG,
   AWSAccountUpdateRequestAttributes.JSON_PROPERTY_LOGS_CONFIG,
   AWSAccountUpdateRequestAttributes.JSON_PROPERTY_METRICS_CONFIG,
   AWSAccountUpdateRequestAttributes.JSON_PROPERTY_RESOURCES_CONFIG,
@@ -51,6 +52,9 @@ public class AWSAccountUpdateRequestAttributes {
   public static final String JSON_PROPERTY_AWS_REGIONS = "aws_regions";
   private AWSRegions awsRegions;
 
+  public static final String JSON_PROPERTY_CCM_CONFIG = "ccm_config";
+  private AWSCCMConfig ccmConfig;
+
   public static final String JSON_PROPERTY_LOGS_CONFIG = "logs_config";
   private AWSLogsConfig logsConfig;
 
@@ -205,6 +209,28 @@ public void setAwsRegions(AWSRegions awsRegions) {
     this.awsRegions = awsRegions;
   }
 
+  public AWSAccountUpdateRequestAttributes ccmConfig(AWSCCMConfig ccmConfig) {
+    this.ccmConfig = ccmConfig;
+    this.unparsed |= ccmConfig.unparsed;
+    return this;
+  }
+
+  /**
+   * AWS Cloud Cost Management config.
+   *
+   * @return ccmConfig
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_CCM_CONFIG)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public AWSCCMConfig getCcmConfig() {
+    return ccmConfig;
+  }
+
+  public void setCcmConfig(AWSCCMConfig ccmConfig) {
+    this.ccmConfig = ccmConfig;
+  }
+
   public AWSAccountUpdateRequestAttributes logsConfig(AWSLogsConfig logsConfig) {
     this.logsConfig = logsConfig;
     this.unparsed |= logsConfig.unparsed;
@@ -355,6 +381,7 @@ public boolean equals(Object o) {
         && Objects.equals(this.awsAccountId, awsAccountUpdateRequestAttributes.awsAccountId)
         && Objects.equals(this.awsPartition, awsAccountUpdateRequestAttributes.awsPartition)
         && Objects.equals(this.awsRegions, awsAccountUpdateRequestAttributes.awsRegions)
+        && Objects.equals(this.ccmConfig, awsAccountUpdateRequestAttributes.ccmConfig)
         && Objects.equals(this.logsConfig, awsAccountUpdateRequestAttributes.logsConfig)
         && Objects.equals(this.metricsConfig, awsAccountUpdateRequestAttributes.metricsConfig)
         && Objects.equals(this.resourcesConfig, awsAccountUpdateRequestAttributes.resourcesConfig)
@@ -371,6 +398,7 @@ public int hashCode() {
         awsAccountId,
         awsPartition,
         awsRegions,
+        ccmConfig,
         logsConfig,
         metricsConfig,
         resourcesConfig,
@@ -387,6 +415,7 @@ public String toString() {
     sb.append("    awsAccountId: ").append(toIndentedString(awsAccountId)).append("\n");
     sb.append("    awsPartition: ").append(toIndentedString(awsPartition)).append("\n");
     sb.append("    awsRegions: ").append(toIndentedString(awsRegions)).append("\n");
+    sb.append("    ccmConfig: ").append(toIndentedString(ccmConfig)).append("\n");
     sb.append("    logsConfig: ").append(toIndentedString(logsConfig)).append("\n");
     sb.append("    metricsConfig: ").append(toIndentedString(metricsConfig)).append("\n");
     sb.append("    resourcesConfig: ").append(toIndentedString(resourcesConfig)).append("\n");