Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Upgrade Assistant] Fix getFlatSettings() request #89616

Merged
merged 6 commits into from
Feb 1, 2021
Merged

[Upgrade Assistant] Fix getFlatSettings() request #89616

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
24d46c5
fix getFlatSettings() request
alisonelizabeth Jan 28, 2021
bc3f179
Merge branch 'master' into ua/es_client_fix
kibanamachine Jan 28, 2021
27e0f6d
Merge branch 'master' into ua/es_client_fix
kibanamachine Feb 1, 2021
81695cd
Merge branch 'master' of github.com:elastic/kibana into ua/es_client_fix
alisonelizabeth Feb 1, 2021
e5c18fc
update reindexing test
alisonelizabeth Feb 1, 2021
8ef4bb5
Merge branch 'master' into ua/es_client_fix
kibanamachine Feb 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,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' },
Expand All @@ -306,7 +306,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();
});
});
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -829,7 +829,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 })
);

Expand All @@ -844,7 +844,7 @@ describe('reindexService', () => {
});

it('fails if create index fails', async () => {
clusterClient.asCurrentUser.indices.getSettings.mockResolvedValueOnce(
clusterClient.asCurrentUser.indices.get.mockResolvedValueOnce(
asApiResponse({ myIndex: settingsMappings })
);

Expand Down