Skip to content

[9.1] [Upgrade Assistant] Fix privileges for reindexing indices (#237055) #237326

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 1 commit into from
Closed

[9.1] [Upgrade Assistant] Fix privileges for reindexing indices (#237055) #237326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 @@ -136,10 +136,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 @@ -522,10 +522,6 @@ export const reindexServiceFactory = (
allow_restricted_indices: true,
privileges: ['all'],
},
{
names: ['.tasks'],
privileges: ['read'],
},
],
});

Expand Down
13 changes: 6 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 @@ -26,6 +26,7 @@ export function registerBatchReindexIndicesRoutes(
licensing,
log,
getSecurityPlugin,
getSavedObjectsService,
lib: { handleEsError },
}: RouteDependencies,
getWorker: () => ReindexWorker
Expand All @@ -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);
Expand Down
18 changes: 9 additions & 9 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 @@ -24,6 +24,7 @@ export function registerReindexIndicesRoutes(
licensing,
log,
getSecurityPlugin,
getSavedObjectsService,
lib: { handleEsError },
}: RouteDependencies,
getWorker: () => ReindexWorker
Expand All @@ -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,
Expand Down Expand Up @@ -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 {
Expand Down