Fixes

elastic · Apr 19, 2021 · 8fda03e · 8fda03e
1 parent 06fdfb5
commit 8fda03e
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 12 deletions.
diff --git a/x-pack/plugins/actions/server/cleanup_failed_executions/cleanup_tasks.ts b/x-pack/plugins/actions/server/cleanup_failed_executions/cleanup_tasks.ts
@@ -13,7 +13,8 @@ import {
 } from 'kibana/server';
 import { TaskInstance } from '../../../task_manager/server';
 import { SpacesPluginStart } from '../../../spaces/server';
-import { bulkDelete, extractBulkResponseDeleteFailures, spaceIdToNamespace } from './lib';
+import { bulkDelete, extractBulkResponseDeleteFailures } from './lib';
+import { spaceIdToNamespace } from '../lib';
 
 export interface CleanupTasksOpts {
   logger: Logger;

diff --git a/x-pack/plugins/actions/server/cleanup_failed_executions/lib/index.ts b/x-pack/plugins/actions/server/cleanup_failed_executions/lib/index.ts
@@ -6,5 +6,4 @@
  */
 
 export { extractBulkResponseDeleteFailures } from './extract_bulk_response_delete_failures';
-export { spaceIdToNamespace } from './space_id_to_namespace';
 export { bulkDelete } from './bulk_delete';
diff --git a/x-pack/plugins/actions/server/config.ts b/x-pack/plugins/actions/server/config.ts
@@ -52,7 +52,7 @@ export const configSchema = schema.object({
   responseTimeout: schema.duration({ defaultValue: '60s' }),
   cleanupFailedExecutionsTask: schema.object({
     enabled: schema.boolean({ defaultValue: true }),
-    interval: schema.duration({ defaultValue: '15s' }),
+    interval: schema.duration({ defaultValue: '5m' }),
     pageSize: schema.number({ defaultValue: 100 }),
   }),
 });

diff --git a/x-pack/plugins/actions/server/lib/index.ts b/x-pack/plugins/actions/server/lib/index.ts
@@ -12,6 +12,7 @@ export { ActionExecutor, ActionExecutorContract } from './action_executor';
 export { ILicenseState, LicenseState } from './license_state';
 export { verifyApiAccess } from './verify_api_access';
 export { getActionTypeFeatureUsageName } from './get_action_type_feature_usage_name';
+export { spaceIdToNamespace } from './space_id_to_namespace';
 export {
   ActionTypeDisabledError,
   ActionTypeDisabledReason,

diff --git a/...d_executions/lib/space_id_to_namespace.ts → ...tions/server/lib/space_id_to_namespace.ts b/...d_executions/lib/space_id_to_namespace.ts → ...tions/server/lib/space_id_to_namespace.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SpacesPluginStart } from '../../../../spaces/server';
+import { SpacesPluginStart } from '../../../spaces/server';
 
 export function spaceIdToNamespace(spaces?: SpacesPluginStart, spaceId?: string) {
   return spaces && spaceId ? spaces.spacesService.spaceIdToNamespace(spaceId) : undefined;

diff --git a/x-pack/plugins/actions/server/plugin.ts b/x-pack/plugins/actions/server/plugin.ts
@@ -35,12 +35,18 @@ import {
 } from './cleanup_failed_executions';
 
 import { ActionsConfig, getValidatedConfig } from './config';
-import { ActionExecutor, TaskRunnerFactory, LicenseState, ILicenseState } from './lib';
 import { ActionsClient } from './actions_client';
 import { ActionTypeRegistry } from './action_type_registry';
 import { createExecutionEnqueuerFunction } from './create_execute_function';
 import { registerBuiltInActionTypes } from './builtin_action_types';
 import { registerActionsUsageCollector } from './usage';
+import {
+  ActionExecutor,
+  TaskRunnerFactory,
+  LicenseState,
+  ILicenseState,
+  spaceIdToNamespace,
+} from './lib';
 import {
   Services,
   ActionType,
@@ -368,18 +374,12 @@ export class ActionsPlugin implements Plugin<PluginSetupContract, PluginStartCon
       preconfiguredActions,
     });
 
-    const spaceIdToNamespace = (spaceId?: string) => {
-      return plugins.spaces && spaceId
-        ? plugins.spaces.spacesService.spaceIdToNamespace(spaceId)
-        : undefined;
-    };
-
     taskRunnerFactory!.initialize({
       logger,
       actionTypeRegistry: actionTypeRegistry!,
       encryptedSavedObjectsClient,
       basePathService: core.http.basePath,
-      spaceIdToNamespace,
+      spaceIdToNamespace: (spaceId?: string) => spaceIdToNamespace(plugins.spaces, spaceId),
       getUnsecuredSavedObjectsClient: (request: KibanaRequest) =>
         this.getUnsecuredSavedObjectsClient(core.savedObjects, request),
     });