From b1400a31a3b8456812b39bfeaea2280fd239334c Mon Sep 17 00:00:00 2001
From: mspielberg <9729801+mspielberg@users.noreply.github.com>
Date: Wed, 18 Sep 2024 04:26:05 -0700
Subject: [PATCH] Add minimum_should_match to terms_set (#2901)

* Add minimum_should_match to terms_set

* Add availability annotations

* Run make contrib

---------

Co-authored-by: Quentin Pradet <quentin.pradet@elastic.co>
---
 output/openapi/elasticsearch-openapi.json     |  3 +
 .../elasticsearch-serverless-openapi.json     |  3 +
 output/schema/schema-serverless.json          | 56 ++++++++++++-------
 output/schema/schema.json                     | 56 ++++++++++++-------
 output/typescript/types.ts                    |  1 +
 specification/_types/query_dsl/term.ts        |  7 +++
 6 files changed, 88 insertions(+), 38 deletions(-)

diff --git a/output/openapi/elasticsearch-openapi.json b/output/openapi/elasticsearch-openapi.json
index 2f93e1ca53..6e5f885d27 100644
--- a/output/openapi/elasticsearch-openapi.json
+++ b/output/openapi/elasticsearch-openapi.json
@@ -46869,6 +46869,9 @@
           {
             "type": "object",
             "properties": {
+              "minimum_should_match": {
+                "$ref": "#/components/schemas/_types:MinimumShouldMatch"
+              },
               "minimum_should_match_field": {
                 "$ref": "#/components/schemas/_types:Field"
               },
diff --git a/output/openapi/elasticsearch-serverless-openapi.json b/output/openapi/elasticsearch-serverless-openapi.json
index 83842d7d7e..9a4f3e5c19 100644
--- a/output/openapi/elasticsearch-serverless-openapi.json
+++ b/output/openapi/elasticsearch-serverless-openapi.json
@@ -30149,6 +30149,9 @@
           {
             "type": "object",
             "properties": {
+              "minimum_should_match": {
+                "$ref": "#/components/schemas/_types:MinimumShouldMatch"
+              },
               "minimum_should_match_field": {
                 "$ref": "#/components/schemas/_types:Field"
               },
diff --git a/output/schema/schema-serverless.json b/output/schema/schema-serverless.json
index 180bb991ec..442cc4606d 100644
--- a/output/schema/schema-serverless.json
+++ b/output/schema/schema-serverless.json
@@ -49046,7 +49046,7 @@
           }
         }
       ],
-      "specLocation": "_types/query_dsl/term.ts#L37-L42"
+      "specLocation": "_types/query_dsl/term.ts#L38-L43"
     },
     {
       "inherits": {
@@ -50103,7 +50103,7 @@
         }
       ],
       "shortcutProperty": "value",
-      "specLocation": "_types/query_dsl/term.ts#L44-L79"
+      "specLocation": "_types/query_dsl/term.ts#L45-L80"
     },
     {
       "docId": "query-dsl-multi-term-rewrite",
@@ -53036,7 +53036,7 @@
           }
         }
       ],
-      "specLocation": "_types/query_dsl/term.ts#L81-L86"
+      "specLocation": "_types/query_dsl/term.ts#L82-L87"
     },
     {
       "kind": "type_alias",
@@ -55630,7 +55630,7 @@
         }
       ],
       "shortcutProperty": "value",
-      "specLocation": "_types/query_dsl/term.ts#L88-L107"
+      "specLocation": "_types/query_dsl/term.ts#L89-L108"
     },
     {
       "inherits": {
@@ -56000,7 +56000,7 @@
         "name": "RangeQuery",
         "namespace": "_types.query_dsl"
       },
-      "specLocation": "_types/query_dsl/term.ts#L161-L170",
+      "specLocation": "_types/query_dsl/term.ts#L162-L171",
       "type": {
         "items": [
           {
@@ -56085,7 +56085,7 @@
           }
         }
       ],
-      "specLocation": "_types/query_dsl/term.ts#L135-L144"
+      "specLocation": "_types/query_dsl/term.ts#L136-L145"
     },
     {
       "generics": [
@@ -56214,7 +56214,7 @@
           }
         }
       ],
