From 90dede6d6a81a87d3f26575efa14fa4557387a4e Mon Sep 17 00:00:00 2001
From: Tyler Smalley <tyler.smalley@elastic.co>
Date: Mon, 14 Jan 2019 19:37:25 -0800
Subject: [PATCH] [migrations] Fetch additional mappings with types

Follow-up to https://github.com/elastic/kibana/pull/28497

Since https://github.com/elastic/elasticsearch/pull/37285 has been merged, it's
aparent there are a couple more places we need to specify include_type_name
as a stop-gap until https://github.com/elastic/kibana/issues/23650 is completed

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
---
 .../saved_objects/migrations/core/call_cluster.ts   |  2 ++
 .../saved_objects/migrations/core/elastic_index.ts  | 13 +++++++++++--
 .../service/create_saved_objects_service.js         |  1 +
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/server/saved_objects/migrations/core/call_cluster.ts b/src/server/saved_objects/migrations/core/call_cluster.ts
index 109379f587405..0b388229834bf 100644
--- a/src/server/saved_objects/migrations/core/call_cluster.ts
+++ b/src/server/saved_objects/migrations/core/call_cluster.ts
@@ -67,6 +67,7 @@ export interface PutMappingOpts {
   body: DocMapping;
   index: string;
   type: string;
+  include_type_name?: boolean;
 }
 
 export interface PutTemplateOpts {
@@ -87,6 +88,7 @@ export interface IndexOpts {
 
 export interface IndexCreationOpts {
   index: string;
+  include_type_name?: boolean;
   body?: {
     mappings?: IndexMapping;
     settings?: {
diff --git a/src/server/saved_objects/migrations/core/elastic_index.ts b/src/server/saved_objects/migrations/core/elastic_index.ts
index 9c65981e22809..ba6dafec3e5d9 100644
--- a/src/server/saved_objects/migrations/core/elastic_index.ts
+++ b/src/server/saved_objects/migrations/core/elastic_index.ts
@@ -222,7 +222,12 @@ export async function migrationsUpToDate(
  * @param {IndexMapping} mappings
  */
 export function putMappings(callCluster: CallCluster, index: string, mappings: IndexMapping) {
-  return callCluster('indices.putMapping', { body: mappings.doc, index, type: ROOT_TYPE });
+  return callCluster('indices.putMapping', {
+    body: mappings.doc,
+    index,
+    type: ROOT_TYPE,
+    include_type_name: true,
+  });
 }
 
 export async function createIndex(
@@ -230,7 +235,11 @@ export async function createIndex(
   index: string,
   mappings?: IndexMapping
 ) {
-  await callCluster('indices.create', { body: { mappings, settings }, index });
+  await callCluster('indices.create', {
+    body: { mappings, settings },
+    index,
+    include_type_name: true,
+  });
 }
 
 export async function deleteIndex(callCluster: CallCluster, index: string) {
diff --git a/src/server/saved_objects/service/create_saved_objects_service.js b/src/server/saved_objects/service/create_saved_objects_service.js
index c57d45effa8d7..7432c92d52f44 100644
--- a/src/server/saved_objects/service/create_saved_objects_service.js
+++ b/src/server/saved_objects/service/create_saved_objects_service.js
@@ -38,6 +38,7 @@ export function createSavedObjectsService(server, schema, serializer, migrator)
       const index = server.config().get('kibana.index');
       await adminCluster.callWithInternalUser('indices.putTemplate', {
         name: `kibana_index_template:${index}`,
+        include_type_name: true,
         body: {
           template: index,
           settings: {