From 7393ae0fc51fb80bb85f9febc070ee6327860909 Mon Sep 17 00:00:00 2001 From: Laura Date: Thu, 1 Feb 2024 16:38:03 +0100 Subject: [PATCH 1/8] added 'remove_binary' to AttachmentProcessor (issue #727) --- output/schema/schema.json | 93 +++++++++++++---------- output/typescript/types.ts | 1 + specification/ingest/_types/Processors.ts | 5 ++ 3 files changed, 59 insertions(+), 40 deletions(-) diff --git a/output/schema/schema.json b/output/schema/schema.json index 4e94e19611..3bc3280ac4 100644 --- a/output/schema/schema.json +++ b/output/schema/schema.json @@ -128554,6 +128554,19 @@ } } }, + { + "description": "If true, the binary field will be removed from the document", + "name": "remove_binary", + "required": false, + "serverDefault": false, + "type": { + "kind": "instance_of", + "type": { + "name": "boolean", + "namespace": "_builtins" + } + } + }, { "description": "Field containing the name of the resource to decode.\nIf specified, the processor passes this resource name to the underlying Tika library to enable Resource Name Based Detection.", "name": "resource_name", @@ -128567,7 +128580,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L296-L332" + "specLocation": "ingest/_types/Processors.ts#L296-L337" }, { "inherits": { @@ -128621,7 +128634,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L387-L403" + "specLocation": "ingest/_types/Processors.ts#L392-L408" }, { "inherits": { @@ -128698,7 +128711,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L405-L428" + "specLocation": "ingest/_types/Processors.ts#L410-L433" }, { "inherits": { @@ -128764,7 +128777,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L440-L460" + "specLocation": "ingest/_types/Processors.ts#L445-L465" }, { "kind": "enum", @@ -128795,7 +128808,7 @@ "name": "ConvertType", "namespace": "ingest._types" }, - "specLocation": "ingest/_types/Processors.ts#L430-L438" + "specLocation": "ingest/_types/Processors.ts#L435-L443" }, { "inherits": { @@ -128893,7 +128906,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L462-L495" + "specLocation": "ingest/_types/Processors.ts#L467-L500" }, { "inherits": { @@ -128999,7 +129012,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L497-L535" + "specLocation": "ingest/_types/Processors.ts#L502-L540" }, { "inherits": { @@ -129081,7 +129094,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L537-L564" + "specLocation": "ingest/_types/Processors.ts#L542-L569" }, { "inherits": { @@ -129147,7 +129160,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L566-L585" + "specLocation": "ingest/_types/Processors.ts#L571-L590" }, { "inherits": { @@ -129187,7 +129200,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L587-L598" + "specLocation": "ingest/_types/Processors.ts#L592-L603" }, { "inherits": { @@ -129202,7 +129215,7 @@ "namespace": "ingest._types" }, "properties": [], - "specLocation": "ingest/_types/Processors.ts#L600-L600" + "specLocation": "ingest/_types/Processors.ts#L605-L605" }, { "inherits": { @@ -129306,7 +129319,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L602-L641" + "specLocation": "ingest/_types/Processors.ts#L607-L646" }, { "inherits": { @@ -129334,7 +129347,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L643-L649" + "specLocation": "ingest/_types/Processors.ts#L648-L654" }, { "inherits": { @@ -129387,7 +129400,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L651-L665" + "specLocation": "ingest/_types/Processors.ts#L656-L670" }, { "inherits": { @@ -129482,7 +129495,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L334-L363" + "specLocation": "ingest/_types/Processors.ts#L339-L368" }, { "inherits": { @@ -129574,7 +129587,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L667-L692" + "specLocation": "ingest/_types/Processors.ts#L672-L697" }, { "inherits": { @@ -129652,7 +129665,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L694-L718" + "specLocation": "ingest/_types/Processors.ts#L699-L723" }, { "kind": "interface", @@ -129686,7 +129699,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L741-L753", + "specLocation": "ingest/_types/Processors.ts#L746-L758", "variants": { "kind": "container" } @@ -129763,7 +129776,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L768-L794" + "specLocation": "ingest/_types/Processors.ts#L773-L799" }, { "kind": "interface", @@ -129799,7 +129812,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L755-L766" + "specLocation": "ingest/_types/Processors.ts#L760-L771" }, { "inherits": { @@ -129871,7 +129884,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L720-L739" + "specLocation": "ingest/_types/Processors.ts#L725-L744" }, { "inherits": { @@ -129924,7 +129937,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L796-L811" + "specLocation": "ingest/_types/Processors.ts#L801-L816" }, { "inherits": { @@ -130003,7 +130016,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L813-L842" + "specLocation": "ingest/_types/Processors.ts#L818-L847" }, { "kind": "enum", @@ -130021,7 +130034,7 @@ "name": "JsonProcessorConflictStrategy", "namespace": "ingest._types" }, - "specLocation": "ingest/_types/Processors.ts#L844-L849" + "specLocation": "ingest/_types/Processors.ts#L849-L854" }, { "inherits": { @@ -130178,7 +130191,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L851-L903" + "specLocation": "ingest/_types/Processors.ts#L856-L908" }, { "inherits": { @@ -130232,7 +130245,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L905-L921" + "specLocation": "ingest/_types/Processors.ts#L910-L926" }, { "kind": "interface", @@ -130398,7 +130411,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L923-L934" + "specLocation": "ingest/_types/Processors.ts#L928-L939" }, { "kind": "interface", @@ -131016,7 +131029,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L936-L946" + "specLocation": "ingest/_types/Processors.ts#L941-L951" }, { "inherits": { @@ -131069,7 +131082,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L948-L964" + "specLocation": "ingest/_types/Processors.ts#L953-L969" }, { "inherits": { @@ -131151,7 +131164,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L966-L994" + "specLocation": "ingest/_types/Processors.ts#L971-L999" }, { "inherits": { @@ -131223,7 +131236,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L996-L1016" + "specLocation": "ingest/_types/Processors.ts#L1001-L1021" }, { "inherits": { @@ -131309,7 +131322,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L1018-L1052" + "specLocation": "ingest/_types/Processors.ts#L1023-L1057" }, { "inherits": { @@ -131352,7 +131365,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L1054-L1063" + "specLocation": "ingest/_types/Processors.ts#L1059-L1068" }, { "kind": "enum", @@ -131368,7 +131381,7 @@ "name": "ShapeType", "namespace": "ingest._types" }, - "specLocation": "ingest/_types/Processors.ts#L1065-L1068" + "specLocation": "ingest/_types/Processors.ts#L1070-L1073" }, { "inherits": { @@ -131421,7 +131434,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L1070-L1086" + "specLocation": "ingest/_types/Processors.ts#L1075-L1091" }, { "inherits": { @@ -131500,7 +131513,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L1088-L1113" + "specLocation": "ingest/_types/Processors.ts#L1093-L1118" }, { "inherits": { @@ -131554,7 +131567,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L1115-L1131" + "specLocation": "ingest/_types/Processors.ts#L1120-L1136" }, { "inherits": { @@ -131608,7 +131621,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L1133-L1149" + "specLocation": "ingest/_types/Processors.ts#L1138-L1154" }, { "inherits": { @@ -131662,7 +131675,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L1151-L1167" + "specLocation": "ingest/_types/Processors.ts#L1156-L1172" }, { "inherits": { @@ -131742,7 +131755,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L365-L385" + "specLocation": "ingest/_types/Processors.ts#L370-L390" }, { "kind": "enum", diff --git a/output/typescript/types.ts b/output/typescript/types.ts index 9498f1d415..5a3e1f5ac2 100644 --- a/output/typescript/types.ts +++ b/output/typescript/types.ts @@ -11546,6 +11546,7 @@ export interface IngestAttachmentProcessor extends IngestProcessorBase { indexed_chars_field?: Field properties?: string[] target_field?: Field + remove_binary?: boolean resource_name?: string } diff --git a/specification/ingest/_types/Processors.ts b/specification/ingest/_types/Processors.ts index ae014053b5..19ce5600f5 100644 --- a/specification/ingest/_types/Processors.ts +++ b/specification/ingest/_types/Processors.ts @@ -324,6 +324,11 @@ export class AttachmentProcessor extends ProcessorBase { * @server_default attachment */ target_field?: Field + /** + * If true, the binary field will be removed from the document + * @server_default false + */ + remove_binary?: boolean /** * Field containing the name of the resource to decode. * If specified, the processor passes this resource name to the underlying Tika library to enable Resource Name Based Detection. From c795a05b581c57925db25110ab45d0bd54bd854f Mon Sep 17 00:00:00 2001 From: Laura Date: Fri, 2 Feb 2024 15:52:59 +0100 Subject: [PATCH 2/8] making node info path optional (issue #242) --- output/openapi/elasticsearch-serverless-openapi.json | 4 ++++ output/schema/schema.json | 8 ++++---- output/typescript/types.ts | 8 ++++---- specification/nodes/info/types.ts | 8 ++++---- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/output/openapi/elasticsearch-serverless-openapi.json b/output/openapi/elasticsearch-serverless-openapi.json index be4b736b06..c6c82f15a0 100644 --- a/output/openapi/elasticsearch-serverless-openapi.json +++ b/output/openapi/elasticsearch-serverless-openapi.json @@ -49346,6 +49346,10 @@ "target_field": { "$ref": "#/components/schemas/_types:Field" }, + "remove_binary": { + "description": "If true, the binary field will be removed from the document", + "type": "boolean" + }, "resource_name": { "description": "Field containing the name of the resource to decode.\nIf specified, the processor passes this resource name to the underlying Tika library to enable Resource Name Based Detection.", "type": "string" diff --git a/output/schema/schema.json b/output/schema/schema.json index 3bc3280ac4..e87e3c26c4 100644 --- a/output/schema/schema.json +++ b/output/schema/schema.json @@ -164767,7 +164767,7 @@ "properties": [ { "name": "logs", - "required": true, + "required": false, "type": { "kind": "instance_of", "type": { @@ -164778,7 +164778,7 @@ }, { "name": "home", - "required": true, + "required": false, "type": { "kind": "instance_of", "type": { @@ -164789,7 +164789,7 @@ }, { "name": "repo", - "required": true, + "required": false, "type": { "kind": "array_of", "value": { @@ -164965,7 +164965,7 @@ }, { "name": "path", - "required": true, + "required": false, "type": { "kind": "instance_of", "type": { diff --git a/output/typescript/types.ts b/output/typescript/types.ts index 5a3e1f5ac2..3abb7515dc 100644 --- a/output/typescript/types.ts +++ b/output/typescript/types.ts @@ -15357,9 +15357,9 @@ export interface NodesInfoNodeInfoOSCPU { } export interface NodesInfoNodeInfoPath { - logs: string - home: string - repo: string[] + logs?: string + home?: string + repo?: string[] data?: string[] } @@ -15387,7 +15387,7 @@ export interface NodesInfoNodeInfoSearchRemote { export interface NodesInfoNodeInfoSettings { cluster: NodesInfoNodeInfoSettingsCluster node: NodesInfoNodeInfoSettingsNode - path: NodesInfoNodeInfoPath + path?: NodesInfoNodeInfoPath repositories?: NodesInfoNodeInfoRepositories discovery?: NodesInfoNodeInfoDiscover action?: NodesInfoNodeInfoAction diff --git a/specification/nodes/info/types.ts b/specification/nodes/info/types.ts index c9155a3049..c152a64658 100644 --- a/specification/nodes/info/types.ts +++ b/specification/nodes/info/types.ts @@ -68,7 +68,7 @@ export class NodeInfo { export class NodeInfoSettings { cluster: NodeInfoSettingsCluster node: NodeInfoSettingsNode - path: NodeInfoPath + path?: NodeInfoPath repositories?: NodeInfoRepositories discovery?: NodeInfoDiscover action?: NodeInfoAction @@ -155,9 +155,9 @@ export class NodeInfoSettingsNode { } export class NodeInfoPath { - logs: string - home: string - repo: string[] + logs?: string + home?: string + repo?: string[] data?: string[] } From 6f8ef9466d0d9c0fe776e4c47751d0279d334826 Mon Sep 17 00:00:00 2001 From: Laura Date: Mon, 5 Feb 2024 16:42:01 +0100 Subject: [PATCH 3/8] making node info discover seed_host optional (issue #242) --- output/schema/schema.json | 2 +- output/typescript/types.ts | 2 +- specification/nodes/info/types.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/output/schema/schema.json b/output/schema/schema.json index e87e3c26c4..31335d32ac 100644 --- a/output/schema/schema.json +++ b/output/schema/schema.json @@ -164277,7 +164277,7 @@ "properties": [ { "name": "seed_hosts", - "required": true, + "required": false, "type": { "kind": "instance_of", "type": { diff --git a/output/typescript/types.ts b/output/typescript/types.ts index 3abb7515dc..c3230952a3 100644 --- a/output/typescript/types.ts +++ b/output/typescript/types.ts @@ -15290,7 +15290,7 @@ export interface NodesInfoNodeInfoClient { } export interface NodesInfoNodeInfoDiscover { - seed_hosts: string + seed_hosts?: string } export interface NodesInfoNodeInfoHttp { diff --git a/specification/nodes/info/types.ts b/specification/nodes/info/types.ts index c152a64658..9ac37e208c 100644 --- a/specification/nodes/info/types.ts +++ b/specification/nodes/info/types.ts @@ -170,7 +170,7 @@ export class NodeInfoRepositoriesUrl { } export class NodeInfoDiscover { - seed_hosts: string + seed_hosts?: string } export class NodeInfoAction { From 1447fc35cb2aacb209dde008a848e0ddbe46a237 Mon Sep 17 00:00:00 2001 From: Laura Date: Tue, 6 Feb 2024 12:50:36 +0100 Subject: [PATCH 4/8] changed description for update by query (issue #315) --- output/schema/schema.json | 2 +- specification/_json_spec/update_by_query.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/output/schema/schema.json b/output/schema/schema.json index 31335d32ac..e981fbdcf9 100644 --- a/output/schema/schema.json +++ b/output/schema/schema.json @@ -18926,7 +18926,7 @@ "stability": "stable" } }, - "description": "Performs an update on every document in the index without changing the source,\nfor example to pick up a mapping change.", + "description": "Updates documents that match the specified query. If no query is specified,\n performs an update on every document in the index without changing the source,\nfor example to pick up a mapping change.", "docUrl": "https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-update-by-query.html", "name": "update_by_query", "request": { diff --git a/specification/_json_spec/update_by_query.json b/specification/_json_spec/update_by_query.json index 3856c4249a..b6068132ae 100644 --- a/specification/_json_spec/update_by_query.json +++ b/specification/_json_spec/update_by_query.json @@ -2,7 +2,7 @@ "update_by_query": { "documentation": { "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-update-by-query.html", - "description": "Performs an update on every document in the index without changing the source,\nfor example to pick up a mapping change." + "description": "Updates documents that match the specified query. If no query is specified,\n performs an update on every document in the index without changing the source,\nfor example to pick up a mapping change." }, "stability": "stable", "visibility": "public", From ce65b020890bc83232317885731a628b29768b62 Mon Sep 17 00:00:00 2001 From: Laura Date: Thu, 8 Feb 2024 15:00:11 +0100 Subject: [PATCH 5/8] adding custom options to index settings similarity (issue #299) --- output/schema/schema.json | 90 ++++++++++--------- specification/indices/_types/IndexSettings.ts | 4 + 2 files changed, 51 insertions(+), 43 deletions(-) diff --git a/output/schema/schema.json b/output/schema/schema.json index e981fbdcf9..c2d2c3ae51 100644 --- a/output/schema/schema.json +++ b/output/schema/schema.json @@ -110784,7 +110784,7 @@ } } ], - "specLocation": "indices/_types/IndexSettings.ts#L397-L399" + "specLocation": "indices/_types/IndexSettings.ts#L401-L403" }, { "kind": "interface", @@ -111454,7 +111454,7 @@ "name": "IndexCheckOnStartup", "namespace": "indices._types" }, - "specLocation": "indices/_types/IndexSettings.ts#L252-L259" + "specLocation": "indices/_types/IndexSettings.ts#L256-L263" }, { "kind": "interface", @@ -111900,7 +111900,7 @@ } } ], - "specLocation": "indices/_types/IndexSettings.ts#L244-L250" + "specLocation": "indices/_types/IndexSettings.ts#L248-L254" }, { "attachedBehaviors": [ @@ -112811,7 +112811,7 @@ } } ], - "specLocation": "indices/_types/IndexSettings.ts#L309-L315" + "specLocation": "indices/_types/IndexSettings.ts#L313-L319" }, { "kind": "interface", @@ -112904,7 +112904,7 @@ } } ], - "specLocation": "indices/_types/IndexSettings.ts#L266-L299" + "specLocation": "indices/_types/IndexSettings.ts#L270-L303" }, { "kind": "interface", @@ -112926,7 +112926,7 @@ } } ], - "specLocation": "indices/_types/IndexSettings.ts#L301-L307" + "specLocation": "indices/_types/IndexSettings.ts#L305-L311" }, { "kind": "interface", @@ -112958,7 +112958,7 @@ } } ], - "specLocation": "indices/_types/IndexSettings.ts#L317-L320" + "specLocation": "indices/_types/IndexSettings.ts#L321-L324" }, { "kind": "interface", @@ -113315,7 +113315,7 @@ } } ], - "specLocation": "indices/_types/IndexSettings.ts#L261-L264" + "specLocation": "indices/_types/IndexSettings.ts#L265-L268" }, { "kind": "interface", @@ -113336,7 +113336,7 @@ } } ], - "specLocation": "indices/_types/IndexSettings.ts#L533-L535" + "specLocation": "indices/_types/IndexSettings.ts#L537-L539" }, { "kind": "interface", @@ -113358,7 +113358,7 @@ } } ], - "specLocation": "indices/_types/IndexSettings.ts#L537-L544" + "specLocation": "indices/_types/IndexSettings.ts#L541-L548" }, { "kind": "interface", @@ -113412,7 +113412,7 @@ } } ], - "specLocation": "indices/_types/IndexSettings.ts#L546-L551" + "specLocation": "indices/_types/IndexSettings.ts#L550-L555" }, { "kind": "interface", @@ -113436,7 +113436,7 @@ } } ], - "specLocation": "indices/_types/IndexSettings.ts#L553-L560" + "specLocation": "indices/_types/IndexSettings.ts#L557-L564" }, { "kind": "enum", @@ -113559,7 +113559,7 @@ } } ], - "specLocation": "indices/_types/IndexSettings.ts#L401-L414" + "specLocation": "indices/_types/IndexSettings.ts#L405-L418" }, { "kind": "interface", @@ -113582,7 +113582,7 @@ } } ], - "specLocation": "indices/_types/IndexSettings.ts#L426-L433" + "specLocation": "indices/_types/IndexSettings.ts#L430-L437" }, { "kind": "interface", @@ -113604,7 +113604,7 @@ } } ], - "specLocation": "indices/_types/IndexSettings.ts#L463-L469" + "specLocation": "indices/_types/IndexSettings.ts#L467-L473" }, { "kind": "interface", @@ -113626,7 +113626,7 @@ } } ], - "specLocation": "indices/_types/IndexSettings.ts#L454-L461" + "specLocation": "indices/_types/IndexSettings.ts#L458-L465" }, { "kind": "interface", @@ -113649,7 +113649,7 @@ } } ], - "specLocation": "indices/_types/IndexSettings.ts#L435-L443" + "specLocation": "indices/_types/IndexSettings.ts#L439-L447" }, { "kind": "interface", @@ -113672,7 +113672,7 @@ } } ], - "specLocation": "indices/_types/IndexSettings.ts#L445-L452" + "specLocation": "indices/_types/IndexSettings.ts#L449-L456" }, { "kind": "interface", @@ -113695,7 +113695,7 @@ } } ], - "specLocation": "indices/_types/IndexSettings.ts#L416-L424" + "specLocation": "indices/_types/IndexSettings.ts#L420-L428" }, { "kind": "interface", @@ -113716,7 +113716,7 @@ } } ], - "specLocation": "indices/_types/IndexSettings.ts#L322-L324" + "specLocation": "indices/_types/IndexSettings.ts#L326-L328" }, { "kind": "interface", @@ -113766,7 +113766,7 @@ } } ], - "specLocation": "indices/_types/IndexSettings.ts#L326-L329" + "specLocation": "indices/_types/IndexSettings.ts#L330-L333" }, { "kind": "interface", @@ -113824,7 +113824,7 @@ } } ], - "specLocation": "indices/_types/IndexSettings.ts#L393-L395" + "specLocation": "indices/_types/IndexSettings.ts#L397-L399" }, { "kind": "interface", @@ -113867,7 +113867,7 @@ } } ], - "specLocation": "indices/_types/IndexSettings.ts#L235-L238" + "specLocation": "indices/_types/IndexSettings.ts#L239-L242" }, { "kind": "enum", @@ -113960,7 +113960,7 @@ } } ], - "specLocation": "indices/_types/IndexSettings.ts#L225-L228" + "specLocation": "indices/_types/IndexSettings.ts#L229-L232" }, { "kind": "interface", @@ -113982,7 +113982,7 @@ } } ], - "specLocation": "indices/_types/IndexSettings.ts#L220-L223" + "specLocation": "indices/_types/IndexSettings.ts#L224-L227" }, { "kind": "interface", @@ -114012,7 +114012,7 @@ } } ], - "specLocation": "indices/_types/IndexSettings.ts#L240-L242" + "specLocation": "indices/_types/IndexSettings.ts#L244-L246" }, { "kind": "interface", @@ -114044,7 +114044,7 @@ } } ], - "specLocation": "indices/_types/IndexSettings.ts#L230-L233" + "specLocation": "indices/_types/IndexSettings.ts#L234-L237" }, { "kind": "interface", @@ -114131,7 +114131,11 @@ } } ], - "specLocation": "indices/_types/IndexSettings.ts#L169-L177" + "specLocation": "indices/_types/IndexSettings.ts#L169-L181", + "variants": { + "kind": "container", + "nonExhaustive": true + } }, { "kind": "interface", @@ -114182,7 +114186,7 @@ } } ], - "specLocation": "indices/_types/IndexSettings.ts#L179-L184" + "specLocation": "indices/_types/IndexSettings.ts#L183-L188" }, { "kind": "interface", @@ -114211,7 +114215,7 @@ } } ], - "specLocation": "indices/_types/IndexSettings.ts#L186-L189" + "specLocation": "indices/_types/IndexSettings.ts#L190-L193" }, { "kind": "interface", @@ -114262,7 +114266,7 @@ } } ], - "specLocation": "indices/_types/IndexSettings.ts#L191-L196" + "specLocation": "indices/_types/IndexSettings.ts#L195-L200" }, { "kind": "interface", @@ -114313,7 +114317,7 @@ } } ], - "specLocation": "indices/_types/IndexSettings.ts#L198-L203" + "specLocation": "indices/_types/IndexSettings.ts#L202-L207" }, { "kind": "interface", @@ -114342,7 +114346,7 @@ } } ], - "specLocation": "indices/_types/IndexSettings.ts#L205-L208" + "specLocation": "indices/_types/IndexSettings.ts#L209-L212" }, { "kind": "interface", @@ -114371,7 +114375,7 @@ } } ], - "specLocation": "indices/_types/IndexSettings.ts#L210-L213" + "specLocation": "indices/_types/IndexSettings.ts#L214-L217" }, { "kind": "interface", @@ -114400,7 +114404,7 @@ } } ], - "specLocation": "indices/_types/IndexSettings.ts#L215-L218" + "specLocation": "indices/_types/IndexSettings.ts#L219-L222" }, { "kind": "interface", @@ -114454,7 +114458,7 @@ } } ], - "specLocation": "indices/_types/IndexSettings.ts#L471-L476" + "specLocation": "indices/_types/IndexSettings.ts#L475-L480" }, { "kind": "interface", @@ -114508,7 +114512,7 @@ } } ], - "specLocation": "indices/_types/IndexSettings.ts#L483-L488" + "specLocation": "indices/_types/IndexSettings.ts#L487-L492" }, { "kind": "interface", @@ -114540,7 +114544,7 @@ } } ], - "specLocation": "indices/_types/IndexSettings.ts#L478-L481" + "specLocation": "indices/_types/IndexSettings.ts#L482-L485" }, { "kind": "interface", @@ -114608,7 +114612,7 @@ } } ], - "specLocation": "indices/_types/IndexSettings.ts#L490-L499" + "specLocation": "indices/_types/IndexSettings.ts#L494-L503" }, { "isOpen": true, @@ -114638,7 +114642,7 @@ "name": "StorageType", "namespace": "indices._types" }, - "specLocation": "indices/_types/IndexSettings.ts#L501-L531" + "specLocation": "indices/_types/IndexSettings.ts#L505-L535" }, { "kind": "interface", @@ -114795,7 +114799,7 @@ } } ], - "specLocation": "indices/_types/IndexSettings.ts#L331-L353" + "specLocation": "indices/_types/IndexSettings.ts#L335-L357" }, { "kind": "enum", @@ -114819,7 +114823,7 @@ "name": "TranslogDurability", "namespace": "indices._types" }, - "specLocation": "indices/_types/IndexSettings.ts#L355-L370" + "specLocation": "indices/_types/IndexSettings.ts#L359-L374" }, { "kind": "interface", @@ -114855,7 +114859,7 @@ } } ], - "specLocation": "indices/_types/IndexSettings.ts#L372-L391" + "specLocation": "indices/_types/IndexSettings.ts#L376-L395" }, { "kind": "enum", diff --git a/specification/indices/_types/IndexSettings.ts b/specification/indices/_types/IndexSettings.ts index 9ce9d2cfe0..df538542a0 100644 --- a/specification/indices/_types/IndexSettings.ts +++ b/specification/indices/_types/IndexSettings.ts @@ -166,6 +166,10 @@ export class IndexSettings store?: Storage } +/** + * @variants container + * @non_exhaustive + */ export class SettingsSimilarity { bm25?: SettingsSimilarityBm25 dfi?: SettingsSimilarityDfi From 9b15e4526b45921117affb47242ab167ac4c3a0d Mon Sep 17 00:00:00 2001 From: Laura Date: Thu, 8 Feb 2024 15:06:15 +0100 Subject: [PATCH 6/8] initial_master_nodes from string to string[] (issue #242) --- output/schema/schema.json | 11 +++++++---- output/typescript/types.ts | 2 +- specification/nodes/info/types.ts | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/output/schema/schema.json b/output/schema/schema.json index c2d2c3ae51..87bb2d4091 100644 --- a/output/schema/schema.json +++ b/output/schema/schema.json @@ -165157,10 +165157,13 @@ "name": "initial_master_nodes", "required": false, "type": { - "kind": "instance_of", - "type": { - "name": "string", - "namespace": "_builtins" + "kind": "array_of", + "value": { + "kind": "instance_of", + "type": { + "name": "string", + "namespace": "_builtins" + } } } }, diff --git a/output/typescript/types.ts b/output/typescript/types.ts index c3230952a3..4b3f3e50e7 100644 --- a/output/typescript/types.ts +++ b/output/typescript/types.ts @@ -15406,7 +15406,7 @@ export interface NodesInfoNodeInfoSettingsCluster { name: Name routing?: IndicesIndexRouting election: NodesInfoNodeInfoSettingsClusterElection - initial_master_nodes?: string + initial_master_nodes?: string[] deprecation_indexing?: NodesInfoDeprecationIndexing } diff --git a/specification/nodes/info/types.ts b/specification/nodes/info/types.ts index 9ac37e208c..d31490a810 100644 --- a/specification/nodes/info/types.ts +++ b/specification/nodes/info/types.ts @@ -132,7 +132,7 @@ export class NodeInfoSettingsCluster { name: Name routing?: IndexRouting election: NodeInfoSettingsClusterElection - initial_master_nodes?: string + initial_master_nodes?: string[] /** * @availability stack since=7.16.0 * @availability serverless From 6848755b6440c8114ac9e073361ca106d5512c7d Mon Sep 17 00:00:00 2001 From: Laura Date: Thu, 8 Feb 2024 15:15:31 +0100 Subject: [PATCH 7/8] correct contrib --- output/openapi/elasticsearch-serverless-openapi.json | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/output/openapi/elasticsearch-serverless-openapi.json b/output/openapi/elasticsearch-serverless-openapi.json index c6c82f15a0..52e9d7bd90 100644 --- a/output/openapi/elasticsearch-serverless-openapi.json +++ b/output/openapi/elasticsearch-serverless-openapi.json @@ -18166,8 +18166,8 @@ "tags": [ "update_by_query" ], - "summary": "Performs an update on every document in the index without changing the source,\nfor example to pick up a mapping change.", - "description": "Performs an update on every document in the index without changing the source,\nfor example to pick up a mapping change.", + "summary": "Updates documents that match the specified query. If no query is specified,\n performs an update on every document in the index without changing the source,\nfor example to pick up a mapping change.", + "description": "Updates documents that match the specified query. If no query is specified,\n performs an update on every document in the index without changing the source,\nfor example to pick up a mapping change.", "externalDocs": { "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-update-by-query.html" }, @@ -44547,7 +44547,9 @@ "scripted_tfidf": { "$ref": "#/components/schemas/indices._types:SettingsSimilarityScriptedTfidf" } - } + }, + "minProperties": 1, + "maxProperties": 1 }, "indices._types:SettingsSimilarityBm25": { "type": "object", From 52a1acae228af038de4a9609e98b00fb0743d0e0 Mon Sep 17 00:00:00 2001 From: Laura Date: Mon, 19 Feb 2024 15:03:52 +0100 Subject: [PATCH 8/8] correct node info discover class (issue #242) --- output/schema/schema.json | 147 ++++++++++++++++++++---------- output/typescript/types.ts | 8 +- specification/nodes/info/types.ts | 10 +- 3 files changed, 113 insertions(+), 52 deletions(-) diff --git a/output/schema/schema.json b/output/schema/schema.json index 87bb2d4091..32910da30c 100644 --- a/output/schema/schema.json +++ b/output/schema/schema.json @@ -163860,7 +163860,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L143-L145" + "specLocation": "nodes/info/types.ts#L145-L147" }, { "kind": "interface", @@ -164183,7 +164183,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L30-L66" + "specLocation": "nodes/info/types.ts#L32-L68" }, { "kind": "interface", @@ -164204,7 +164204,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L176-L178" + "specLocation": "nodes/info/types.ts#L180-L182" }, { "kind": "interface", @@ -164228,7 +164228,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L227-L229" + "specLocation": "nodes/info/types.ts#L231-L233" }, { "kind": "interface", @@ -164249,7 +164249,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L196-L198" + "specLocation": "nodes/info/types.ts#L200-L202" }, { "kind": "interface", @@ -164270,9 +164270,32 @@ } } ], - "specLocation": "nodes/info/types.ts#L180-L182" + "specLocation": "nodes/info/types.ts#L184-L186" }, { + "attachedBehaviors": [ + "AdditionalProperties" + ], + "behaviors": [ + { + "generics": [ + { + "kind": "instance_of", + "type": { + "name": "string", + "namespace": "_builtins" + } + }, + { + "kind": "user_defined_value" + } + ], + "type": { + "name": "AdditionalProperties", + "namespace": "_spec_utils" + } + } + ], "kind": "interface", "name": { "name": "NodeInfoDiscover", @@ -164282,6 +164305,20 @@ { "name": "seed_hosts", "required": false, + "type": { + "kind": "array_of", + "value": { + "kind": "instance_of", + "type": { + "name": "string", + "namespace": "_builtins" + } + } + } + }, + { + "name": "type", + "required": false, "type": { "kind": "instance_of", "type": { @@ -164289,9 +164326,23 @@ "namespace": "_builtins" } } + }, + { + "name": "seed_providers", + "required": false, + "type": { + "kind": "array_of", + "value": { + "kind": "instance_of", + "type": { + "name": "string", + "namespace": "_builtins" + } + } + } } ], - "specLocation": "nodes/info/types.ts#L172-L174" + "specLocation": "nodes/info/types.ts#L174-L178" }, { "kind": "interface", @@ -164348,7 +164399,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L298-L303" + "specLocation": "nodes/info/types.ts#L302-L307" }, { "kind": "interface", @@ -164372,7 +164423,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L219-L221" + "specLocation": "nodes/info/types.ts#L223-L225" }, { "kind": "interface", @@ -164393,7 +164444,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L127-L129" + "specLocation": "nodes/info/types.ts#L129-L131" }, { "kind": "interface", @@ -164414,7 +164465,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L123-L125" + "specLocation": "nodes/info/types.ts#L125-L127" }, { "kind": "interface", @@ -164435,7 +164486,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L223-L225" + "specLocation": "nodes/info/types.ts#L227-L229" }, { "kind": "interface", @@ -164555,7 +164606,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L305-L316" + "specLocation": "nodes/info/types.ts#L309-L320" }, { "kind": "interface", @@ -164587,7 +164638,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L318-L321" + "specLocation": "nodes/info/types.ts#L322-L325" }, { "kind": "interface", @@ -164619,7 +164670,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L323-L326" + "specLocation": "nodes/info/types.ts#L327-L330" }, { "kind": "interface", @@ -164662,7 +164713,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L328-L332" + "specLocation": "nodes/info/types.ts#L332-L336" }, { "kind": "interface", @@ -164760,7 +164811,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L334-L343" + "specLocation": "nodes/info/types.ts#L338-L347" }, { "kind": "interface", @@ -164820,7 +164871,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L157-L162" + "specLocation": "nodes/info/types.ts#L159-L164" }, { "kind": "interface", @@ -164841,7 +164892,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L164-L166" + "specLocation": "nodes/info/types.ts#L166-L168" }, { "kind": "interface", @@ -164862,7 +164913,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L168-L170" + "specLocation": "nodes/info/types.ts#L170-L172" }, { "kind": "interface", @@ -164894,7 +164945,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L276-L279" + "specLocation": "nodes/info/types.ts#L280-L283" }, { "kind": "interface", @@ -164915,7 +164966,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L281-L283" + "specLocation": "nodes/info/types.ts#L285-L287" }, { "kind": "interface", @@ -164936,7 +164987,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L285-L287" + "specLocation": "nodes/info/types.ts#L289-L291" }, { "kind": "interface", @@ -165111,7 +165162,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L68-L84" + "specLocation": "nodes/info/types.ts#L70-L86" }, { "kind": "interface", @@ -165186,7 +165237,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L131-L141" + "specLocation": "nodes/info/types.ts#L133-L143" }, { "kind": "interface", @@ -165207,7 +165258,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L147-L149" + "specLocation": "nodes/info/types.ts#L149-L151" }, { "kind": "interface", @@ -165285,7 +165336,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L184-L189" + "specLocation": "nodes/info/types.ts#L188-L193" }, { "kind": "interface", @@ -165307,7 +165358,7 @@ } ], "shortcutProperty": "default", - "specLocation": "nodes/info/types.ts#L191-L194" + "specLocation": "nodes/info/types.ts#L195-L198" }, { "kind": "interface", @@ -165691,7 +165742,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L86-L121" + "specLocation": "nodes/info/types.ts#L88-L123" }, { "kind": "interface", @@ -165712,7 +165763,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L215-L217" + "specLocation": "nodes/info/types.ts#L219-L221" }, { "kind": "interface", @@ -165762,7 +165813,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L151-L155" + "specLocation": "nodes/info/types.ts#L153-L157" }, { "kind": "interface", @@ -165805,7 +165856,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L200-L204" + "specLocation": "nodes/info/types.ts#L204-L208" }, { "kind": "interface", @@ -165826,7 +165877,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L211-L213" + "specLocation": "nodes/info/types.ts#L215-L217" }, { "kind": "interface", @@ -165848,7 +165899,7 @@ } ], "shortcutProperty": "default", - "specLocation": "nodes/info/types.ts#L206-L209" + "specLocation": "nodes/info/types.ts#L210-L213" }, { "kind": "interface", @@ -165905,7 +165956,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L345-L349" + "specLocation": "nodes/info/types.ts#L349-L353" }, { "kind": "interface", @@ -165955,7 +166006,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L231-L235" + "specLocation": "nodes/info/types.ts#L235-L239" }, { "kind": "interface", @@ -165976,7 +166027,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L268-L270" + "specLocation": "nodes/info/types.ts#L272-L274" }, { "kind": "interface", @@ -165997,7 +166048,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L272-L274" + "specLocation": "nodes/info/types.ts#L276-L278" }, { "kind": "interface", @@ -166051,7 +166102,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L237-L242" + "specLocation": "nodes/info/types.ts#L241-L246" }, { "kind": "interface", @@ -166083,7 +166134,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L248-L251" + "specLocation": "nodes/info/types.ts#L252-L255" }, { "kind": "interface", @@ -166159,7 +166210,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L253-L257" + "specLocation": "nodes/info/types.ts#L257-L261" }, { "kind": "interface", @@ -166191,7 +166242,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L263-L266" + "specLocation": "nodes/info/types.ts#L267-L270" }, { "kind": "interface", @@ -166212,7 +166263,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L259-L261" + "specLocation": "nodes/info/types.ts#L263-L265" }, { "kind": "interface", @@ -166244,7 +166295,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L244-L246" + "specLocation": "nodes/info/types.ts#L248-L250" }, { "kind": "interface", @@ -166419,7 +166470,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L351-L365" + "specLocation": "nodes/info/types.ts#L355-L369" }, { "kind": "interface", @@ -166554,7 +166605,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L367-L384" + "specLocation": "nodes/info/types.ts#L371-L388" }, { "kind": "interface", @@ -166609,7 +166660,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L386-L393" + "specLocation": "nodes/info/types.ts#L390-L397" }, { "kind": "interface", @@ -166685,7 +166736,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L289-L296" + "specLocation": "nodes/info/types.ts#L293-L300" }, { "attachedBehaviors": [ diff --git a/output/typescript/types.ts b/output/typescript/types.ts index 4b3f3e50e7..907c05c50e 100644 --- a/output/typescript/types.ts +++ b/output/typescript/types.ts @@ -15289,9 +15289,13 @@ export interface NodesInfoNodeInfoClient { type: string } -export interface NodesInfoNodeInfoDiscover { - seed_hosts?: string +export interface NodesInfoNodeInfoDiscoverKeys { + seed_hosts?: string[] + type?: string + seed_providers?: string[] } +export type NodesInfoNodeInfoDiscover = NodesInfoNodeInfoDiscoverKeys + & { [property: string]: any } export interface NodesInfoNodeInfoHttp { bound_address: string[] diff --git a/specification/nodes/info/types.ts b/specification/nodes/info/types.ts index d31490a810..57235356c8 100644 --- a/specification/nodes/info/types.ts +++ b/specification/nodes/info/types.ts @@ -26,6 +26,8 @@ import { integer, long } from '@_types/Numeric' import { PluginStats } from '@_types/Stats' import { NodeRoles } from '@_types/Node' import { Duration, DurationValue, EpochTime, UnitMillis } from '@_types/Time' +import { UserDefinedValue } from '@spec_utils/UserDefinedValue' +import { AdditionalProperties } from '@spec_utils/behaviors' export class NodeInfo { attributes: Dictionary @@ -169,8 +171,12 @@ export class NodeInfoRepositoriesUrl { allowed_urls: string } -export class NodeInfoDiscover { - seed_hosts?: string +export class NodeInfoDiscover + implements AdditionalProperties +{ + seed_hosts?: string[] + type?: string + seed_providers?: string[] } export class NodeInfoAction {