Skip to content

[9.2] [Upgrade Assistant] Fix privileges for reindexing indices (#237055) #237325

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.2] [Upgrade Assistant] Fix privileges for reindexing indices (#237055) #237325

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 x-pack/platform/plugins/private/reindex_service/server/src/lib/reindex_service.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,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/reindex_service/server/src/lib/reindex_service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,10 +543,6 @@ export const reindexServiceFactory = (
allow_restricted_indices: true,
privileges: ['all'],
},
{
names: ['.tasks'],
privileges: ['read'],
},
],
});

Expand Down
10 changes: 7 additions & 3 deletions x-pack/platform/plugins/private/reindex_service/server/src/lib/reindex_service_wrapper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ import type {
import type { ReindexSavedObject } from './types';

export interface ReindexServiceScopedClientArgs {
savedObjects: SavedObjectsClientContract;
dataClient: IScopedClusterClient;
request: KibanaRequest;
}
Expand Down Expand Up @@ -74,6 +73,7 @@ export class ReindexServiceWrapper {
logger: Logger;
licensing: LicensingPluginStart;
security: SecurityPluginStart;
soClient: SavedObjectsClientContract;
version: Version;
};

Expand All @@ -91,6 +91,7 @@ export class ReindexServiceWrapper {
logger,
licensing,
security,
soClient,
version,
};

Expand All @@ -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,
Expand Down
6 changes: 0 additions & 6 deletions x-pack/platform/plugins/private/reindex_service/server/src/routes/batch_reindex_indices.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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,
});
Expand Down Expand Up @@ -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,
});
Expand Down
9 changes: 0 additions & 9 deletions x-pack/platform/plugins/private/reindex_service/server/src/routes/reindex_indices.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -53,7 +52,6 @@ export function registerReindexIndicesRoutes({ router, getReindexService }: Rout
},
async ({ core }, request, response) => {
const {
savedObjects: { getClient },
elasticsearch: { client: esClient },
} = await core;

Expand All @@ -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,
});
Expand Down Expand Up @@ -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,
});
Expand Down Expand Up @@ -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,
});
Expand Down