From 4abdc6b943e68990f4d4e5e5c12d3420967c07f1 Mon Sep 17 00:00:00 2001 From: Laura Date: Mon, 29 Jan 2024 17:26:01 +0100 Subject: [PATCH] Fix script definition in processorcontainer (#2400) --- output/schema/schema.json | 180 ++++++++++++++-------- output/typescript/types.ts | 10 +- specification/ingest/_types/Processors.ts | 3 +- 3 files changed, 127 insertions(+), 66 deletions(-) diff --git a/output/schema/schema.json b/output/schema/schema.json index 0a9c77bd25..0d2e7199a2 100644 --- a/output/schema/schema.json +++ b/output/schema/schema.json @@ -61606,7 +61606,7 @@ } } ], - "specLocation": "_types/query_dsl/geo.ts#L57-L85" + "specLocation": "_types/query_dsl/geo.ts#L48-L63" }, { "kind": "enum", @@ -61646,7 +61646,7 @@ } } ], - "specLocation": "_types/query_dsl/geo.ts#L87-L89" + "specLocation": "_types/query_dsl/geo.ts#L65-L67" }, { "attachedBehaviors": [ @@ -61716,7 +61716,7 @@ } } ], - "specLocation": "_types/query_dsl/geo.ts#L91-L99" + "specLocation": "_types/query_dsl/geo.ts#L69-L77" }, { "kind": "interface", @@ -61759,7 +61759,7 @@ } } ], - "specLocation": "_types/query_dsl/geo.ts#L106-L117" + "specLocation": "_types/query_dsl/geo.ts#L84-L88" }, { "attachedBehaviors": [ @@ -61813,7 +61813,7 @@ } } ], - "specLocation": "_types/query_dsl/geo.ts#L121-L131" + "specLocation": "_types/query_dsl/geo.ts#L92-L97" }, { "kind": "enum", @@ -61832,7 +61832,7 @@ "name": "GeoValidationMethod", "namespace": "_types.query_dsl" }, - "specLocation": "_types/query_dsl/geo.ts#L147-L157" + "specLocation": "_types/query_dsl/geo.ts#L113-L117" }, { "inherits": { @@ -109396,7 +109396,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L90-L94" + "specLocation": "ingest/_types/Processors.ts#L89-L93" }, { "inherits": { @@ -109492,7 +109492,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L96-L104" + "specLocation": "ingest/_types/Processors.ts#L95-L103" }, { "inherits": { @@ -109541,7 +109541,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L123-L127" + "specLocation": "ingest/_types/Processors.ts#L122-L126" }, { "inherits": { @@ -109612,7 +109612,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L129-L135" + "specLocation": "ingest/_types/Processors.ts#L128-L134" }, { "inherits": { @@ -109672,7 +109672,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L147-L152" + "specLocation": "ingest/_types/Processors.ts#L146-L151" }, { "kind": "enum", @@ -109703,7 +109703,7 @@ "name": "ConvertType", "namespace": "ingest._types" }, - "specLocation": "ingest/_types/Processors.ts#L137-L145" + "specLocation": "ingest/_types/Processors.ts#L136-L144" }, { "inherits": { @@ -109792,7 +109792,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L154-L162" + "specLocation": "ingest/_types/Processors.ts#L153-L161" }, { "inherits": { @@ -109889,7 +109889,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L164-L177" + "specLocation": "ingest/_types/Processors.ts#L163-L176" }, { "inherits": { @@ -109963,7 +109963,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L179-L185" + "specLocation": "ingest/_types/Processors.ts#L178-L184" }, { "inherits": { @@ -110023,7 +110023,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L187-L192" + "specLocation": "ingest/_types/Processors.ts#L186-L191" }, { "inherits": { @@ -110061,7 +110061,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L194-L197" + "specLocation": "ingest/_types/Processors.ts#L193-L196" }, { "inherits": { @@ -110076,7 +110076,7 @@ "namespace": "ingest._types" }, "properties": [], - "specLocation": "ingest/_types/Processors.ts#L199-L199" + "specLocation": "ingest/_types/Processors.ts#L198-L198" }, { "inherits": { @@ -110169,7 +110169,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L201-L209" + "specLocation": "ingest/_types/Processors.ts#L200-L208" }, { "inherits": { @@ -110196,7 +110196,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L211-L213" + "specLocation": "ingest/_types/Processors.ts#L210-L212" }, { "inherits": { @@ -110245,7 +110245,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L215-L219" + "specLocation": "ingest/_types/Processors.ts#L214-L218" }, { "inherits": { @@ -110330,7 +110330,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L106-L113" + "specLocation": "ingest/_types/Processors.ts#L105-L112" }, { "inherits": { @@ -110415,7 +110415,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L221-L227" + "specLocation": "ingest/_types/Processors.ts#L220-L226" }, { "inherits": { @@ -110486,7 +110486,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L229-L235" + "specLocation": "ingest/_types/Processors.ts#L228-L234" }, { "kind": "interface", @@ -110507,7 +110507,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L244-L246" + "specLocation": "ingest/_types/Processors.ts#L243-L245" }, { "kind": "interface", @@ -110528,7 +110528,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L248-L250" + "specLocation": "ingest/_types/Processors.ts#L247-L249" }, { "inherits": { @@ -110595,7 +110595,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L237-L242" + "specLocation": "ingest/_types/Processors.ts#L236-L241" }, { "inherits": { @@ -110644,7 +110644,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L252-L256" + "specLocation": "ingest/_types/Processors.ts#L251-L255" }, { "inherits": { @@ -110715,7 +110715,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L258-L264" + "specLocation": "ingest/_types/Processors.ts#L257-L263" }, { "kind": "enum", @@ -110733,7 +110733,7 @@ "name": "JsonProcessorConflictStrategy", "namespace": "ingest._types" }, - "specLocation": "ingest/_types/Processors.ts#L266-L271" + "specLocation": "ingest/_types/Processors.ts#L265-L270" }, { "inherits": { @@ -110876,7 +110876,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L273-L285" + "specLocation": "ingest/_types/Processors.ts#L272-L284" }, { "inherits": { @@ -110925,7 +110925,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L287-L291" + "specLocation": "ingest/_types/Processors.ts#L286-L290" }, { "kind": "interface", @@ -111069,7 +111069,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L293-L296" + "specLocation": "ingest/_types/Processors.ts#L292-L295" }, { "kind": "interface", @@ -111137,7 +111137,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L69-L75" + "specLocation": "ingest/_types/Processors.ts#L68-L74" }, { "kind": "interface", @@ -111372,8 +111372,8 @@ "type": { "kind": "instance_of", "type": { - "name": "Script", - "namespace": "_types" + "name": "ScriptProcessor", + "namespace": "ingest._types" } } }, @@ -111521,7 +111521,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L28-L67", + "specLocation": "ingest/_types/Processors.ts#L27-L66", "variants": { "kind": "container", "nonExhaustive": true @@ -111563,7 +111563,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L298-L301" + "specLocation": "ingest/_types/Processors.ts#L297-L300" }, { "inherits": { @@ -111612,7 +111612,74 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L303-L307" + "specLocation": "ingest/_types/Processors.ts#L302-L306" + }, + { + "inherits": { + "type": { + "name": "ProcessorBase", + "namespace": "ingest._types" + } + }, + "kind": "interface", + "name": { + "name": "ScriptProcessor", + "namespace": "ingest._types" + }, + "properties": [ + { + "name": "id", + "required": false, + "type": { + "kind": "instance_of", + "type": { + "name": "Id", + "namespace": "_types" + } + } + }, + { + "name": "lang", + "required": false, + "type": { + "kind": "instance_of", + "type": { + "name": "string", + "namespace": "_builtins" + } + } + }, + { + "name": "params", + "required": false, + "type": { + "key": { + "kind": "instance_of", + "type": { + "name": "string", + "namespace": "_builtins" + } + }, + "kind": "dictionary_of", + "singleKey": false, + "value": { + "kind": "user_defined_value" + } + } + }, + { + "name": "source", + "required": false, + "type": { + "kind": "instance_of", + "type": { + "name": "string", + "namespace": "_builtins" + } + } + } + ], + "specLocation": "ingest/_types/Processors.ts#L308-L313" }, { "inherits": { @@ -111690,7 +111757,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L316-L323" + "specLocation": "ingest/_types/Processors.ts#L315-L322" }, { "inherits": { @@ -111731,7 +111798,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L325-L328" + "specLocation": "ingest/_types/Processors.ts#L324-L327" }, { "kind": "enum", @@ -111747,7 +111814,7 @@ "name": "ShapeType", "namespace": "ingest._types" }, - "specLocation": "ingest/_types/Processors.ts#L330-L333" + "specLocation": "ingest/_types/Processors.ts#L329-L332" }, { "inherits": { @@ -111796,7 +111863,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L335-L339" + "specLocation": "ingest/_types/Processors.ts#L334-L338" }, { "inherits": { @@ -111867,7 +111934,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L341-L347" + "specLocation": "ingest/_types/Processors.ts#L340-L346" }, { "inherits": { @@ -111916,7 +111983,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L349-L353" + "specLocation": "ingest/_types/Processors.ts#L348-L352" }, { "inherits": { @@ -111965,7 +112032,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L355-L359" + "specLocation": "ingest/_types/Processors.ts#L354-L358" }, { "inherits": { @@ -112014,7 +112081,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L361-L365" + "specLocation": "ingest/_types/Processors.ts#L360-L364" }, { "inherits": { @@ -112088,7 +112155,7 @@ } } ], - "specLocation": "ingest/_types/Processors.ts#L115-L121" + "specLocation": "ingest/_types/Processors.ts#L114-L120" }, { "kind": "enum", @@ -112128,7 +112195,7 @@ "name": "UserAgentProperty", "namespace": "ingest._types" }, - "specLocation": "ingest/_types/Processors.ts#L77-L88" + "specLocation": "ingest/_types/Processors.ts#L76-L87" }, { "attachedBehaviors": [ @@ -144247,20 +144314,9 @@ "namespace": "_types" } } - }, - { - "name": "realm.name", - "required": false, - "type": { - "kind": "instance_of", - "type": { - "name": "Name", - "namespace": "_types" - } - } } ], - "specLocation": "security/_types/RoleMappingRule.ts#L34-L44", + "specLocation": "security/_types/RoleMappingRule.ts#L36-L44", "variants": { "kind": "container", "nonExhaustive": true @@ -144702,7 +144758,7 @@ } } ], - "specLocation": "security/_types/RoleMappingRule.ts#L24-L32", + "specLocation": "security/_types/RoleMappingRule.ts#L23-L34", "variants": { "kind": "container" } diff --git a/output/typescript/types.ts b/output/typescript/types.ts index 728c757ff1..889a5dc342 100644 --- a/output/typescript/types.ts +++ b/output/typescript/types.ts @@ -10783,7 +10783,7 @@ export interface IngestProcessorContainer { lowercase?: IngestLowercaseProcessor remove?: IngestRemoveProcessor rename?: IngestRenameProcessor - script?: Script + script?: IngestScriptProcessor set?: IngestSetProcessor sort?: IngestSortProcessor split?: IngestSplitProcessor @@ -10810,6 +10810,13 @@ export interface IngestRenameProcessor extends IngestProcessorBase { target_field: Field } +export interface IngestScriptProcessor extends IngestProcessorBase { + id?: Id + lang?: string + params?: Record + source?: string +} + export interface IngestSetProcessor extends IngestProcessorBase { copy_from?: Field field: Field @@ -14427,7 +14434,6 @@ export interface SecurityFieldRule { username?: Names dn?: Names groups?: Names - 'realm.name'?: Name } export interface SecurityFieldSecurity { diff --git a/specification/ingest/_types/Processors.ts b/specification/ingest/_types/Processors.ts index dde77afa35..12f0d9e6c3 100644 --- a/specification/ingest/_types/Processors.ts +++ b/specification/ingest/_types/Processors.ts @@ -23,7 +23,6 @@ import { UserDefinedValue } from '@spec_utils/UserDefinedValue' import { Field, Fields, Id, Name } from '@_types/common' import { GeoShapeRelation } from '@_types/Geo' import { double, integer, long } from '@_types/Numeric' -import { Script } from '@_types/Scripting' /** * @variants container @@ -50,7 +49,7 @@ export class ProcessorContainer { lowercase?: LowercaseProcessor remove?: RemoveProcessor rename?: RenameProcessor - script?: Script + script?: ScriptProcessor set?: SetProcessor sort?: SortProcessor split?: SplitProcessor