diff --git a/x-pack/plugins/actions/server/saved_objects/action_task_params_migrations.test.ts b/x-pack/plugins/actions/server/saved_objects/action_task_params_migrations.test.ts index ceea9f3cff18f..1528f73b03025 100644 --- a/x-pack/plugins/actions/server/saved_objects/action_task_params_migrations.test.ts +++ b/x-pack/plugins/actions/server/saved_objects/action_task_params_migrations.test.ts @@ -356,6 +356,14 @@ describe('successful migrations', () => { }); }); }); + + describe('8.0.0', () => { + test('no op migration for rules SO', () => { + const migration800 = getActionTaskParamsMigrations(encryptedSavedObjectsSetup, [])['8.0.0']; + const actionTaskParam = getMockData(); + expect(migration800(actionTaskParam, context)).toEqual(actionTaskParam); + }); + }); }); describe('handles errors during migrations', () => { @@ -402,7 +410,8 @@ describe('isPreconfiguredAction()', () => { function getMockData( overwrites: Record = {}, - referencesOverwrites: SavedObjectReference[] = [] + referencesOverwrites: SavedObjectReference[] = [], + namespaces: string[] = ['default'] ): SavedObjectUnsanitizedDoc { return { attributes: { @@ -412,6 +421,7 @@ function getMockData( }, references: [...referencesOverwrites], id: uuid.v4(), + namespaces, type: 'action_task_param', }; } diff --git a/x-pack/plugins/actions/server/saved_objects/action_task_params_migrations.ts b/x-pack/plugins/actions/server/saved_objects/action_task_params_migrations.ts index 3612642160443..ceb82146a03eb 100644 --- a/x-pack/plugins/actions/server/saved_objects/action_task_params_migrations.ts +++ b/x-pack/plugins/actions/server/saved_objects/action_task_params_migrations.ts @@ -48,8 +48,17 @@ export function getActionTaskParamsMigrations( pipeMigrations(getUseSavedObjectReferencesFn(preconfiguredActions)) ); + const migrationActionsTaskParams800 = createEsoMigration( + encryptedSavedObjects, + ( + doc: SavedObjectUnsanitizedDoc + ): doc is SavedObjectUnsanitizedDoc => true, + (doc) => doc // no-op + ); + return { '7.16.0': executeMigrationWithErrorHandling(migrationActionTaskParamsSixteen, '7.16.0'), + '8.0.0': executeMigrationWithErrorHandling(migrationActionsTaskParams800, '8.0.0'), }; } diff --git a/x-pack/plugins/actions/server/saved_objects/actions_migrations.test.ts b/x-pack/plugins/actions/server/saved_objects/actions_migrations.test.ts index bc0e59279abc1..7dc1426c13a4b 100644 --- a/x-pack/plugins/actions/server/saved_objects/actions_migrations.test.ts +++ b/x-pack/plugins/actions/server/saved_objects/actions_migrations.test.ts @@ -118,6 +118,14 @@ describe('successful migrations', () => { }); }); }); + + describe('8.0.0', () => { + test('no op migration for rules SO', () => { + const migration800 = getActionsMigrations(encryptedSavedObjectsSetup)['8.0.0']; + const action = getMockData({}); + expect(migration800(action, context)).toEqual(action); + }); + }); }); describe('handles errors during migrations', () => { diff --git a/x-pack/plugins/actions/server/saved_objects/actions_migrations.ts b/x-pack/plugins/actions/server/saved_objects/actions_migrations.ts index a72565e00ef7b..7857a9e1f833f 100644 --- a/x-pack/plugins/actions/server/saved_objects/actions_migrations.ts +++ b/x-pack/plugins/actions/server/saved_objects/actions_migrations.ts @@ -62,10 +62,18 @@ export function getActionsMigrations( pipeMigrations(addisMissingSecretsField) ); + const migrationActions800 = createEsoMigration( + encryptedSavedObjects, + (doc: SavedObjectUnsanitizedDoc): doc is SavedObjectUnsanitizedDoc => + true, + (doc) => doc // no-op + ); + return { '7.10.0': executeMigrationWithErrorHandling(migrationActionsTen, '7.10.0'), '7.11.0': executeMigrationWithErrorHandling(migrationActionsEleven, '7.11.0'), '7.14.0': executeMigrationWithErrorHandling(migrationActionsFourteen, '7.14.0'), + '8.0.0': executeMigrationWithErrorHandling(migrationActions800, '8.0.0'), }; } diff --git a/x-pack/plugins/actions/server/saved_objects/index.ts b/x-pack/plugins/actions/server/saved_objects/index.ts index 71ec92645b249..14b425d20af13 100644 --- a/x-pack/plugins/actions/server/saved_objects/index.ts +++ b/x-pack/plugins/actions/server/saved_objects/index.ts @@ -35,7 +35,8 @@ export function setupSavedObjects( savedObjects.registerType({ name: ACTION_SAVED_OBJECT_TYPE, hidden: true, - namespaceType: 'single', + namespaceType: 'multiple-isolated', + convertToMultiNamespaceTypeVersion: '8.0.0', mappings: mappings.action as SavedObjectsTypeMappingDefinition, migrations: getActionsMigrations(encryptedSavedObjects), management: { @@ -71,7 +72,8 @@ export function setupSavedObjects( savedObjects.registerType({ name: ACTION_TASK_PARAMS_SAVED_OBJECT_TYPE, hidden: true, - namespaceType: 'single', + namespaceType: 'multiple-isolated', + convertToMultiNamespaceTypeVersion: '8.0.0', mappings: mappings.action_task_params as SavedObjectsTypeMappingDefinition, migrations: getActionTaskParamsMigrations(encryptedSavedObjects, preconfiguredActions), excludeOnUpgrade: async ({ readonlyEsClient }) => {