Skip to content

[9.0] [Upgrade Assistant] Fix privileges for reindexing indices (#237055) #237334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mattkime wants to merge 4 commits into from
Closed

[9.0] [Upgrade Assistant] Fix privileges for reindexing indices (#237055) #237334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9f812df
[Upgrade Assistant] Fix privileges for reindexing indices (#237055)
mattkime Oct 2, 2025
131805c
[CI] Auto-commit changed files from 'node scripts/eslint_all_files --…
kibanamachine Oct 2, 2025
c72f6b3
fix so service access
mattkime Oct 2, 2025
1dcb3c7
fix so service access
mattkime Oct 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .../platform/plugins/private/upgrade_assistant/server/lib/reindexing/reindex_service.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,6 @@ describe('reindexService', () => {
allow_restricted_indices: true,
privileges: ['all'],
},
{
names: ['.tasks'],
privileges: ['read'],
},
],
},
});
Expand Down
4 changes: 0 additions & 4 deletions x-pack/platform/plugins/private/upgrade_assistant/server/lib/reindexing/reindex_service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,10 +457,6 @@ export const reindexServiceFactory = (
allow_restricted_indices: true,
privileges: ['all'],
},
{
names: ['.tasks'],
privileges: ['read'],
},
],
},
});
Expand Down
20 changes: 13 additions & 7 deletions .../plugins/private/upgrade_assistant/server/routes/reindex_indices/batch_reindex_indices.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import { schema } from '@kbn/config-schema';
import { errors } from '@elastic/elasticsearch';
import { SavedObjectsClient } from '@kbn/core/server';

import { API_BASE_PATH } from '../../../common/constants';
import { REINDEX_OP_TYPE, ReindexStatus } from '../../../common/types';
Expand All @@ -26,6 +27,7 @@ export function registerBatchReindexIndicesRoutes(
licensing,
log,
getSecurityPlugin,
getSavedObjectsService,
lib: { handleEsError },
}: RouteDependencies,
getWorker: () => ReindexWorker
Expand All @@ -47,14 +49,14 @@ export function registerBatchReindexIndicesRoutes(
versionCheckHandlerWrapper(async ({ core }, request, response) => {
const {
elasticsearch: { client: esClient },
savedObjects,
} = await core;
const { getClient } = savedObjects;
const callAsCurrentUser = esClient.asCurrentUser;
const reindexActions = reindexActionsFactory(
getClient({ includedHiddenTypes: [REINDEX_OP_TYPE] }),
callAsCurrentUser

const soClient = new SavedObjectsClient(
getSavedObjectsService().createInternalRepository([REINDEX_OP_TYPE])
);

const reindexActions = reindexActionsFactory(soClient, callAsCurrentUser);
try {
const inProgressOps = await reindexActions.findAllByStatus(ReindexStatus.inProgress);
const { queue } = sortAndOrderReindexOperations(inProgressOps);
Expand Down Expand Up @@ -91,18 +93,22 @@ export function registerBatchReindexIndicesRoutes(
},
versionCheckHandlerWrapper(async ({ core }, request, response) => {
const {
savedObjects: { getClient },
elasticsearch: { client: esClient },
} = await core;
const { indexNames } = request.body;

const soClient = new SavedObjectsClient(
getSavedObjectsService().createInternalRepository([REINDEX_OP_TYPE])
);

const results: PostBatchResponse = {
enqueued: [],
errors: [],
};
for (const indexName of indexNames) {
try {
const result = await reindexHandler({
savedObjects: getClient({ includedHiddenTypes: [REINDEX_OP_TYPE] }),
savedObjects: soClient,
dataClient: esClient,
indexName,
log,
Expand Down
20 changes: 13 additions & 7 deletions ...atform/plugins/private/upgrade_assistant/server/routes/reindex_indices/reindex_indices.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import { schema } from '@kbn/config-schema';
import { errors } from '@elastic/elasticsearch';
import { SavedObjectsClient } from '@kbn/core/server';

import { API_BASE_PATH } from '../../../common/constants';
import { ReindexStatusResponse, REINDEX_OP_TYPE } from '../../../common/types';
Expand All @@ -24,6 +25,7 @@ export function registerReindexIndicesRoutes(
licensing,
log,
getSecurityPlugin,
getSavedObjectsService,
lib: { handleEsError },
}: RouteDependencies,
getWorker: () => ReindexWorker
Expand All @@ -48,13 +50,17 @@ export function registerReindexIndicesRoutes(
},
versionCheckHandlerWrapper(async ({ core }, request, response) => {
const {
savedObjects: { getClient },
elasticsearch: { client: esClient },
} = await core;
const { indexName } = request.params;

const soClient = new SavedObjectsClient(
getSavedObjectsService().createInternalRepository([REINDEX_OP_TYPE])
);

try {
const result = await reindexHandler({
savedObjects: getClient({ includedHiddenTypes: [REINDEX_OP_TYPE] }),
savedObjects: soClient,
dataClient: esClient,
indexName,
log,
Expand Down Expand Up @@ -91,16 +97,16 @@ 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

const soClient = new SavedObjectsClient(
getSavedObjectsService().createInternalRepository([REINDEX_OP_TYPE])
);

const reindexActions = reindexActionsFactory(soClient, asCurrentUser);
const reindexService = reindexServiceFactory(asCurrentUser, reindexActions, log, licensing);

try {
Expand Down