From f53ea2a484bcf24422e569d698896408db820382 Mon Sep 17 00:00:00 2001 From: Matthew Kime Date: Tue, 30 Sep 2025 22:59:37 -0500 Subject: [PATCH 1/3] remove check for .tasks index access --- .../reindex_service/server/src/lib/reindex_service.test.ts | 6 +----- .../reindex_service/server/src/lib/reindex_service.ts | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/x-pack/platform/plugins/private/reindex_service/server/src/lib/reindex_service.test.ts b/x-pack/platform/plugins/private/reindex_service/server/src/lib/reindex_service.test.ts index 6bf1a1b8807b4..4e9a31b7dcbaa 100644 --- a/x-pack/platform/plugins/private/reindex_service/server/src/lib/reindex_service.test.ts +++ b/x-pack/platform/plugins/private/reindex_service/server/src/lib/reindex_service.test.ts @@ -109,11 +109,7 @@ describe('reindexService', () => { names: ['anIndex'], allow_restricted_indices: true, privileges: ['all'], - }, - { - names: ['.tasks'], - privileges: ['read'], - }, + } ], }); }); diff --git a/x-pack/platform/plugins/private/reindex_service/server/src/lib/reindex_service.ts b/x-pack/platform/plugins/private/reindex_service/server/src/lib/reindex_service.ts index 428586bd494c8..bf774cffc497d 100644 --- a/x-pack/platform/plugins/private/reindex_service/server/src/lib/reindex_service.ts +++ b/x-pack/platform/plugins/private/reindex_service/server/src/lib/reindex_service.ts @@ -542,11 +542,7 @@ export const reindexServiceFactory = ( names, allow_restricted_indices: true, privileges: ['all'], - }, - { - names: ['.tasks'], - privileges: ['read'], - }, + } ], }); From 08251b07280de1f1c6daefb0b285eb504a156207 Mon Sep 17 00:00:00 2001 From: Matthew Kime Date: Wed, 1 Oct 2025 01:27:51 -0500 Subject: [PATCH 2/3] lint fix --- .../reindex_service/server/src/lib/reindex_service.test.ts | 2 +- .../private/reindex_service/server/src/lib/reindex_service.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/x-pack/platform/plugins/private/reindex_service/server/src/lib/reindex_service.test.ts b/x-pack/platform/plugins/private/reindex_service/server/src/lib/reindex_service.test.ts index 4e9a31b7dcbaa..f17625605c348 100644 --- a/x-pack/platform/plugins/private/reindex_service/server/src/lib/reindex_service.test.ts +++ b/x-pack/platform/plugins/private/reindex_service/server/src/lib/reindex_service.test.ts @@ -109,7 +109,7 @@ describe('reindexService', () => { names: ['anIndex'], allow_restricted_indices: true, privileges: ['all'], - } + }, ], }); }); diff --git a/x-pack/platform/plugins/private/reindex_service/server/src/lib/reindex_service.ts b/x-pack/platform/plugins/private/reindex_service/server/src/lib/reindex_service.ts index bf774cffc497d..f76ff0237fdef 100644 --- a/x-pack/platform/plugins/private/reindex_service/server/src/lib/reindex_service.ts +++ b/x-pack/platform/plugins/private/reindex_service/server/src/lib/reindex_service.ts @@ -542,7 +542,7 @@ export const reindexServiceFactory = ( names, allow_restricted_indices: true, privileges: ['all'], - } + }, ], }); From 60fe7b4f0689ff2def83e28206a20caee36575b4 Mon Sep 17 00:00:00 2001 From: Matthew Kime Date: Wed, 1 Oct 2025 14:27:24 -0500 Subject: [PATCH 3/3] fix saved objects client --- .../server/src/lib/reindex_service_wrapper.ts | 10 +++++++--- .../server/src/routes/batch_reindex_indices.ts | 6 ------ .../server/src/routes/reindex_indices.ts | 9 --------- 3 files changed, 7 insertions(+), 18 deletions(-) diff --git a/x-pack/platform/plugins/private/reindex_service/server/src/lib/reindex_service_wrapper.ts b/x-pack/platform/plugins/private/reindex_service/server/src/lib/reindex_service_wrapper.ts index e8900e7deeb3a..a912c5fd8865d 100644 --- a/x-pack/platform/plugins/private/reindex_service/server/src/lib/reindex_service_wrapper.ts +++ b/x-pack/platform/plugins/private/reindex_service/server/src/lib/reindex_service_wrapper.ts @@ -34,7 +34,6 @@ import type { import type { ReindexSavedObject } from './types'; export interface ReindexServiceScopedClientArgs { - savedObjects: SavedObjectsClientContract; dataClient: IScopedClusterClient; request: KibanaRequest; } @@ -74,6 +73,7 @@ export class ReindexServiceWrapper { logger: Logger; licensing: LicensingPluginStart; security: SecurityPluginStart; + soClient: SavedObjectsClientContract; version: Version; }; @@ -91,6 +91,7 @@ export class ReindexServiceWrapper { logger, licensing, security, + soClient, version, }; @@ -116,10 +117,13 @@ export class ReindexServiceWrapper { public getScopedClient({ dataClient, request, - savedObjects, }: ReindexServiceScopedClientArgs): ReindexServiceScopedClient { const callAsCurrentUser = dataClient.asCurrentUser; - const reindexActions = reindexActionsFactory(savedObjects, callAsCurrentUser, this.deps.logger); + const reindexActions = reindexActionsFactory( + this.deps.soClient, + callAsCurrentUser, + this.deps.logger + ); const reindexService = reindexServiceFactory( callAsCurrentUser, reindexActions, diff --git a/x-pack/platform/plugins/private/reindex_service/server/src/routes/batch_reindex_indices.ts b/x-pack/platform/plugins/private/reindex_service/server/src/routes/batch_reindex_indices.ts index f532589d94cfd..18b63663db7b4 100644 --- a/x-pack/platform/plugins/private/reindex_service/server/src/routes/batch_reindex_indices.ts +++ b/x-pack/platform/plugins/private/reindex_service/server/src/routes/batch_reindex_indices.ts @@ -8,7 +8,6 @@ import { schema } from '@kbn/config-schema'; import { errors } from '@elastic/elasticsearch'; import { handleEsError } from '@kbn/es-ui-shared-plugin/server'; -import { REINDEX_OP_TYPE } from '@kbn/upgrade-assistant-pkg-server'; import { REINDEX_SERVICE_BASE_PATH } from '../../../common'; import type { RouteDependencies } from '../../types'; import { mapAnyErrorToKibanaHttpResponse } from './map_any_error_to_kibana_http_response'; @@ -33,13 +32,10 @@ export function registerBatchReindexIndicesRoutes({ async ({ core }, request, response) => { const { elasticsearch: { client: esClient }, - savedObjects, } = await core; - const { getClient } = savedObjects; try { const reindexService = (await getReindexService()).getScopedClient({ - savedObjects: getClient({ includedHiddenTypes: [REINDEX_OP_TYPE] }), dataClient: esClient, request, }); @@ -74,13 +70,11 @@ export function registerBatchReindexIndicesRoutes({ }, async ({ core }, request, response) => { const { - savedObjects: { getClient }, elasticsearch: { client: esClient }, } = await core; const { indices } = request.body; const reindexService = (await getReindexService()).getScopedClient({ - savedObjects: getClient({ includedHiddenTypes: [REINDEX_OP_TYPE] }), dataClient: esClient, request, }); diff --git a/x-pack/platform/plugins/private/reindex_service/server/src/routes/reindex_indices.ts b/x-pack/platform/plugins/private/reindex_service/server/src/routes/reindex_indices.ts index 29c3871206ae5..b99f34180c53b 100644 --- a/x-pack/platform/plugins/private/reindex_service/server/src/routes/reindex_indices.ts +++ b/x-pack/platform/plugins/private/reindex_service/server/src/routes/reindex_indices.ts @@ -8,7 +8,6 @@ import { schema } from '@kbn/config-schema'; import { errors } from '@elastic/elasticsearch'; import { handleEsError } from '@kbn/es-ui-shared-plugin/server'; -import { REINDEX_OP_TYPE } from '@kbn/upgrade-assistant-pkg-server'; import { REINDEX_SERVICE_BASE_PATH } from '../../../common'; import type { RouteDependencies } from '../../types'; import { mapAnyErrorToKibanaHttpResponse } from './map_any_error_to_kibana_http_response'; @@ -53,7 +52,6 @@ export function registerReindexIndicesRoutes({ router, getReindexService }: Rout }, async ({ core }, request, response) => { const { - savedObjects: { getClient }, elasticsearch: { client: esClient }, } = await core; @@ -63,7 +61,6 @@ export function registerReindexIndicesRoutes({ router, getReindexService }: Rout try { const reindexService = (await getReindexService()).getScopedClient({ - savedObjects: getClient({ includedHiddenTypes: [REINDEX_OP_TYPE] }), dataClient: esClient, request, }); @@ -103,15 +100,12 @@ export function registerReindexIndicesRoutes({ router, getReindexService }: Rout }, async ({ core }, request, response) => { const { - savedObjects, elasticsearch: { client: esClient }, } = await core; - const { getClient } = savedObjects; const { indexName } = request.params; try { const reindexService = (await getReindexService()).getScopedClient({ - savedObjects: getClient({ includedHiddenTypes: [REINDEX_OP_TYPE] }), dataClient: esClient, request, }); @@ -147,15 +141,12 @@ export function registerReindexIndicesRoutes({ router, getReindexService }: Rout }, async ({ core }, request, response) => { const { - savedObjects, elasticsearch: { client: esClient }, } = await core; const { indexName } = request.params; - const { getClient } = savedObjects; try { const reindexService = (await getReindexService()).getScopedClient({ - savedObjects: getClient({ includedHiddenTypes: [REINDEX_OP_TYPE] }), dataClient: esClient, request, });