Skip to content

Commit e4263e5

Browse files
committed
moved Legacy Task Manager implementation into the New Platform Plugin
1 parent 9327532 commit e4263e5

File tree

75 files changed

+278
-231
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+278
-231
lines changed

src/core/server/mocks.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ export { elasticsearchServiceMock } from './elasticsearch/elasticsearch_service.
3737
export { httpServiceMock } from './http/http_service.mock';
3838
export { loggingServiceMock } from './logging/logging_service.mock';
3939
export { savedObjectsClientMock } from './saved_objects/service/saved_objects_client.mock';
40+
export { savedObjectsRepositoryMock } from './saved_objects/service/lib/repository.mock';
4041
export { uiSettingsServiceMock } from './ui_settings/ui_settings_service.mock';
4142
import { uuidServiceMock } from './uuid/uuid_service.mock';
4243

x-pack/legacy/plugins/actions/server/action_type_registry.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { ExecutorType } from './types';
1010
import { ActionExecutor, ExecutorError, TaskRunnerFactory } from './lib';
1111
import { configUtilsMock } from './actions_config.mock';
1212

13-
const mockTaskManager = taskManagerMock.create();
13+
const mockTaskManager = taskManagerMock.setup();
1414
const actionTypeRegistryParams = {
1515
taskManager: mockTaskManager,
1616
taskRunnerFactory: new TaskRunnerFactory(new ActionExecutor()),

x-pack/legacy/plugins/actions/server/action_type_registry.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,14 @@
66

77
import Boom from 'boom';
88
import { i18n } from '@kbn/i18n';
9-
import { TaskManagerSetupContract } from './shim';
10-
import { RunContext } from '../../task_manager/server';
9+
import {
10+
RunContext,
11+
TaskManagerSetupContract,
12+
} from '../../../../plugins/kibana_task_manager/server';
1113
import { ExecutorError, TaskRunnerFactory } from './lib';
1214
import { ActionType } from './types';
1315
import { ActionsConfigurationUtilities } from './actions_config';
16+
1417
interface ConstructorOptions {
1518
taskManager: TaskManagerSetupContract;
1619
taskRunnerFactory: TaskRunnerFactory;

x-pack/legacy/plugins/actions/server/actions_client.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const defaultKibanaIndex = '.kibana';
2323
const savedObjectsClient = savedObjectsClientMock.create();
2424
const scopedClusterClient = elasticsearchServiceMock.createScopedClusterClient();
2525

26-
const mockTaskManager = taskManagerMock.create();
26+
const mockTaskManager = taskManagerMock.setup();
2727

2828
const actionTypeRegistryParams = {
2929
taskManager: mockTaskManager,

x-pack/legacy/plugins/actions/server/builtin_action_types/index.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export function createActionTypeRegistry(): {
2020
} {
2121
const logger = loggingServiceMock.create().get() as jest.Mocked<Logger>;
2222
const actionTypeRegistry = new ActionTypeRegistry({
23-
taskManager: taskManagerMock.create(),
23+
taskManager: taskManagerMock.setup(),
2424
taskRunnerFactory: new TaskRunnerFactory(new ActionExecutor()),
2525
actionsConfigUtils: configUtilsMock,
2626
});

x-pack/legacy/plugins/actions/server/create_execute_function.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66

77
import { SavedObjectsClientContract } from 'src/core/server';
8-
import { TaskManagerStartContract } from './shim';
8+
import { TaskManagerStartContract } from '../../../../plugins/kibana_task_manager/server';
99
import { GetBasePathFunction } from './types';
1010

1111
interface CreateExecuteFunctionOptions {

x-pack/legacy/plugins/actions/server/lib/task_runner_factory.test.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@
77
import sinon from 'sinon';
88
import { ExecutorError } from './executor_error';
99
import { ActionExecutor } from './action_executor';
10-
import { ConcreteTaskInstance, TaskStatus } from '../../../task_manager/server';
10+
import {
11+
ConcreteTaskInstance,
12+
TaskStatus,
13+
} from '../../../../../plugins/kibana_task_manager/server';
1114
import { TaskRunnerFactory } from './task_runner_factory';
1215
import { actionTypeRegistryMock } from '../action_type_registry.mock';
1316
import { actionExecutorMock } from './action_executor.mock';

x-pack/legacy/plugins/actions/server/lib/task_runner_factory.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
import { ActionExecutorContract } from './action_executor';
88
import { ExecutorError } from './executor_error';
9-
import { RunContext } from '../../../task_manager/server';
9+
import { RunContext } from '../../../../../plugins/kibana_task_manager/server';
1010
import { PluginStartContract as EncryptedSavedObjectsStartContract } from '../../../../../plugins/encrypted_saved_objects/server';
1111
import { ActionTaskParams, GetBasePathFunction, SpaceIdToNamespaceFunction } from '../types';
1212

x-pack/legacy/plugins/actions/server/shim.ts

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ import Hapi from 'hapi';
88
import { Legacy } from 'kibana';
99
import * as Rx from 'rxjs';
1010
import { ActionsConfigType } from './types';
11-
import { TaskManager } from '../../task_manager/server';
11+
import {
12+
TaskManagerStartContract,
13+
TaskManagerSetupContract,
14+
} from '../../../../plugins/kibana_task_manager/server';
1215
import { XPackMainPlugin } from '../../xpack_main/server/xpack_main';
1316
import KbnServer from '../../../../../src/legacy/server/kbn_server';
1417
import { LegacySpacesPlugin as SpacesPluginStartContract } from '../../spaces';
@@ -27,7 +30,7 @@ import { LicensingPluginSetup } from '../../../../plugins/licensing/server';
2730
// Extend PluginProperties to indicate which plugins are guaranteed to exist
2831
// due to being marked as dependencies
2932
interface Plugins extends Hapi.PluginProperties {
30-
task_manager: TaskManager;
33+
task_manager: TaskManagerStartContract & TaskManagerSetupContract;
3134
}
3235

3336
export interface Server extends Legacy.Server {
@@ -41,14 +44,9 @@ export interface KibanaConfig {
4144
/**
4245
* Shim what we're thinking setup and start contracts will look like
4346
*/
44-
export type TaskManagerStartContract = Pick<TaskManager, 'schedule' | 'fetch' | 'remove'>;
4547
export type XPackMainPluginSetupContract = Pick<XPackMainPlugin, 'registerFeature'>;
4648
export type SecurityPluginSetupContract = Pick<SecurityPlugin, '__legacyCompat'>;
4749
export type SecurityPluginStartContract = Pick<SecurityPlugin, 'authc'>;
48-
export type TaskManagerSetupContract = Pick<
49-
TaskManager,
50-
'addMiddleware' | 'registerTaskDefinitions'
51-
>;
5250

5351
/**
5452
* New platform interfaces

x-pack/legacy/plugins/alerting/server/alert_type_registry.test.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ import { TaskRunnerFactory } from './task_runner';
88
import { AlertTypeRegistry } from './alert_type_registry';
99
import { taskManagerMock } from '../../task_manager/server/task_manager.mock';
1010

11-
const taskManager = taskManagerMock.create();
12-
11+
const taskManager = taskManagerMock.setup();
1312
const alertTypeRegistryParams = {
1413
taskManager,
1514
taskRunnerFactory: new TaskRunnerFactory(),

0 commit comments

Comments
 (0)