Skip to content

Commit 2b3dbd7

Browse files
author
ci.datadog-api-spec
committed
Regenerate client from commit 9306156 of spec repo
1 parent 232a88c commit 2b3dbd7

8 files changed

Lines changed: 243 additions & 17 deletions

File tree

.generator/schemas/v2/openapi.yaml

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102133,9 +102133,21 @@ components:
102133102133
additionalProperties: {}
102134102134
description: "The object containing all signal attributes and their\nassociated values."
102135102135
properties:
102136+
attributes:
102137+
additionalProperties: {}
102138+
description: A JSON object of attributes in the security signal, returned when listing or searching signals.
102139+
example:
102140+
workflow:
102141+
first_seen: "2020-06-23T14:46:01.000Z"
102142+
last_seen: "2020-06-23T14:46:49.000Z"
102143+
rule:
102144+
id: 0f5-e0c-805
102145+
name: "Brute Force Attack Grouped By User"
102146+
version: 12
102147+
type: object
102136102148
custom:
102137102149
additionalProperties: {}
102138-
description: A JSON object of attributes in the security signal.
102150+
description: A JSON object of attributes in the security signal, returned when retrieving a single signal.
102139102151
example:
102140102152
workflow:
102141102153
first_seen: "2020-06-23T14:46:01.000Z"
@@ -102968,8 +102980,21 @@ components:
102968102980
SecurityMonitoringSignalsListResponseMeta:
102969102981
description: Meta attributes.
102970102982
properties:
102983+
elapsed:
102984+
description: The time elapsed in milliseconds.
102985+
example: 132
102986+
format: int64
102987+
type: integer
102971102988
page:
102972102989
$ref: '#/components/schemas/SecurityMonitoringSignalsListResponseMetaPage'
102990+
request_id:
102991+
description: The unique identifier of the request.
102992+
example: example-request-id
102993+
type: string
102994+
status:
102995+
description: The status of the response.
102996+
example: done
102997+
type: string
102973102998
type: object
102974102999
SecurityMonitoringSignalsListResponseMetaPage:
102975103000
description: Paging attributes.
@@ -205487,15 +205512,24 @@ paths:
205487205512
value:
205488205513
data:
205489205514
- attributes:
205515+
attributes:
205516+
workflow:
205517+
rule:
205518+
id: 0f5-e0c-805
205519+
name: "Brute Force Attack Grouped By User"
205520+
version: 12
205490205521
tags:
205491205522
- "source:cloudtrail"
205492205523
id: AAAAAWgN8Xwgr1vKDQAAAABBV2dOOFh3ZzZobm1mWXJFYTR0OA
205493205524
type: signal
205494205525
links:
205495205526
next: ""
205496205527
meta:
205528+
elapsed: 132
205497205529
page:
205498205530
after: eyJzdGFydEF0IjoiQVFBQUFYS2tMS3pPbm40NGV3QUFBQUJCV0V0clRFdDZVbG8zY3pCRmNsbHJiVmxDWlEifQ==
205531+
request_id: example-request-id
205532+
status: done
205499205533
schema:
205500205534
$ref: '#/components/schemas/SecurityMonitoringSignalsListResponse'
205501205535
description: OK

examples/v2/security-monitoring/SearchSecurityMonitoringSignals.java

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// Get a list of security signals returns "OK" response
2-
32
import com.datadog.api.client.ApiClient;
43
import com.datadog.api.client.ApiException;
54
import com.datadog.api.client.v2.api.SecurityMonitoringApi;
@@ -20,14 +19,10 @@ public static void main(String[] args) {
2019
new SecurityMonitoringSignalListRequest()
2120
.filter(
2221
new SecurityMonitoringSignalListRequestFilter()
23-
.from(OffsetDateTime.parse("2019-01-02T09:42:36.320Z"))
22+
.from(OffsetDateTime.now().plusMinutes(-15))
2423
.query("security:attack status:high")
25-
.to(OffsetDateTime.parse("2019-01-03T09:42:36.320Z")))
26-
.page(
27-
new SecurityMonitoringSignalListRequestPage()
28-
.cursor(
29-
"eyJzdGFydEF0IjoiQVFBQUFYS2tMS3pPbm40NGV3QUFBQUJCV0V0clRFdDZVbG8zY3pCRmNsbHJiVmxDWlEifQ==")
30-
.limit(25))
24+
.to(OffsetDateTime.now()))
25+
.page(new SecurityMonitoringSignalListRequestPage().limit(25))
3126
.sort(SecurityMonitoringSignalsSort.TIMESTAMP_ASCENDING);
3227

