From d63ae8a27151e184c4cfc125dae538d8682cfbcd Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 13 Mar 2024 17:58:30 +0400
Subject: [PATCH] [Backport 8.12] Add support for subobjects property (#2446)

(cherry picked from commit 4e97d997b516f84b28adaad924b54244ac1795fd)

Co-authored-by: Quentin Pradet <quentin.pradet@elastic.co>
---
 .../elasticsearch-serverless-openapi.json     |  6 ++++
 output/schema/schema.json                     | 32 ++++++++++++++++---
 output/typescript/types.ts                    |  2 ++
 specification/_types/mapping/TypeMapping.ts   |  1 +
 specification/_types/mapping/complex.ts       |  1 +
 5 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/output/openapi/elasticsearch-serverless-openapi.json b/output/openapi/elasticsearch-serverless-openapi.json
index b4cc3cb9b1..a9ad595f62 100644
--- a/output/openapi/elasticsearch-serverless-openapi.json
+++ b/output/openapi/elasticsearch-serverless-openapi.json
@@ -44912,6 +44912,9 @@
           "enabled": {
             "type": "boolean"
           },
+          "subobjects": {
+            "type": "boolean"
+          },
           "_data_stream_timestamp": {
             "$ref": "#/components/schemas/_types.mapping:DataStreamTimestamp"
           }
@@ -46074,6 +46077,9 @@
               "enabled": {
                 "type": "boolean"
               },
+              "subobjects": {
+                "type": "boolean"
+              },
               "type": {
                 "type": "string",
                 "enum": [
diff --git a/output/schema/schema.json b/output/schema/schema.json
index fbb6ca601f..05147281c6 100644
--- a/output/schema/schema.json
+++ b/output/schema/schema.json
@@ -67023,7 +67023,7 @@
           }
         }
       ],
-      "specLocation": "_types/mapping/complex.ts#L59-L64"
+      "specLocation": "_types/mapping/complex.ts#L60-L65"
     },
     {
       "kind": "interface",
@@ -67464,7 +67464,7 @@
           }
         }
       ],
-      "specLocation": "_types/mapping/TypeMapping.ts#L58-L60"
+      "specLocation": "_types/mapping/TypeMapping.ts#L59-L61"
     },
     {
       "inherits": {
@@ -67812,7 +67812,7 @@
           }
         }
       ],
-      "specLocation": "_types/mapping/complex.ts#L51-L57"
+      "specLocation": "_types/mapping/complex.ts#L52-L58"
     },
     {
       "inherits": {
@@ -69775,6 +69775,17 @@
             }
           }
         },
+        {
+          "name": "subobjects",
+          "required": false,
+          "type": {
+            "kind": "instance_of",
+            "type": {
+              "name": "boolean",
+              "namespace": "_builtins"
+            }
+          }
+        },
         {
           "name": "type",
           "required": false,
@@ -69784,7 +69795,7 @@
           }
         }
       ],
-      "specLocation": "_types/mapping/complex.ts#L46-L49"
+      "specLocation": "_types/mapping/complex.ts#L46-L50"
     },
     {
       "kind": "enum",
@@ -71688,6 +71699,17 @@
             }
           }
         },
+        {
+          "name": "subobjects",
+          "required": false,
+          "type": {
+            "kind": "instance_of",
+            "type": {
+              "name": "boolean",
+              "namespace": "_builtins"
+            }
+          }
+        },
         {
           "availability": {
             "serverless": {},
@@ -71707,7 +71729,7 @@
           }
         }
       ],
-      "specLocation": "_types/mapping/TypeMapping.ts#L34-L56"
+      "specLocation": "_types/mapping/TypeMapping.ts#L34-L57"
     },
     {
       "inherits": {
diff --git a/output/typescript/types.ts b/output/typescript/types.ts
index 51fe7f7ad4..8b5311eb7b 100644
--- a/output/typescript/types.ts
+++ b/output/typescript/types.ts
@@ -5152,6 +5152,7 @@ export interface MappingNumberPropertyBase extends MappingDocValuesPropertyBase
 
 export interface MappingObjectProperty extends MappingCorePropertyBase {
   enabled?: boolean
+  subobjects?: boolean
   type?: 'object'
 }
 
@@ -5325,6 +5326,7 @@ export interface MappingTypeMapping {
   _source?: MappingSourceField
   runtime?: Record<string, MappingRuntimeField>
   enabled?: boolean
+  subobjects?: boolean
   _data_stream_timestamp?: MappingDataStreamTimestamp
 }
 
diff --git a/specification/_types/mapping/TypeMapping.ts b/specification/_types/mapping/TypeMapping.ts
index 2d3a11b963..37aae9188b 100644
--- a/specification/_types/mapping/TypeMapping.ts
+++ b/specification/_types/mapping/TypeMapping.ts
@@ -48,6 +48,7 @@ export class TypeMapping {
   _source?: SourceField
   runtime?: Dictionary<string, RuntimeField>
   enabled?: boolean
+  subobjects?: boolean
   /**
    * @availability stack since=7.16.0
    * @availability serverless
diff --git a/specification/_types/mapping/complex.ts b/specification/_types/mapping/complex.ts
index a51d5783ef..99058d4dc9 100644
--- a/specification/_types/mapping/complex.ts
+++ b/specification/_types/mapping/complex.ts
@@ -45,6 +45,7 @@ export class NestedProperty extends CorePropertyBase {
 
 export class ObjectProperty extends CorePropertyBase {
   enabled?: boolean
+  subobjects?: boolean
   type?: 'object'
 }