Re-use updated_at instead of creating createdAt

elastic · Jan 20, 2020 · f0a0385 · f0a0385
1 parent f853354
commit f0a0385
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 15 deletions.
diff --git a/x-pack/legacy/plugins/actions/mappings.json b/x-pack/legacy/plugins/actions/mappings.json
@@ -27,9 +27,6 @@
  },
  "apiKey": {
  "type": "binary"
- },
- "createdAt": {
- "type": "date"
  }
  }
  }

diff --git a/x-pack/legacy/plugins/actions/server/create_execute_function.test.ts b/x-pack/legacy/plugins/actions/server/create_execute_function.test.ts
@@ -4,21 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import sinon from 'sinon';
 import { taskManagerMock } from '../../../../plugins/task_manager/server/task_manager.mock';
 import { createExecuteFunction } from './create_execute_function';
 import { savedObjectsClientMock } from '../../../../../src/core/server/mocks';
 
-let fakeTimer: sinon.SinonFakeTimers;
 const mockTaskManager = taskManagerMock.start();
 const savedObjectsClient = savedObjectsClientMock.create();
 const getBasePath = jest.fn();
 
-beforeAll(() => {
- fakeTimer = sinon.useFakeTimers();
-});
-afterAll(() => fakeTimer.restore());
-
 beforeEach(() => jest.resetAllMocks());
 
 describe('execute()', () => {
@@ -69,7 +62,6 @@ describe('execute()', () => {
  actionId: '123',
  params: { baz: false },
  apiKey: Buffer.from('123:abc').toString('base64'),
- createdAt: '1970-01-01T00:00:00.000Z',
  });
  });
 

diff --git a/x-pack/legacy/plugins/actions/server/create_execute_function.ts b/x-pack/legacy/plugins/actions/server/create_execute_function.ts
@@ -56,7 +56,6 @@ export function createExecuteFunction({
  actionId: id,
  params,
  apiKey,
- createdAt: new Date().toISOString(),
  });
 
  await taskManager.schedule({

diff --git a/x-pack/legacy/plugins/actions/server/plugin.ts b/x-pack/legacy/plugins/actions/server/plugin.ts
@@ -86,7 +86,6 @@ export class Plugin {
  plugins.encryptedSavedObjects.registerType({
  type: 'action_task_params',
  attributesToEncrypt: new Set(['apiKey']),
- attributesToExcludeFromAAD: new Set(['createdAt']),
  });
 
  const actionExecutor = new ActionExecutor();
@@ -159,6 +158,7 @@ export class Plugin {
  actionTypeRegistry: actionTypeRegistry!,
  });
  taskRunnerFactory!.initialize({
+ logger,
  encryptedSavedObjectsPlugin: plugins.encryptedSavedObjects,
  getBasePath,
  spaceIdToNamespace,

diff --git a/x-pack/legacy/plugins/actions/server/types.ts b/x-pack/legacy/plugins/actions/server/types.ts
@@ -93,5 +93,4 @@ export interface ActionTaskParams extends SavedObjectAttributes {
  actionId: string;
  params: Record<string, any>;
  apiKey?: string;
- createdAt: string;
 }
diff --git a/x-pack/test/alerting_api_integration/common/lib/task_manager_utils.ts b/x-pack/test/alerting_api_integration/common/lib/task_manager_utils.ts
@@ -59,7 +59,7 @@ export class TaskManagerUtils {
  },
  {
  range: {
- 'action_task_params.createdAt': {
+ updated_at: {
  gte: createdAtFilter,
  },
  },