-      "specLocation": "_types/query_dsl/term.ts#L109-L133"
+      "specLocation": "_types/query_dsl/term.ts#L110-L134"
     },
     {
       "kind": "enum",
@@ -56236,7 +56236,7 @@
         "name": "RangeRelation",
         "namespace": "_types.query_dsl"
       },
-      "specLocation": "_types/query_dsl/term.ts#L172-L185"
+      "specLocation": "_types/query_dsl/term.ts#L173-L186"
     },
     {
       "docId": "mapping-date-format",
@@ -56302,7 +56302,7 @@
           }
         }
       ],
-      "specLocation": "_types/query_dsl/term.ts#L146-L155"
+      "specLocation": "_types/query_dsl/term.ts#L147-L156"
     },
     {
       "inherits": {
@@ -56326,7 +56326,7 @@
         "namespace": "_types.query_dsl"
       },
       "properties": [],
-      "specLocation": "_types/query_dsl/term.ts#L157-L157"
+      "specLocation": "_types/query_dsl/term.ts#L158-L158"
     },
     {
       "inherits": {
@@ -56350,7 +56350,7 @@
         "namespace": "_types.query_dsl"
       },
       "properties": [],
-      "specLocation": "_types/query_dsl/term.ts#L159-L159"
+      "specLocation": "_types/query_dsl/term.ts#L160-L160"
     },
     {
       "inherits": {
@@ -56637,7 +56637,7 @@
         }
       ],
       "shortcutProperty": "value",
-      "specLocation": "_types/query_dsl/term.ts#L187-L217"
+      "specLocation": "_types/query_dsl/term.ts#L188-L218"
     },
     {
       "inherits": {
@@ -57927,7 +57927,7 @@
         }
       ],
       "shortcutProperty": "value",
-      "specLocation": "_types/query_dsl/term.ts#L219-L233"
+      "specLocation": "_types/query_dsl/term.ts#L220-L234"
     },
     {
       "codegenNames": [
@@ -58033,7 +58033,7 @@
         "namespace": "_types.query_dsl"
       },
       "properties": [],
-      "specLocation": "_types/query_dsl/term.ts#L235-L240"
+      "specLocation": "_types/query_dsl/term.ts#L236-L241"
     },
     {
       "codegenNames": [
@@ -58045,7 +58045,7 @@
         "name": "TermsQueryField",
         "namespace": "_types.query_dsl"
       },
-      "specLocation": "_types/query_dsl/term.ts#L242-L245",
+      "specLocation": "_types/query_dsl/term.ts#L243-L246",
       "type": {
         "items": [
           {
@@ -58121,7 +58121,7 @@
           }
         }
       ],
-      "specLocation": "_types/query_dsl/term.ts#L247-L252"
+      "specLocation": "_types/query_dsl/term.ts#L248-L253"
     },
     {
       "inherits": {
@@ -58136,6 +58136,24 @@
         "namespace": "_types.query_dsl"
       },
       "properties": [
+        {
+          "availability": {
+            "serverless": {},
+            "stack": {
+              "since": "8.10.0"
+            }
+          },
+          "description": "Specification describing number of matching terms required to return a document.",
+          "name": "minimum_should_match",
+          "required": false,
+          "type": {
+            "kind": "instance_of",
+            "type": {
+              "name": "MinimumShouldMatch",
+              "namespace": "_types"
+            }
+          }
+        },
         {
           "description": "Numeric field containing the number of matching terms required to return a document.",
           "name": "minimum_should_match_field",
@@ -58176,7 +58194,7 @@
           }
         }
       ],
-      "specLocation": "_types/query_dsl/term.ts#L254-L267"
+      "specLocation": "_types/query_dsl/term.ts#L255-L274"
     },
     {
       "inherits": {
@@ -58361,7 +58379,7 @@
         }
       ],
       "shortcutProperty": "value",
-      "specLocation": "_types/query_dsl/term.ts#L273-L290"
+      "specLocation": "_types/query_dsl/term.ts#L280-L297"
     },
     {
       "inherits": {
@@ -58416,7 +58434,7 @@
           }
         }
       ],
-      "specLocation": "_types/query_dsl/term.ts#L269-L271"
+      "specLocation": "_types/query_dsl/term.ts#L276-L278"
     },
     {
       "inherits": {
diff --git a/output/schema/schema.json b/output/schema/schema.json
index 1cad3778c2..bdbe479489 100644
--- a/output/schema/schema.json
+++ b/output/schema/schema.json
@@ -77013,7 +77013,7 @@
           }
         }
       ],
-      "specLocation": "_types/query_dsl/term.ts#L146-L155"
+      "specLocation": "_types/query_dsl/term.ts#L147-L156"
     },
     {
       "kind": "type_alias",
@@ -77397,7 +77397,7 @@
           }
         }
       ],
-      "specLocation": "_types/query_dsl/term.ts#L37-L42"
+      "specLocation": "_types/query_dsl/term.ts#L38-L43"
     },
     {
       "kind": "interface",
@@ -77999,7 +77999,7 @@
         }
       ],
       "shortcutProperty": "value",
-      "specLocation": "_types/query_dsl/term.ts#L44-L79"
+      "specLocation": "_types/query_dsl/term.ts#L45-L80"
     },
     {
       "kind": "interface",
@@ -78705,7 +78705,7 @@
           }
         }
       ],
-      "specLocation": "_types/query_dsl/term.ts#L81-L86"
+      "specLocation": "_types/query_dsl/term.ts#L82-L87"
     },
     {
       "kind": "interface",
@@ -80692,7 +80692,7 @@
         "namespace": "_types.query_dsl"
       },
       "properties": [],
-      "specLocation": "_types/query_dsl/term.ts#L157-L157"
+      "specLocation": "_types/query_dsl/term.ts#L158-L158"
     },
     {
       "kind": "interface",
@@ -81078,7 +81078,7 @@
         }
       ],
       "shortcutProperty": "value",
-      "specLocation": "_types/query_dsl/term.ts#L88-L107"
+      "specLocation": "_types/query_dsl/term.ts#L89-L108"
     },
     {
       "kind": "interface",
@@ -82578,7 +82578,7 @@
         "name": "RangeQuery",
         "namespace": "_types.query_dsl"
       },
-      "specLocation": "_types/query_dsl/term.ts#L161-L170",
+      "specLocation": "_types/query_dsl/term.ts#L162-L171",
       "type": {
         "kind": "union_of",
         "items": [
@@ -82747,7 +82747,7 @@
           }
         }
       ],
-      "specLocation": "_types/query_dsl/term.ts#L109-L133"
+      "specLocation": "_types/query_dsl/term.ts#L110-L134"
     },
     {
       "kind": "enum",
@@ -82769,7 +82769,7 @@
         "name": "RangeRelation",
         "namespace": "_types.query_dsl"
       },
-      "specLocation": "_types/query_dsl/term.ts#L172-L185"
+      "specLocation": "_types/query_dsl/term.ts#L173-L186"
     },
     {
       "kind": "interface",
@@ -83056,7 +83056,7 @@
         }
       ],
       "shortcutProperty": "value",
-      "specLocation": "_types/query_dsl/term.ts#L187-L217"
+      "specLocation": "_types/query_dsl/term.ts#L188-L218"
     },
     {
       "kind": "interface",
@@ -84347,7 +84347,7 @@
         }
       ],
       "shortcutProperty": "value",
-      "specLocation": "_types/query_dsl/term.ts#L219-L233"
+      "specLocation": "_types/query_dsl/term.ts#L220-L234"
     },
     {
       "kind": "interface",
@@ -84371,7 +84371,7 @@
         "namespace": "_types.query_dsl"
       },
       "properties": [],
-      "specLocation": "_types/query_dsl/term.ts#L159-L159"
+      "specLocation": "_types/query_dsl/term.ts#L160-L160"
     },
     {
       "kind": "interface",
@@ -84425,7 +84425,7 @@
           }
         }
       ],
