Fix query DSL types

Signed-off-by: Thomas Farr <[email protected]>
opensearch-project · Dec 5, 2024 · 6118309 · 6118309
1 parent 0ee21a8
commit 6118309
Show file tree

Hide file tree

Showing 8 changed files with 614 additions and 519 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -52,6 +52,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - Fixed `fields` in `Hit` allowing primitive arrays ([#699](https://github.com/opensearch-project/opensearch-api-specification/pull/699))
 - Added missing `repository` query parameter to `/_cat/snapshots` ([#700](https://github.com/opensearch-project/opensearch-api-specification/pull/700))
 - Fixed `hits` in `rank_eval` allowing numbers ([#704](https://github.com/opensearch-project/opensearch-api-specification/pull/704))
+- Fixed query DSL schemas ([#706](https://github.com/opensearch-project/opensearch-api-specification/pull/706))
 
 ### Changed
 - Changed `tasks._common:TaskInfo` and `tasks._common:TaskGroup` to be composed of a `tasks._common:TaskInfoBase` ([#683](https://github.com/opensearch-project/opensearch-api-specification/pull/683))

diff --git a/spec/namespaces/indices.yaml b/spec/namespaces/indices.yaml
@@ -2146,12 +2146,12 @@ components:
 
                   Templates with lower 'order' values are merged first. Templates with higher
                   'order' values are merged later, overriding templates with lower values.
-                type: number
+                type: integer
+                format: int32
               settings:
                 description: Configuration options for the index.
                 type: object
-                additionalProperties:
-                  type: object
+                additionalProperties: true
               version:
                 $ref: '../schemas/_common.yaml#/components/schemas/VersionNumber'
             description: The template definition

diff --git a/spec/schemas/_common.mapping.yaml b/spec/schemas/_common.mapping.yaml
@@ -105,6 +105,55 @@ components:
           type: string
         unmatch:
           type: string
+    FieldType:
+      type: string
+      enum:
+        - aggregate_metric_double
+        - alias
+        - binary
+        - boolean
+        - byte
+        - completion
+        - constant_keyword
+        - date
+        - date_nanos
+        - date_range
+        - double
+        - double_range
+        - flat_object
+        - float
+        - float_range
+        - geo_point
+        - geo_shape
+        - half_float
+        - histogram
+        - icu_collation_keyword
+        - integer
+        - integer_range
+        - ip
+        - ip_range
+        - join
+        - keyword
+        - knn_vector
+        - long
+        - long_range
+        - match_only_text
+        - murmur3
+        - nested
+        - object
+        - percolator
+        - rank_feature
+        - rank_features
+        - scaled_float
+        - search_as_you_type
+        - short
+        - text
+        - token_count
+        - unsigned_long
+        - version
+        - wildcard
+        - xy_point
+        - xy_shape
     Property:
       type: object
       discriminator: