Skip to content

Commit 5e3ddf6

Browse files
api-clients-generation-pipeline[bot]api-clients-generation-pipeline[bot]
authored
Merge master into datadog-api-spec/test/vgranados/K9VULN-1347-vm-api
2 parents 08d673b + ab9e590 commit 5e3ddf6

File tree

6 files changed

+43
-11
lines changed

6 files changed

+43
-11
lines changed

‎.apigentools-info‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
"spec_versions": {
55
"v1": {
66
"apigentools_version": "1.6.6",
7-
"regenerated": "2024-12-19 07:26:23.728211",
8-
"spec_repo_commit": "5dd2cbe4"
7+
"regenerated": "2024-12-23 16:35:38.637190",
8+
"spec_repo_commit": "19946d35"
99
},
1010
"v2": {
1111
"apigentools_version": "1.6.6",
12-
"regenerated": "2024-12-19 07:26:23.743147",
13-
"spec_repo_commit": "5dd2cbe4"
12+
"regenerated": "2024-12-23 16:35:38.652127",
13+
"spec_repo_commit": "19946d35"
1414
}
1515
}
1616
}

‎.generator/schemas/v1/openapi.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16274,6 +16274,9 @@ components:
1627416274
params:
1627516275
description: The parameters of the step.
1627616276
type: object
16277+
public_id:
16278+
description: The public ID of the step.
16279+
type: string
1627716280
timeout:
1627816281
description: The time before declaring a step failed.
1627916282
format: int64