-      "specLocation": "_types/query_dsl/term.ts#L247-L252"
+      "specLocation": "_types/query_dsl/term.ts#L248-L253"
     },
     {
       "kind": "interface",
@@ -84471,7 +84471,7 @@
         "namespace": "_types.query_dsl"
       },
       "properties": [],
-      "specLocation": "_types/query_dsl/term.ts#L235-L240"
+      "specLocation": "_types/query_dsl/term.ts#L236-L241"
     },
     {
       "kind": "type_alias",
@@ -84483,7 +84483,7 @@
         "name": "TermsQueryField",
         "namespace": "_types.query_dsl"
       },
-      "specLocation": "_types/query_dsl/term.ts#L242-L245",
+      "specLocation": "_types/query_dsl/term.ts#L243-L246",
       "type": {
         "kind": "union_of",
         "items": [
@@ -84520,6 +84520,24 @@
         "namespace": "_types.query_dsl"
       },
       "properties": [
+        {
+          "availability": {
+            "serverless": {},
+            "stack": {
+              "since": "8.10.0"
+            }
+          },
+          "description": "Specification describing number of matching terms required to return a document.",
+          "name": "minimum_should_match",
+          "required": false,
+          "type": {
+            "kind": "instance_of",
+            "type": {
+              "name": "MinimumShouldMatch",
+              "namespace": "_types"
+            }
+          }
+        },
         {
           "description": "Numeric field containing the number of matching terms required to return a document.",
           "name": "minimum_should_match_field",
@@ -84560,7 +84578,7 @@
           }
         }
       ],
-      "specLocation": "_types/query_dsl/term.ts#L254-L267"
+      "specLocation": "_types/query_dsl/term.ts#L255-L274"
     },
     {
       "kind": "interface",
@@ -84731,7 +84749,7 @@
           }
         }
       ],
-      "specLocation": "_types/query_dsl/term.ts#L269-L271"
+      "specLocation": "_types/query_dsl/term.ts#L276-L278"
     },
     {
       "kind": "interface",
@@ -84825,7 +84843,7 @@
           }
         }
       ],
-      "specLocation": "_types/query_dsl/term.ts#L135-L144"
+      "specLocation": "_types/query_dsl/term.ts#L136-L145"
     },
     {
       "kind": "interface",
@@ -84949,7 +84967,7 @@
         }
       ],
       "shortcutProperty": "value",
-      "specLocation": "_types/query_dsl/term.ts#L273-L290"
+      "specLocation": "_types/query_dsl/term.ts#L280-L297"
     },
     {
       "kind": "interface",
diff --git a/output/typescript/types.ts b/output/typescript/types.ts
index 2c88e9fae2..eaf9b4c0e8 100644
--- a/output/typescript/types.ts
+++ b/output/typescript/types.ts
@@ -6515,6 +6515,7 @@ export type QueryDslTermsQuery = QueryDslTermsQueryKeys
 export type QueryDslTermsQueryField = FieldValue[] | QueryDslTermsLookup
 
 export interface QueryDslTermsSetQuery extends QueryDslQueryBase {
+  minimum_should_match?: MinimumShouldMatch
   minimum_should_match_field?: Field
   minimum_should_match_script?: Script | string
   terms: string[]
diff --git a/specification/_types/query_dsl/term.ts b/specification/_types/query_dsl/term.ts
index 0860dda2f5..73c8e268e8 100644
--- a/specification/_types/query_dsl/term.ts
+++ b/specification/_types/query_dsl/term.ts
@@ -26,6 +26,7 @@ import {
   Id,
   Ids,
   IndexName,
+  MinimumShouldMatch,
   MultiTermQueryRewrite,
   Routing
 } from '@_types/common'
@@ -252,6 +253,12 @@ export class TermsLookup {
 }
 
 export class TermsSetQuery extends QueryBase {
+  /**
+   * Specification describing number of matching terms required to return a document.
+   * @availability stack since=8.10.0
+   * @availability serverless
+   */
+  minimum_should_match?: MinimumShouldMatch
   /**
    * Numeric field containing the number of matching terms required to return a document.
    */