[Saved Objects] Fix document migrator to prevent losing namespaces on…

… import (elastic#164848) (cherry picked from commit ac73d1f)
kibanamachine · Sep 27, 2023 · e16096f · e16096f
1 parent 5e0d427
commit e16096f
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 0 deletions.
diff --git a/...e-saved-objects-migration-server-internal/src/document_migrator/document_migrator.test.ts b/...e-saved-objects-migration-server-internal/src/document_migrator/document_migrator.test.ts
@@ -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(),

diff --git a/...core-saved-objects-migration-server-internal/src/document_migrator/internal_transforms.ts b/...core-saved-objects-migration-server-internal/src/document_migrator/internal_transforms.ts
@@ -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 {