github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 09:48:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

[Saved Objects] Fix document migrator to prevent losing namespaces on import (#164848)

Browse source
This commit is contained in:
Michael Dokolin 2023-09-19 11:18:45 +02:00 • committed by GitHub
parent e3af1246cf
commit ac73d1f6b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

30
packages/core/saved-objects/core-saved-objects-migration-server-internal/src/document_migrator/document_migrator.test.ts
View file

@ -713,6 +713,36 @@ describe('DocumentMigrator', () => {
]);
});
it('does not lose namespaces in documents with undefined namespace and defined namespaces property', () => {
const migrator = new DocumentMigrator({
...testOpts(),
typeRegistry: createRegistry(
{ name: 'dog', namespaceType: 'multiple', convertToMultiNamespaceTypeVersion: '1.0.0' }
// no migration transforms are defined, the typeMigrationVersion will be derived from 'convertToMultiNamespaceTypeVersion'
),
});
migrator.prepareMigrations();
const obj = {
id: 'mischievous',
type: 'dog',
attributes: { name: 'Ann' },
coreMigrationVersion: kibanaVersion,
typeMigrationVersion: '0.1.0',
namespaces: ['something'],
} as SavedObjectUnsanitizedDoc;
const actual = migrator.migrateAndConvert(obj);
expect(actual).toEqual([
{
id: 'mischievous',
type: 'dog',
attributes: { name: 'Ann' },
coreMigrationVersion: kibanaVersion,
typeMigrationVersion: '1.0.0',
namespaces: ['something'],
},
]);
});
it('does not fail when encountering documents with coreMigrationVersion higher than the latest known', () => {
const migrator = new DocumentMigrator({
...testOpts(),

7
packages/core/saved-objects/core-saved-objects-migration-server-internal/src/document_migrator/internal_transforms.ts
View file

@ -105,6 +105,13 @@ function convertNamespaceType(doc: SavedObjectUnsanitizedDoc) {
const { namespace, ...otherAttrs } = doc;
const additionalDocs: SavedObjectUnsanitizedDoc[] = [];
if (namespace == null && otherAttrs.namespaces) {
return {
additionalDocs,
transformedDoc: otherAttrs,
};
}
// If this object exists in the default namespace, return it with the appropriate `namespaces` field without changing its ID.
if (namespace === undefined) {
return {