maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[Upgrade Assistant] Fix getFlatSettings() request (#89616)

Browse source
This commit is contained in:
Alison Goryachev 2021-02-01 15:36:25 -05:00 committed by GitHub
parent 7b06c13087
commit bae179eb32
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.test.ts
View file

@ -297,7 +297,7 @@ describe('ReindexActions', () => {
} as RequestEvent<T>); } as RequestEvent<T>);
it('returns flat settings', async () => { it('returns flat settings', async () => {
clusterClient.asCurrentUser.indices.getSettings.mockResolvedValueOnce( clusterClient.asCurrentUser.indices.get.mockResolvedValueOnce(
asApiResponse({ asApiResponse({
myIndex: { myIndex: {
settings: { 'index.mySetting': '1' }, settings: { 'index.mySetting': '1' },
@ -312,7 +312,7 @@ describe('ReindexActions', () => {
}); });
it('returns null if index does not exist', async () => { 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(); await expect(actions.getFlatSettings('myIndex')).resolves.toBeNull();
}); });
}); });

2
x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.ts
View file

@ -236,7 +236,7 @@ export const reindexActionsFactory = (
}, },
async getFlatSettings(indexName: string) { async getFlatSettings(indexName: string) {
const { body: flatSettings } = await esClient.indices.getSettings<{ const { body: flatSettings } = await esClient.indices.get<{
[indexName: string]: FlatSettings; [indexName: string]: FlatSettings;
}>({ }>({
index: indexName, index: indexName,

4
x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.test.ts
View file

@ -832,7 +832,7 @@ describe('reindexService', () => {
}); });
it('fails if create index is not acknowledged', async () => { it('fails if create index is not acknowledged', async () => {
clusterClient.asCurrentUser.indices.getSettings.mockResolvedValueOnce( clusterClient.asCurrentUser.indices.get.mockResolvedValueOnce(
asApiResponse({ myIndex: settingsMappings }) asApiResponse({ myIndex: settingsMappings })
); );
@ -847,7 +847,7 @@ describe('reindexService', () => {
}); });
it('fails if create index fails', async () => { it('fails if create index fails', async () => {
clusterClient.asCurrentUser.indices.getSettings.mockResolvedValueOnce( clusterClient.asCurrentUser.indices.get.mockResolvedValueOnce(
asApiResponse({ myIndex: settingsMappings }) asApiResponse({ myIndex: settingsMappings })
); );

2
x-pack/test/upgrade_assistant_integration/upgrade_assistant/reindexing.js
View file

@ -71,6 +71,8 @@ export default function ({ getService }) {
expect(indexSummary[newIndexName]).to.be.an('object'); expect(indexSummary[newIndexName]).to.be.an('object');
// The original index name is aliased to the new one // The original index name is aliased to the new one
expect(indexSummary[newIndexName].aliases.dummydata).to.be.an('object'); 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 // The number of documents in the new index matches what we expect
expect((await es.count({ index: lastState.newIndexName })).body.count).to.be(3); expect((await es.count({ index: lastState.newIndexName })).body.count).to.be(3);