From bae179eb32dd659716524940a2bd7ba98159e2a2 Mon Sep 17 00:00:00 2001
From: Alison Goryachev <alison.goryachev@elastic.co>
Date: Mon, 1 Feb 2021 15:36:25 -0500
Subject: [PATCH] [Upgrade Assistant] Fix getFlatSettings() request (#89616)

---
 .../server/lib/reindexing/reindex_actions.test.ts             | 4 ++--
 .../server/lib/reindexing/reindex_actions.ts                  | 2 +-
 .../server/lib/reindexing/reindex_service.test.ts             | 4 ++--
 .../upgrade_assistant/reindexing.js                           | 2 ++
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.test.ts b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.test.ts
index 713ba3a54178a..9a6ac4030e051 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.test.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.test.ts
@@ -297,7 +297,7 @@ describe('ReindexActions', () => {
       } as RequestEvent<T>);
 
     it('returns flat settings', async () => {
-      clusterClient.asCurrentUser.indices.getSettings.mockResolvedValueOnce(
+      clusterClient.asCurrentUser.indices.get.mockResolvedValueOnce(
         asApiResponse({
           myIndex: {
             settings: { 'index.mySetting': '1' },
@@ -312,7 +312,7 @@ describe('ReindexActions', () => {
     });
 
     it('returns null if index does not exist', async () => {
-      clusterClient.asCurrentUser.indices.getSettings.mockResolvedValueOnce(asApiResponse({}));
+      clusterClient.asCurrentUser.indices.get.mockResolvedValueOnce(asApiResponse({}));
       await expect(actions.getFlatSettings('myIndex')).resolves.toBeNull();
     });
   });
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.ts b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.ts
index 611ab3c92b72b..653bf8336255b 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.ts
@@ -236,7 +236,7 @@ export const reindexActionsFactory = (
     },
 
     async getFlatSettings(indexName: string) {
-      const { body: flatSettings } = await esClient.indices.getSettings<{
+      const { body: flatSettings } = await esClient.indices.get<{
         [indexName: string]: FlatSettings;
       }>({
         index: indexName,
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.test.ts b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.test.ts
index b34f26be6e99c..29c8207a5f284 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.test.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.test.ts
@@ -832,7 +832,7 @@ describe('reindexService', () => {
       });
 
       it('fails if create index is not acknowledged', async () => {
-        clusterClient.asCurrentUser.indices.getSettings.mockResolvedValueOnce(
+        clusterClient.asCurrentUser.indices.get.mockResolvedValueOnce(
           asApiResponse({ myIndex: settingsMappings })
         );
 
@@ -847,7 +847,7 @@ describe('reindexService', () => {
       });
 
       it('fails if create index fails', async () => {
-        clusterClient.asCurrentUser.indices.getSettings.mockResolvedValueOnce(
+        clusterClient.asCurrentUser.indices.get.mockResolvedValueOnce(
           asApiResponse({ myIndex: settingsMappings })
         );
 
diff --git a/x-pack/test/upgrade_assistant_integration/upgrade_assistant/reindexing.js b/x-pack/test/upgrade_assistant_integration/upgrade_assistant/reindexing.js
index f57d2184d4b8d..c70b90b384d13 100644
--- a/x-pack/test/upgrade_assistant_integration/upgrade_assistant/reindexing.js
+++ b/x-pack/test/upgrade_assistant_integration/upgrade_assistant/reindexing.js
@@ -71,6 +71,8 @@ export default function ({ getService }) {
       expect(indexSummary[newIndexName]).to.be.an('object');
       // The original index name is aliased to the new one
       expect(indexSummary[newIndexName].aliases.dummydata).to.be.an('object');
+      // Verify mappings exist on new index
+      expect(indexSummary[newIndexName].mappings.properties).to.be.an('object');
       // The number of documents in the new index matches what we expect
       expect((await es.count({ index: lastState.newIndexName })).body.count).to.be(3);