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

Parameterize migration test for kibana version #105417

Merged
merged 4 commits into from
Jul 19, 2021
Merged

Parameterize migration test for kibana version #105417

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ab40050
Parameterize migration test for kibana version
joshdover Jul 13, 2021
d8e04e7
Merge remote-tracking branch 'upstream/master' into migrations/parame…
joshdover Jul 16, 2021
70d2c44
PR comments
joshdover Jul 16, 2021
3e000a8
Merge remote-tracking branch 'upstream/master' into migrations/parame…
joshdover Jul 19, 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
26 changes: 16 additions & 10 deletions ...erver/saved_objects/migrationsv2/integration_tests/migration_7_13_0_unknown_types.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@ import * as kbnTestServer from '../../../../test_helpers/kbn_server';
import { Root } from '../../../root';
import JSON5 from 'json5';
import { ElasticsearchClient } from '../../../elasticsearch';
import { Env } from '@kbn/config';
import { REPO_ROOT } from '@kbn/utils';
import { getEnvOptions } from '@kbn/config/target/mocks';

const kibanaVersion = Env.createDefault(REPO_ROOT, getEnvOptions()).packageInfo.version;
const logFilePath = Path.join(__dirname, '7_13_unknown_types_test.log');

async function removeLogFile() {
Expand Down Expand Up @@ -76,7 +80,7 @@ describe('migration v2', () => {
unknownDocsWarningLog.message.startsWith(
'[.kibana] CHECK_UNKNOWN_DOCUMENTS Upgrades will fail for 8.0+ because documents were found for unknown saved ' +
'object types. To ensure that upgrades will succeed in the future, either re-enable plugins or delete ' +
'these documents from the ".kibana_8.0.0_001" index after the current upgrade completes.'
`these documents from the ".kibana_${kibanaVersion}_001" index after the current upgrade completes.`
)
).toBeTruthy();

Expand All @@ -100,14 +104,16 @@ describe('migration v2', () => {
});

const client: ElasticsearchClient = esServer.es.getClient();
const { body: response } = await client.indices.getSettings({ index: '.kibana_8.0.0_001' });
const settings = response['.kibana_8.0.0_001']
const { body: response } = await client.indices.getSettings({
index: `.kibana_${kibanaVersion}_001`,
});
const settings = response[`.kibana_${kibanaVersion}_001`]
.settings as estypes.IndicesIndexStatePrefixedSettings;
expect(settings.index).not.toBeUndefined();
expect(settings.index!.blocks?.write).not.toEqual('true');

// Ensure that documents for unknown types were preserved in target index in an unmigrated state
const spaceDocs = await fetchDocs(client, '.kibana_8.0.0_001', 'space');
const spaceDocs = await fetchDocs(client, `.kibana_${kibanaVersion}_001`, 'space');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

optional nit: I'd move it to a const targetIndex

expect(spaceDocs.map((s) => s.id)).toEqual(
expect.arrayContaining([
'space:default',
Expand All @@ -123,7 +129,7 @@ describe('migration v2', () => {
expect(d.migrationVersion.space).toEqual('6.6.0');
expect(d.coreMigrationVersion).toEqual('7.13.0');
});
const fooDocs = await fetchDocs(client, '.kibana_8.0.0_001', 'foo');
const fooDocs = await fetchDocs(client, `.kibana_${kibanaVersion}_001`, 'foo');
expect(fooDocs.map((f) => f.id)).toEqual(
expect.arrayContaining([
'P2SQfHkBs3dBRGh--No5',
Expand Down Expand Up @@ -155,13 +161,13 @@ describe('migration v2', () => {
namespaceType: 'agnostic',
migrations: {
'6.6.0': (d) => d,
'8.0.0': (d) => d,
[kibanaVersion]: (d) => d,
},
});
await root.start();

const client: ElasticsearchClient = esServer.es.getClient();
const spacesDocsMigrated = await fetchDocs(client, '.kibana_8.0.0_001', 'space');
const spacesDocsMigrated = await fetchDocs(client, `.kibana_${kibanaVersion}_001`, 'space');
expect(spacesDocsMigrated.map((s) => s.id)).toEqual(
expect.arrayContaining([
'space:default',
Expand All @@ -174,12 +180,12 @@ describe('migration v2', () => {
])
);
spacesDocsMigrated.forEach((d) => {
expect(d.migrationVersion.space).toEqual('8.0.0'); // should be migrated
expect(d.coreMigrationVersion).toEqual('8.0.0');
expect(d.migrationVersion.space).toEqual(kibanaVersion); // should be migrated
expect(d.coreMigrationVersion).toEqual(kibanaVersion);
});

// Make sure unmigrated foo docs are also still there in an unmigrated state
const fooDocsUnmigrated = await fetchDocs(client, '.kibana_8.0.0_001', 'foo');
const fooDocsUnmigrated = await fetchDocs(client, `.kibana_${kibanaVersion}_001`, 'foo');
expect(fooDocsUnmigrated.map((f) => f.id)).toEqual(
expect.arrayContaining([
'P2SQfHkBs3dBRGh--No5',
Expand Down