‎src/main/java/com/datadog/api/client/v1/model/SyntheticsStep.java‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
SyntheticsStep.JSON_PROPERTY_NAME,
2626
SyntheticsStep.JSON_PROPERTY_NO_SCREENSHOT,
2727
SyntheticsStep.JSON_PROPERTY_PARAMS,
28+
SyntheticsStep.JSON_PROPERTY_PUBLIC_ID,
2829
SyntheticsStep.JSON_PROPERTY_TIMEOUT,
2930
SyntheticsStep.JSON_PROPERTY_TYPE
3031
})
@@ -53,6 +54,9 @@ public class SyntheticsStep {
5354
public static final String JSON_PROPERTY_PARAMS = "params";
5455
private Object params;
5556

57+
public static final String JSON_PROPERTY_PUBLIC_ID = "public_id";
58+
private String publicId;
59+
5660
public static final String JSON_PROPERTY_TIMEOUT = "timeout";
5761
private Long timeout;
5862

@@ -207,6 +211,27 @@ public void setParams(Object params) {
207211
this.params = params;
208212
}
209213

214+
public SyntheticsStep publicId(String publicId) {
215+
this.publicId = publicId;
216+
return this;
217+
}
218+
219+
/**
220+
* The public ID of the step.
221+
*
222+
* @return publicId
223+
*/
224+
@jakarta.annotation.Nullable
225+
@JsonProperty(JSON_PROPERTY_PUBLIC_ID)
226+
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
227+
public String getPublicId() {
228+
return publicId;
229+
}
230+
231+
public void setPublicId(String publicId) {
232+
this.publicId = publicId;
233+
}
234+
210235
public SyntheticsStep timeout(Long timeout) {
211236
this.timeout = timeout;
212237
return this;
@@ -316,6 +341,7 @@ public boolean equals(Object o) {
316341
&& Objects.equals(this.name, syntheticsStep.name)
317342
&& Objects.equals(this.noScreenshot, syntheticsStep.noScreenshot)
318343
&& Objects.equals(this.params, syntheticsStep.params)
344+
&& Objects.equals(this.publicId, syntheticsStep.publicId)
319345
&& Objects.equals(this.timeout, syntheticsStep.timeout)
320346
&& Objects.equals(this.type, syntheticsStep.type)
321347
&& Objects.equals(this.additionalProperties, syntheticsStep.additionalProperties);
@@ -331,6 +357,7 @@ public int hashCode() {
331357
name,
332358
noScreenshot,
333359
params,
360+
publicId,
334361
timeout,
335362
type,
336363
additionalProperties);
@@ -347,6 +374,7 @@ public String toString() {
347374
sb.append(" name: ").append(toIndentedString(name)).append("\n");
348375
sb.append(" noScreenshot: ").append(toIndentedString(noScreenshot)).append("\n");
349376
sb.append(" params: ").append(toIndentedString(params)).append("\n");
377+
sb.append(" publicId: ").append(toIndentedString(publicId)).append("\n");
350378
sb.append(" timeout: ").append(toIndentedString(timeout)).append("\n");
351379
sb.append(" type: ").append(toIndentedString(type)).append("\n");
352380
sb.append(" additionalProperties: ")

‎src/test/resources/cassettes/features/v1/Create_a_browser_test_returns_OK_Returns_saved_rumSettings_response.freeze‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2024-12-09T11:17:43.729Z
1+
2024-12-23T09:47:16.115Z

‎src/test/resources/cassettes/features/v1/Create_a_browser_test_returns_OK_Returns_saved_rumSettings_response.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"httpRequest": {
44
"body": {
55
"type": "JSON",
6-
"json": "{\"config\":{\"assertions\":[],\"configVariables\":[{\"example\":\"content-type\",\"name\":\"PROPERTY\",\"pattern\":\"content-type\",\"type\":\"text\"}],\"request\":{\"certificateDomains\":[\"https://datadoghq.com\"],\"method\":\"GET\",\"url\":\"https://datadoghq.com\"},\"setCookie\":\"name:test\"},\"locations\":[\"aws:us-east-2\"],\"message\":\"Test message\",\"name\":\"Test-Create_a_browser_test_returns_OK_Returns_saved_rumSettings_response-1733743063\",\"options\":{\"accept_self_signed\":false,\"allow_insecure\":true,\"ci\":{\"executionRule\":\"skipped\"},\"device_ids\":[\"tablet\"],\"disableCors\":true,\"disableCsp\":true,\"follow_redirects\":true,\"ignoreServerCertificateError\":true,\"initialNavigationTimeout\":200,\"min_failure_duration\":10,\"min_location_failed\":1,\"noScreenshot\":true,\"retry\":{\"count\":2,\"interval\":10},\"rumSettings\":{\"applicationId\":\"mockApplicationId\",\"clientTokenId\":12345,\"isEnabled\":true},\"tick_every\":300},\"steps\":[{\"allowFailure\":false,\"isCritical\":true,\"name\":\"Refresh page\",\"params\":{},\"type\":\"refresh\"}],\"tags\":[\"testing:browser\"],\"type\":\"browser\"}"
6+
"json": "{\"config\":{\"assertions\":[],\"configVariables\":[{\"example\":\"content-type\",\"name\":\"PROPERTY\",\"pattern\":\"content-type\",\"type\":\"text\"}],\"request\":{\"certificateDomains\":[\"https://datadoghq.com\"],\"method\":\"GET\",\"url\":\"https://datadoghq.com\"},\"setCookie\":\"name:test\"},\"locations\":[\"aws:us-east-2\"],\"message\":\"Test message\",\"name\":\"Test-Create_a_browser_test_returns_OK_Returns_saved_rumSettings_response-1734947236\",\"options\":{\"accept_self_signed\":false,\"allow_insecure\":true,\"ci\":{\"executionRule\":\"skipped\"},\"device_ids\":[\"tablet\"],\"disableCors\":true,\"disableCsp\":true,\"follow_redirects\":true,\"ignoreServerCertificateError\":true,\"initialNavigationTimeout\":200,\"min_failure_duration\":10,\"min_location_failed\":1,\"noScreenshot\":true,\"retry\":{\"count\":2,\"interval\":10},\"rumSettings\":{\"applicationId\":\"mockApplicationId\",\"clientTokenId\":12345,\"isEnabled\":true},\"tick_every\":300},\"steps\":[{\"allowFailure\":false,\"isCritical\":true,\"name\":\"Refresh page\",\"params\":{},\"type\":\"refresh\"}],\"tags\":[\"testing:browser\"],\"type\":\"browser\"}"
77
},
88
"headers": {},
99
"method": "POST",
@@ -12,7 +12,7 @@
1212
"secure": true
1313
},
1414
"httpResponse": {
15-
"body": "{\"public_id\":\"jj5-nke-dq2\",\"name\":\"Test-Create_a_browser_test_returns_OK_Returns_saved_rumSettings_response-1733743063\",\"status\":\"paused\",\"type\":\"browser\",\"tags\":[\"testing:browser\"],\"created_at\":\"2024-12-09T11:17:44.348239+00:00\",\"modified_at\":\"2024-12-09T11:17:44.348239+00:00\",\"config\":{\"assertions\":[],\"configVariables\":[{\"example\":\"content-type\",\"name\":\"PROPERTY\",\"pattern\":\"content-type\",\"type\":\"text\"}],\"request\":{\"certificateDomains\":[\"https://datadoghq.com\"],\"method\":\"GET\",\"url\":\"https://datadoghq.com\"},\"setCookie\":\"name:test\"},\"message\":\"Test message\",\"options\":{\"accept_self_signed\":false,\"allow_insecure\":true,\"ci\":{\"executionRule\":\"skipped\"},\"device_ids\":[\"tablet\"],\"disableCors\":true,\"disableCsp\":true,\"follow_redirects\":true,\"ignoreServerCertificateError\":true,\"initialNavigationTimeout\":200,\"min_failure_duration\":10,\"min_location_failed\":1,\"noScreenshot\":true,\"retry\":{\"count\":2,\"interval\":10},\"rumSettings\":{\"applicationId\":\"mockApplicationId\",\"clientTokenId\":12345,\"isEnabled\":true},\"tick_every\":300},\"locations\":[\"aws:us-east-2\"],\"created_by\":{\"name\":null,\"handle\":\"frog@datadoghq.com\",\"email\":\"frog@datadoghq.com\"},\"deleted_at\":null,\"monitor_id\":159881000,\"org_id\":321813,\"modified_by\":{\"name\":null,\"handle\":\"frog@datadoghq.com\",\"email\":\"frog@datadoghq.com\"},\"steps\":[{\"name\":\"Refresh page\",\"params\":{},\"type\":\"refresh\",\"public_id\":\"yb6-rim-kwp\",\"allowFailure\":false,\"isCritical\":true}],\"stepCount\":{\"assertions\":0,\"subtests\":0,\"total\":1}}",
15+
"body": "{\"public_id\":\"2pq-h6b-phj\",\"name\":\"Test-Create_a_browser_test_returns_OK_Returns_saved_rumSettings_response-1734947236\",\"status\":\"paused\",\"type\":\"browser\",\"tags\":[\"testing:browser\"],\"created_at\":\"2024-12-23T09:47:16.924773+00:00\",\"modified_at\":\"2024-12-23T09:47:16.924773+00:00\",\"config\":{\"assertions\":[],\"configVariables\":[{\"example\":\"content-type\",\"name\":\"PROPERTY\",\"pattern\":\"content-type\",\"type\":\"text\"}],\"request\":{\"certificateDomains\":[\"https://datadoghq.com\"],\"method\":\"GET\",\"url\":\"https://datadoghq.com\"},\"setCookie\":\"name:test\"},\"message\":\"Test message\",\"options\":{\"accept_self_signed\":false,\"allow_insecure\":true,\"ci\":{\"executionRule\":\"skipped\"},\"device_ids\":[\"tablet\"],\"disableCors\":true,\"disableCsp\":true,\"follow_redirects\":true,\"ignoreServerCertificateError\":true,\"initialNavigationTimeout\":200,\"min_failure_duration\":10,\"min_location_failed\":1,\"noScreenshot\":true,\"retry\":{\"count\":2,\"interval\":10},\"rumSettings\":{\"applicationId\":\"mockApplicationId\",\"clientTokenId\":12345,\"isEnabled\":true},\"tick_every\":300},\"locations\":[\"aws:us-east-2\"],\"created_by\":{\"name\":\"frog\",\"handle\":\"frog@datadoghq.com\",\"email\":\"frog@datadoghq.com\"},\"deleted_at\":null,\"monitor_id\":161011666,\"org_id\":321813,\"modified_by\":{\"name\":\"frog\",\"handle\":\"frog@datadoghq.com\",\"email\":\"frog@datadoghq.com\"},\"steps\":[{\"name\":\"Refresh page\",\"params\":{},\"type\":\"refresh\",\"public_id\":\"uwt-8ia-g4p\",\"allowFailure\":false,\"isCritical\":true}],\"stepCount\":{\"assertions\":0,\"subtests\":0,\"total\":1}}",
1616
"headers": {
1717
"Content-Type": [
1818
"application/json"
@@ -27,13 +27,13 @@
2727
"timeToLive": {
2828
"unlimited": true
2929
},
30-
"id": "4e32bcae-d315-0017-0b92-64bdf9de2af4"
30+
"id": "6c8aaa45-f828-f0ab-1b86-692420d7b4b4"
3131
},
3232
{
3333
"httpRequest": {
3434
"body": {
3535
"type": "JSON",
36-
"json": "{\"public_ids\":[\"jj5-nke-dq2\"]}"
36+
"json": "{\"public_ids\":[\"2pq-h6b-phj\"]}"
3737
},
3838
"headers": {},
3939
"method": "POST",
@@ -42,7 +42,7 @@
4242
"secure": true
4343
},
4444
"httpResponse": {
45-
"body": "{\"deleted_tests\":[{\"public_id\":\"jj5-nke-dq2\",\"deleted_at\":\"2024-12-09T11:17:45.340410+00:00\"}]}\n",
45+
"body": "{\"deleted_tests\":[{\"public_id\":\"2pq-h6b-phj\",\"deleted_at\":\"2024-12-23T09:47:17.898440+00:00\"}]}\n",
4646
"headers": {
4747
"Content-Type": [
4848
"application/json"
@@ -57,6 +57,6 @@
5757
"timeToLive": {
5858
"unlimited": true
5959
},
60-
"id": "d7ff174d-7e09-6537-7dd6-e8bdf360f422"
60+
"id": "07f3b17b-251a-4a6e-d381-93d876d04fdd"
6161
}
6262
]

‎src/test/resources/com/datadog/api/client/v1/api/synthetics.feature‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ Feature: Synthetics
6565
And the response "options.rumSettings.isEnabled" is equal to true
6666
And the response "options.rumSettings.applicationId" is equal to "mockApplicationId"
6767
And the response "options.rumSettings.clientTokenId" is equal to 12345
68+
And the response "steps[0]" has field "public_id"
6869

6970
@team:DataDog/synthetics-ct
7071
Scenario: Create a browser test returns "OK - Returns the created test details." response

0 commit comments

Comments
 (0)