Skip to content

Commit a774372

Browse files
author
ci.datadog-api-spec
committed
Regenerate client from commit 4e414b6 of spec repo
1 parent 00fca58 commit a774372

46 files changed

Lines changed: 547 additions & 104 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.generated-info‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"spec_repo_commit": "b308db8",
3-
"generated": "2025-08-04 15:41:32.832"
2+
"spec_repo_commit": "4e414b6",
3+
"generated": "2025-08-04 21:59:55.203"
44
}

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

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1625,6 +1625,8 @@ components:
16251625
example: arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder
16261626
type: string
16271627
type: array
1628+
log_source_config:
1629+
$ref: '#/components/schemas/AWSLambdaForwarderConfigLogSourceConfig'
16281630
sources:
16291631
description: 'List of service IDs set to enable automatic log collection.
16301632
Discover the list of available services with the
@@ -1636,6 +1638,36 @@ components:
16361638
type: string
16371639
type: array
16381640
type: object
1641+
AWSLambdaForwarderConfigLogSourceConfig:
1642+
description: Log source configuration.
1643+
properties:
1644+
tag_filters:
1645+
description: List of AWS log source tag filters. Defaults to `[]`.
1646+
items:
1647+
$ref: '#/components/schemas/AWSLogSourceTagFilter'
1648+
type: array
1649+
type: object
1650+
AWSLogSourceTagFilter:
1651+
description: 'AWS Log Source tag filters list. Defaults to `[]`.
1652+
1653+
The array of custom AWS resource tags (in the form `key:value`) defines a
1654+
filter that Datadog uses when collecting logs from a specified log source.'
1655+
properties:
1656+
source:
1657+
description: The AWS log source for which the tag filters defined in `tags`
1658+
will be applied.
1659+
example: s3
1660+
type: string
1661+
tags:
1662+
description: The AWS resource tags to filter on for the log source specified
1663+
by `source`.
1664+
items:
1665+
description: Tag in the form `key:value`.
1666+
example: env:prod
1667+
type: string
1668+
nullable: true
1669+
type: array
1670+
type: object
16391671
AWSLogsConfig:
16401672
description: AWS Logs Collection config.
16411673
properties:

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

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
import com.datadog.api.client.v2.model.AWSAuthConfig;
1313
import com.datadog.api.client.v2.model.AWSAuthConfigKeys;
1414
import com.datadog.api.client.v2.model.AWSLambdaForwarderConfig;
15+
import com.datadog.api.client.v2.model.AWSLambdaForwarderConfigLogSourceConfig;
16+
import com.datadog.api.client.v2.model.AWSLogSourceTagFilter;
1517
import com.datadog.api.client.v2.model.AWSLogsConfig;
1618
import com.datadog.api.client.v2.model.AWSMetricsConfig;
1719
import com.datadog.api.client.v2.model.AWSNamespaceTagFilter;
@@ -38,16 +40,25 @@ public static void main(String[] args) {
3840
.accessKeyId("AKIAIOSFODNN7EXAMPLE")
3941
.secretAccessKey(
4042
"wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY")))
41-
.awsAccountId("123456789012")
43+
.awsAccountId("")
4244
.awsPartition(AWSAccountPartition.AWS)
4345
.logsConfig(
4446
new AWSLogsConfig()
4547
.lambdaForwarder(
4648
new AWSLambdaForwarderConfig()
4749
.lambdas(
4850
Collections.singletonList(
49-
"arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"))
50-
.sources(Collections.singletonList("s3"))))
51+
"arn:aws:lambda:us-east-1::function:DatadogLambdaLogForwarder"))
52+
.sources(Collections.singletonList("s3"))
53+
.logSourceConfig(
54+
new AWSLambdaForwarderConfigLogSourceConfig()
55+
.tagFilters(
56+
Collections.singletonList(
57+
new AWSLogSourceTagFilter()
58+
.source("s3")
59+
.tags(
60+
Collections.singletonList(
61+
"test:test")))))))
5162
.metricsConfig(
5263
new AWSMetricsConfig()
5364
.automuteEnabled(true)

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

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
import com.datadog.api.client.v2.model.AWSAuthConfig;
1313
import com.datadog.api.client.v2.model.AWSAuthConfigRole;
1414
import com.datadog.api.client.v2.model.AWSLambdaForwarderConfig;
15+
import com.datadog.api.client.v2.model.AWSLambdaForwarderConfigLogSourceConfig;
16+
import com.datadog.api.client.v2.model.AWSLogSourceTagFilter;
1517
import com.datadog.api.client.v2.model.AWSLogsConfig;
1618
import com.datadog.api.client.v2.model.AWSMetricsConfig;
1719
import com.datadog.api.client.v2.model.AWSNamespaceTagFilter;
@@ -35,16 +37,25 @@ public static void main(String[] args) {
3537
.authConfig(
3638
new AWSAuthConfig(
3739
new AWSAuthConfigRole().roleName("DatadogIntegrationRole")))
38-
.awsAccountId("123456789012")
40+
.awsAccountId("")
3941
.awsPartition(AWSAccountPartition.AWS)
4042
.logsConfig(
4143
new AWSLogsConfig()
4244
.lambdaForwarder(
4345
new AWSLambdaForwarderConfig()
4446
.lambdas(
4547
Collections.singletonList(
46-
"arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"))
47-
.sources(Collections.singletonList("s3"))))
48+
"arn:aws:lambda:us-east-1::function:DatadogLambdaLogForwarder"))
49+
.sources(Collections.singletonList("s3"))
50+
.logSourceConfig(
51+
new AWSLambdaForwarderConfigLogSourceConfig()
52+
.tagFilters(
53+
Collections.singletonList(
54+
new AWSLogSourceTagFilter()
55+
.source("s3")
56+
.tags(
57+
Collections.singletonList(
58+
"test:test")))))))
4859
.metricsConfig(
4960
new AWSMetricsConfig()
5061
.automuteEnabled(true)

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

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
import com.datadog.api.client.v2.model.AWSAuthConfig;
1313
import com.datadog.api.client.v2.model.AWSAuthConfigRole;
1414
import com.datadog.api.client.v2.model.AWSLambdaForwarderConfig;
15+
import com.datadog.api.client.v2.model.AWSLambdaForwarderConfigLogSourceConfig;
16+
import com.datadog.api.client.v2.model.AWSLogSourceTagFilter;
1517
import com.datadog.api.client.v2.model.AWSLogsConfig;
1618
import com.datadog.api.client.v2.model.AWSMetricsConfig;
1719
import com.datadog.api.client.v2.model.AWSNamespaceTagFilter;
@@ -26,6 +28,8 @@ public static void main(String[] args) {
2628
AwsIntegrationApi apiInstance = new AwsIntegrationApi(defaultClient);
2729

2830
// there is a valid "aws_account_v2" in the system
31+
String AWS_ACCOUNT_V2_DATA_ATTRIBUTES_AWS_ACCOUNT_ID =
32+
System.getenv("AWS_ACCOUNT_V2_DATA_ATTRIBUTES_AWS_ACCOUNT_ID");
2933
String AWS_ACCOUNT_V2_DATA_ID = System.getenv("AWS_ACCOUNT_V2_DATA_ID");
3034

3135
AWSAccountUpdateRequest body =
@@ -38,7 +42,7 @@ public static void main(String[] args) {
3842
.authConfig(
3943
new AWSAuthConfig(
4044
new AWSAuthConfigRole().roleName("DatadogIntegrationRole")))
41-
.awsAccountId("123456789012")
45+
.awsAccountId(AWS_ACCOUNT_V2_DATA_ATTRIBUTES_AWS_ACCOUNT_ID)
4246
.awsPartition(AWSAccountPartition.AWS)
4347
.logsConfig(
4448
new AWSLogsConfig()
@@ -47,7 +51,16 @@ public static void main(String[] args) {
4751
.lambdas(
4852
Collections.singletonList(
4953
"arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"))
50-
.sources(Collections.singletonList("s3"))))
54+
.sources(Collections.singletonList("s3"))
55+
.logSourceConfig(
56+
new AWSLambdaForwarderConfigLogSourceConfig()
57+
.tagFilters(
58+
Collections.singletonList(
59+
new AWSLogSourceTagFilter()
60+
.source("s3")
61+
.tags(
62+
Collections.singletonList(
63+
"test:test")))))))
5164
.metricsConfig(
5265
new AWSMetricsConfig()
5366
.automuteEnabled(true)

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

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
*/
2626
@JsonPropertyOrder({
2727
AWSLambdaForwarderConfig.JSON_PROPERTY_LAMBDAS,
28+
AWSLambdaForwarderConfig.JSON_PROPERTY_LOG_SOURCE_CONFIG,
2829
AWSLambdaForwarderConfig.JSON_PROPERTY_SOURCES
2930
})
3031
@jakarta.annotation.Generated(
@@ -34,6 +35,9 @@ public class AWSLambdaForwarderConfig {
3435
public static final String JSON_PROPERTY_LAMBDAS = "lambdas";
3536
private List<String> lambdas = null;
3637

38+
public static final String JSON_PROPERTY_LOG_SOURCE_CONFIG = "log_source_config";
39+
private AWSLambdaForwarderConfigLogSourceConfig logSourceConfig;
40+
3741
public static final String JSON_PROPERTY_SOURCES = "sources";
3842
private List<String> sources = null;
3943

@@ -66,6 +70,29 @@ public void setLambdas(List<String> lambdas) {
6670
this.lambdas = lambdas;
6771
}
6872

73+
public AWSLambdaForwarderConfig logSourceConfig(
74+
AWSLambdaForwarderConfigLogSourceConfig logSourceConfig) {
75+
this.logSourceConfig = logSourceConfig;
76+
this.unparsed |= logSourceConfig.unparsed;
77+
return this;
78+
}
79+
80+
/**
81+
* Log source configuration.
82+
*
83+
* @return logSourceConfig
84+
*/
85+
@jakarta.annotation.Nullable
86+
@JsonProperty(JSON_PROPERTY_LOG_SOURCE_CONFIG)
87+
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
88+
public AWSLambdaForwarderConfigLogSourceConfig getLogSourceConfig() {
89+
return logSourceConfig;
90+
}
91+
92+
public void setLogSourceConfig(AWSLambdaForwarderConfigLogSourceConfig logSourceConfig) {
93+
this.logSourceConfig = logSourceConfig;
94+
}
95+
6996
public AWSLambdaForwarderConfig sources(List<String> sources) {
7097
this.sources = sources;
7198
return this;
@@ -155,20 +182,22 @@ public boolean equals(Object o) {
155182
}
156183
AWSLambdaForwarderConfig awsLambdaForwarderConfig = (AWSLambdaForwarderConfig) o;
157184
return Objects.equals(this.lambdas, awsLambdaForwarderConfig.lambdas)
185+
&& Objects.equals(this.logSourceConfig, awsLambdaForwarderConfig.logSourceConfig)
158186
&& Objects.equals(this.sources, awsLambdaForwarderConfig.sources)
159187
&& Objects.equals(this.additionalProperties, awsLambdaForwarderConfig.additionalProperties);
160188
}
161189

162190
@Override
163191
public int hashCode() {
164-
return Objects.hash(lambdas, sources, additionalProperties);
192+
return Objects.hash(lambdas, logSourceConfig, sources, additionalProperties);
165193
}
166194

167195
@Override
168196
public String toString() {
169197
StringBuilder sb = new StringBuilder();
170198
sb.append("class AWSLambdaForwarderConfig {\n");
171199
sb.append(" lambdas: ").append(toIndentedString(lambdas)).append("\n");
200+
sb.append(" logSourceConfig: ").append(toIndentedString(logSourceConfig)).append("\n");
172201
sb.append(" sources: ").append(toIndentedString(sources)).append("\n");
173202
sb.append(" additionalProperties: ")
174203
.append(toIndentedString(additionalProperties))

0 commit comments

Comments
 (0)