Skip to content

Commit 8c889c4

Browse files
authored
Merge branch '8.x' into automated/rest-api-spec-update-8.x
2 parents fa72cf8 + 9da2aac commit 8c889c4

File tree

8 files changed

+76
-63
lines changed

8 files changed

+76
-63
lines changed

compiler/src/steps/validate-model.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ enum JsonEvent {
3737
array = 'array'
3838
}
3939

40+
const privateNamespaces = ['_internal', 'profiling']
41+
4042
/**
4143
* Validates the internal consistency of the model (doesn't check the json spec)
4244
*
@@ -208,6 +210,11 @@ export default async function validateModel (apiModel: model.Model, restSpec: Ma
208210
function validateEndpoint (endpoint: model.Endpoint): void {
209211
setRootContext(endpoint.name, 'request')
210212

213+
// Skip validation for internal endpoints
214+
if (privateNamespaces.some(ns => endpoint.name.startsWith(ns))) {
215+
return
216+
}
217+
211218
if (endpoint.request == null) {
212219
if (endpoint.response == null) {
213220
modelError('Missing request & response')

output/openapi/elasticsearch-openapi.json

Lines changed: 16 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

output/openapi/elasticsearch-serverless-openapi.json

Lines changed: 16 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

output/schema/schema-serverless.json

Lines changed: 14 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

output/schema/schema.json

Lines changed: 14 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

output/schema/validation-errors.json

Lines changed: 1 addition & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,8 @@
11
{
22
"endpointErrors": {
3-
"_internal.delete_desired_balance": {
4-
"request": [
5-
"Missing request & response"
6-
],
7-
"response": []
8-
},
9-
"_internal.delete_desired_nodes": {
10-
"request": [
11-
"Missing request & response"
12-
],
13-
"response": []
14-
},
15-
"_internal.get_desired_balance": {
16-
"request": [
17-
"Missing request & response"
18-
],
19-
"response": []
20-
},
21-
"_internal.get_desired_nodes": {
22-
"request": [
23-
"Missing request & response"
24-
],
25-
"response": []
26-
},
27-
"_internal.prevalidate_node_removal": {
28-
"request": [
29-
"Missing request & response"
30-
],
31-
"response": []
32-
},
33-
"_internal.update_desired_nodes": {
34-
"request": [
35-
"Missing request & response"
36-
],
37-
"response": []
38-
},
393
"async_search.submit": {
404
"request": [
5+
"Request: query parameter 'keep_alive' does not exist in the json spec",
416
"Request: query parameter 'min_compatible_shard_node' does not exist in the json spec",
427
"Request: missing json spec query parameter 'keep_alive'",
438
"interface definition _types:QueryVectorBuilder - Property text_embedding is a single-variant and must be required"
@@ -487,30 +452,6 @@
487452
],
488453
"response": []
489454
},
490-
"profiling.flamegraph": {
491-
"request": [
492-
"Missing request & response"
493-
],
494-
"response": []
495-
},
496-
"profiling.stacktraces": {
497-
"request": [
498-
"Missing request & response"
499-
],
500-
"response": []
501-
},
502-
"profiling.status": {
503-
"request": [
504-
"Missing request & response"
505-
],
506-
"response": []
507-
},
508-
"profiling.topn_functions": {
509-
"request": [
510-
"Missing request & response"
511-
],
512-
"response": []
513-
},
514455
"reindex": {
515456
"request": [
516457
"Request: query parameter 'require_alias' does not exist in the json spec",

output/typescript/types.ts

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

specification/async_search/submit/AsyncSearchSubmitRequest.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ import { Duration } from '@_types/Time'
6868
* @doc_tag search
6969
*/
7070
// NOTE: this is a SearchRequest with:
71-
// * 2 added parameters: wait_for_completion_timeout, keep_on_completion
71+
// * 2 added parameters: wait_for_completion_timeout, keep_on_completion and keep_alive
7272
// * 2 removed parameters: scroll, pre_filter_shard_size
7373
export interface Request extends RequestBase {
7474
urls: [
@@ -91,6 +91,12 @@ export interface Request extends RequestBase {
9191
* @server_default 1s
9292
*/
9393
wait_for_completion_timeout?: Duration
94+
/**
95+
* Specifies how long the async search needs to be available.
96+
* Ongoing async searches and any saved search results are deleted after this period.
97+
* @server_default 5d
98+
*/
99+
keep_alive?: Duration
94100
/**
95101
* If `true`, results are stored for later retrieval when the search completes within the `wait_for_completion_timeout`.
96102
* @server_default false

0 commit comments

Comments
 (0)