diff --git a/x-pack/platform/plugins/private/upgrade_assistant/server/lib/reindexing/reindex_service.test.ts b/x-pack/platform/plugins/private/upgrade_assistant/server/lib/reindexing/reindex_service.test.ts index 10ee1bc81ac1e..c64900c4ab5e9 100644 --- a/x-pack/platform/plugins/private/upgrade_assistant/server/lib/reindexing/reindex_service.test.ts +++ b/x-pack/platform/plugins/private/upgrade_assistant/server/lib/reindexing/reindex_service.test.ts @@ -136,10 +136,6 @@ describe('reindexService', () => { allow_restricted_indices: true, privileges: ['all'], }, - { - names: ['.tasks'], - privileges: ['read'], - }, ], }); }); diff --git a/x-pack/platform/plugins/private/upgrade_assistant/server/lib/reindexing/reindex_service.ts b/x-pack/platform/plugins/private/upgrade_assistant/server/lib/reindexing/reindex_service.ts index 8545ba12216fd..f1ba6493e9550 100644 --- a/x-pack/platform/plugins/private/upgrade_assistant/server/lib/reindexing/reindex_service.ts +++ b/x-pack/platform/plugins/private/upgrade_assistant/server/lib/reindexing/reindex_service.ts @@ -522,10 +522,6 @@ export const reindexServiceFactory = ( allow_restricted_indices: true, privileges: ['all'], }, - { - names: ['.tasks'], - privileges: ['read'], - }, ], }); diff --git a/x-pack/platform/plugins/private/upgrade_assistant/server/routes/reindex_indices/batch_reindex_indices.ts b/x-pack/platform/plugins/private/upgrade_assistant/server/routes/reindex_indices/batch_reindex_indices.ts index c43d417d73e97..0e9bec9821ff8 100644 --- a/x-pack/platform/plugins/private/upgrade_assistant/server/routes/reindex_indices/batch_reindex_indices.ts +++ b/x-pack/platform/plugins/private/upgrade_assistant/server/routes/reindex_indices/batch_reindex_indices.ts @@ -26,6 +26,7 @@ export function registerBatchReindexIndicesRoutes( licensing, log, getSecurityPlugin, + getSavedObjectsService, lib: { handleEsError }, }: RouteDependencies, getWorker: () => ReindexWorker @@ -47,15 +48,13 @@ export function registerBatchReindexIndicesRoutes( versionCheckHandlerWrapper(async ({ core }, request, response) => { const { elasticsearch: { client: esClient }, - savedObjects, } = await core; - const { getClient } = savedObjects; + + const soClient = getSavedObjectsService().getUnsafeInternalClient({ + includedHiddenTypes: [REINDEX_OP_TYPE], + }); const callAsCurrentUser = esClient.asCurrentUser; - const reindexActions = reindexActionsFactory( - getClient({ includedHiddenTypes: [REINDEX_OP_TYPE] }), - callAsCurrentUser, - log - ); + const reindexActions = reindexActionsFactory(soClient, callAsCurrentUser, log); try { const inProgressOps = await reindexActions.findAllByStatus(ReindexStatus.inProgress); const { queue } = sortAndOrderReindexOperations(inProgressOps); diff --git a/x-pack/platform/plugins/private/upgrade_assistant/server/routes/reindex_indices/reindex_indices.ts b/x-pack/platform/plugins/private/upgrade_assistant/server/routes/reindex_indices/reindex_indices.ts index bb6c0e47a599e..04cb17096512c 100644 --- a/x-pack/platform/plugins/private/upgrade_assistant/server/routes/reindex_indices/reindex_indices.ts +++ b/x-pack/platform/plugins/private/upgrade_assistant/server/routes/reindex_indices/reindex_indices.ts @@ -24,6 +24,7 @@ export function registerReindexIndicesRoutes( licensing, log, getSecurityPlugin, + getSavedObjectsService, lib: { handleEsError }, }: RouteDependencies, getWorker: () => ReindexWorker @@ -48,13 +49,15 @@ export function registerReindexIndicesRoutes( }, versionCheckHandlerWrapper(async ({ core }, request, response) => { const { - savedObjects: { getClient }, elasticsearch: { client: esClient }, } = await core; const { indexName } = request.params; + const soClient = getSavedObjectsService().getUnsafeInternalClient({ + includedHiddenTypes: [REINDEX_OP_TYPE], + }); try { const result = await reindexHandler({ - savedObjects: getClient({ includedHiddenTypes: [REINDEX_OP_TYPE] }), + savedObjects: soClient, dataClient: esClient, indexName, log, @@ -97,17 +100,14 @@ export function registerReindexIndicesRoutes( }, versionCheckHandlerWrapper(async ({ core }, request, response) => { const { - savedObjects, elasticsearch: { client: esClient }, } = await core; - const { getClient } = savedObjects; const { indexName } = request.params; const asCurrentUser = esClient.asCurrentUser; - const reindexActions = reindexActionsFactory( - getClient({ includedHiddenTypes: [REINDEX_OP_TYPE] }), - asCurrentUser, - log - ); + const soClient = getSavedObjectsService().getUnsafeInternalClient({ + includedHiddenTypes: [REINDEX_OP_TYPE], + }); + const reindexActions = reindexActionsFactory(soClient, asCurrentUser, log); const reindexService = reindexServiceFactory(asCurrentUser, reindexActions, log, licensing); try {