3328
try {

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

Lines changed: 38 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
/** The object containing all signal attributes and their associated values. */
2323
@JsonPropertyOrder({
24+
SecurityMonitoringSignalAttributes.JSON_PROPERTY_ATTRIBUTES,
2425
SecurityMonitoringSignalAttributes.JSON_PROPERTY_CUSTOM,
2526
SecurityMonitoringSignalAttributes.JSON_PROPERTY_MESSAGE,
2627
SecurityMonitoringSignalAttributes.JSON_PROPERTY_TAGS,
@@ -30,6 +31,9 @@
3031
value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
3132
public class SecurityMonitoringSignalAttributes {
3233
@JsonIgnore public boolean unparsed = false;
34+
public static final String JSON_PROPERTY_ATTRIBUTES = "attributes";
35+
private Map<String, Object> attributes = null;
36+
3337
public static final String JSON_PROPERTY_CUSTOM = "custom";
3438
private Map<String, Object> custom = null;
3539

@@ -42,6 +46,35 @@ public class SecurityMonitoringSignalAttributes {
4246
public static final String JSON_PROPERTY_TIMESTAMP = "timestamp";
4347
private OffsetDateTime timestamp;
4448

49+
public SecurityMonitoringSignalAttributes attributes(Map<String, Object> attributes) {
50+
this.attributes = attributes;
51+
return this;
52+
}
53+
54+
public SecurityMonitoringSignalAttributes putAttributesItem(String key, Object attributesItem) {
55+
if (this.attributes == null) {
56+
this.attributes = new HashMap<>();
57+
}
58+
this.attributes.put(key, attributesItem);
59+
return this;
60+
}
61+
62+
/**
63+
* A JSON object of attributes in the security signal, returned when listing or searching signals.
64+
*
65+
* @return attributes
66+
*/
67+
@jakarta.annotation.Nullable
68+
@JsonProperty(JSON_PROPERTY_ATTRIBUTES)
69+
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
70+
public Map<String, Object> getAttributes() {
71+
return attributes;
72+
}
73+
74+
public void setAttributes(Map<String, Object> attributes) {
75+
this.attributes = attributes;
76+
}
77+
4578
public SecurityMonitoringSignalAttributes custom(Map<String, Object> custom) {
4679
this.custom = custom;
4780
return this;
@@ -56,7 +89,7 @@ public SecurityMonitoringSignalAttributes putCustomItem(String key, Object custo
5689
}
5790

5891
/**
59-
* A JSON object of attributes in the security signal.
92+
* A JSON object of attributes in the security signal, returned when retrieving a single signal.
6093
*
6194
* @return custom
6295
*/
@@ -199,7 +232,8 @@ public boolean equals(Object o) {
199232
}
200233
SecurityMonitoringSignalAttributes securityMonitoringSignalAttributes =
201234
(SecurityMonitoringSignalAttributes) o;
202-
return Objects.equals(this.custom, securityMonitoringSignalAttributes.custom)
235+
return Objects.equals(this.attributes, securityMonitoringSignalAttributes.attributes)
236+
&& Objects.equals(this.custom, securityMonitoringSignalAttributes.custom)
203237
&& Objects.equals(this.message, securityMonitoringSignalAttributes.message)
204238
&& Objects.equals(this.tags, securityMonitoringSignalAttributes.tags)
205239
&& Objects.equals(this.timestamp, securityMonitoringSignalAttributes.timestamp)
@@ -209,13 +243,14 @@ public boolean equals(Object o) {
209243

210244
@Override
211245
public int hashCode() {
212-
return Objects.hash(custom, message, tags, timestamp, additionalProperties);
246+
return Objects.hash(attributes, custom, message, tags, timestamp, additionalProperties);
213247
}
214248

215249
@Override
216250
public String toString() {
217251
StringBuilder sb = new StringBuilder();
218252
sb.append("class SecurityMonitoringSignalAttributes {\n");
253+
sb.append(" attributes: ").append(toIndentedString(attributes)).append("\n");
219254
sb.append(" custom: ").append(toIndentedString(custom)).append("\n");
220255
sb.append(" message: ").append(toIndentedString(message)).append("\n");
221256
sb.append(" tags: ").append(toIndentedString(tags)).append("\n");

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

Lines changed: 86 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,49 @@
1717
import java.util.Objects;
1818

1919
/** Meta attributes. */
20-
@JsonPropertyOrder({SecurityMonitoringSignalsListResponseMeta.JSON_PROPERTY_PAGE})
20+
@JsonPropertyOrder({
21+
SecurityMonitoringSignalsListResponseMeta.JSON_PROPERTY_ELAPSED,
22+
SecurityMonitoringSignalsListResponseMeta.JSON_PROPERTY_PAGE,
23+
SecurityMonitoringSignalsListResponseMeta.JSON_PROPERTY_REQUEST_ID,
24+
SecurityMonitoringSignalsListResponseMeta.JSON_PROPERTY_STATUS
25+
})
2126
@jakarta.annotation.Generated(
2227
value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
2328
public class SecurityMonitoringSignalsListResponseMeta {
2429
@JsonIgnore public boolean unparsed = false;
30+
public static final String JSON_PROPERTY_ELAPSED = "elapsed";
31+
private Long elapsed;
32+
2533
public static final String JSON_PROPERTY_PAGE = "page";
2634
private SecurityMonitoringSignalsListResponseMetaPage page;
2735

36+
public static final String JSON_PROPERTY_REQUEST_ID = "request_id";
37+
private String requestId;
38+
39+
public static final String JSON_PROPERTY_STATUS = "status";
40+
private String status;
41+
42+
public SecurityMonitoringSignalsListResponseMeta elapsed(Long elapsed) {
43+
this.elapsed = elapsed;
44+
return this;
45+
}
46+
47+
/**
48+
* The time elapsed in milliseconds.
49+
*
50+
* @return elapsed
51+
*/
52+
@jakarta.annotation.Nullable
53+
@JsonProperty(JSON_PROPERTY_ELAPSED)
54+
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
55+
public Long getElapsed() {
56+
return elapsed;
57+
}
58+
59+
public void setElapsed(Long elapsed) {
60+
this.elapsed = elapsed;
61+
}
62+
2863
public SecurityMonitoringSignalsListResponseMeta page(
2964
SecurityMonitoringSignalsListResponseMetaPage page) {
3065
this.page = page;
@@ -51,6 +86,48 @@ public void setPage(SecurityMonitoringSignalsListResponseMetaPage page) {
5186
}
5287
}
5388

89+
public SecurityMonitoringSignalsListResponseMeta requestId(String requestId) {
90+
this.requestId = requestId;
91+
return this;
92+
}
93+
94+
/**
95+
* The unique identifier of the request.
96+
*
97+
* @return requestId
98+
*/
99+
@jakarta.annotation.Nullable
100+
@JsonProperty(JSON_PROPERTY_REQUEST_ID)
101+
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
102+
public String getRequestId() {
103+
return requestId;
104+
}
105+
106+
public void setRequestId(String requestId) {
107+
this.requestId = requestId;
108+
}
109+
110+
public SecurityMonitoringSignalsListResponseMeta status(String status) {
111+
this.status = status;
112+
return this;
113+
}
114+
115+
/**
116+
* The status of the response.
117+
*
118+
* @return status
119+
*/
120+
@jakarta.annotation.Nullable
121+
@JsonProperty(JSON_PROPERTY_STATUS)
122+
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
123+
public String getStatus() {
124+
return status;
125+
}
126+
127+
public void setStatus(String status) {
128+
this.status = status;
129+
}
130+
54131
/**
55132
* A container for additional, undeclared properties. This is a holder for any undeclared
56133
* properties as specified with the 'additionalProperties' keyword in the OAS document.
@@ -108,22 +185,28 @@ public boolean equals(Object o) {
108185
}
109186
SecurityMonitoringSignalsListResponseMeta securityMonitoringSignalsListResponseMeta =
110187
(SecurityMonitoringSignalsListResponseMeta) o;
111-
return Objects.equals(this.page, securityMonitoringSignalsListResponseMeta.page)
188+
return Objects.equals(this.elapsed, securityMonitoringSignalsListResponseMeta.elapsed)
189+
&& Objects.equals(this.page, securityMonitoringSignalsListResponseMeta.page)
190+
&& Objects.equals(this.requestId, securityMonitoringSignalsListResponseMeta.requestId)
191+
&& Objects.equals(this.status, securityMonitoringSignalsListResponseMeta.status)
112192
&& Objects.equals(
113193
this.additionalProperties,
114194
securityMonitoringSignalsListResponseMeta.additionalProperties);
115195
}
116196

117197
@Override
118198
public int hashCode() {
119-
return Objects.hash(page, additionalProperties);
199+
return Objects.hash(elapsed, page, requestId, status, additionalProperties);
120200
}
121201

122202
@Override
123203
public String toString() {
124204
StringBuilder sb = new StringBuilder();
125205
sb.append("class SecurityMonitoringSignalsListResponseMeta {\n");
206+
sb.append(" elapsed: ").append(toIndentedString(elapsed)).append("\n");
126207
sb.append(" page: ").append(toIndentedString(page)).append("\n");
208+
sb.append(" requestId: ").append(toIndentedString(requestId)).append("\n");
209+
sb.append(" status: ").append(toIndentedString(status)).append("\n");
127210
sb.append(" additionalProperties: ")
128211
.append(toIndentedString(additionalProperties))
129212
.append("\n");

src/test/resources/com/datadog/api/client/v2/api/security_monitoring.feature

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1787,12 +1787,15 @@ Feature: Security Monitoring
17871787
When the request is sent
17881788
Then the response status is 400 Bad Request
17891789

1790-
@generated @skip @team:DataDog/cloud-siem
1790+
@team:DataDog/cloud-siem
17911791
Scenario: Get a list of security signals returns "OK" response
17921792
Given new "SearchSecurityMonitoringSignals" request
1793-
And body with value {"filter": {"from": "2019-01-02T09:42:36.320Z", "query": "security:attack status:high", "to": "2019-01-03T09:42:36.320Z"}, "page": {"cursor": "eyJzdGFydEF0IjoiQVFBQUFYS2tMS3pPbm40NGV3QUFBQUJCV0V0clRFdDZVbG8zY3pCRmNsbHJiVmxDWlEifQ==", "limit": 25}, "sort": "timestamp"}
1793+
And body with value {"filter": {"from": "{{ timeISO("now-15m") }}", "query": "security:attack status:high", "to": "{{ timeISO("now") }}"}, "page": {"limit": 25}, "sort": "timestamp"}
17941794
When the request is sent
17951795
Then the response status is 200 OK
1796+
And the response "meta" has field "elapsed"
1797+
And the response "meta" has field "request_id"
1798+
And the response "meta.status" is equal to "done"
17961799

17971800
@replay-only @skip-validation @team:DataDog/cloud-siem @with-pagination
17981801
Scenario: Get a list of security signals returns "OK" response with pagination

src/test/resources/generated-test/test-runner-data/manifest.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9730,6 +9730,13 @@
97309730
"scenario": "Get a job's details returns \"OK\" response",
97319731
"version": "v2"
97329732
},
9733+
{
9734+
"feature": "Security Monitoring",
9735+
"feature_file": "../../com/datadog/api/client/v2/api/security_monitoring.feature",
9736+
"file": "v2/security-monitoring/get-a-list-of-security-signals-returns-ok-response.json",
9737+
"scenario": "Get a list of security signals returns \"OK\" response",
9738+
"version": "v2"
9739+
},
97339740
{
97349741
"feature": "Security Monitoring",
97359742
"feature_file": "../../com/datadog/api/client/v2/api/security_monitoring.feature",
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"api": "SecurityMonitoring",
3+
"expected_status": 200,
4+
"feature": "Security Monitoring",
5+
"id": "v2/Security Monitoring/Get a list of security signals returns \"OK\" response",
6+
"operation_id": "SearchSecurityMonitoringSignals",
7+
"request": {
8+
"body": {
9+
"schema": {
10+
"format": null,
11+
"ref": "SecurityMonitoringSignalListRequest",
12+
"type": "object"
13+
},
14+
"source": "inline",
15+
"value": {
16+
"$openapi_transformer_template": "{\"filter\": {\"from\": \"{{ timeISO(\"now-15m\") }}\", \"query\": \"security:attack status:high\", \"to\": \"{{ timeISO(\"now\") }}\"}, \"page\": {\"limit\": 25}, \"sort\": \"timestamp\"}"
17+
}
18+
},
19+
"content_type": "application/json",
20+
"method": "POST",
21+
"pagination": false,
22+
"parameters": [],
23+
"path": "/api/v2/security_monitoring/signals/search"
24+
},
25+
"scenario": "Get a list of security signals returns \"OK\" response",
26+
"schema_version": 1,
27+
"version": "v2"
28+
}

0 commit comments

Comments
 (0)