Skip to content
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

[Task Manager] Force validation on all tasks using state #164574

Merged
merged 10 commits into from
Sep 26, 2023
Merged

[Task Manager] Force validation on all tasks using state #164574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ad67fcb
Initial commit
mikecote Aug 23, 2023
ebfde29
Merge branch 'main' into task-manager/force-task-state-validation
kibanamachine Aug 29, 2023
2689ee6
Merge branch 'main' of github.com:elastic/kibana into task-manager/fo…
mikecote Sep 11, 2023
8c7e6ce
Fix failing tests
mikecote Sep 11, 2023
69eaab5
Merge branch 'main' into task-manager/force-task-state-validation
kibanamachine Sep 12, 2023
193420f
Merge branch 'main' of github.com:elastic/kibana into task-manager/fo…
mikecote Sep 22, 2023
93244f1
Merge branch 'task-manager/force-task-state-validation' of github.com…
mikecote Sep 22, 2023
b0a65b3
Update comment
mikecote Sep 22, 2023
28e4c1a
Merge branch 'main' into task-manager/force-task-state-validation
kibanamachine Sep 25, 2023
ab55ff0
Merge branch 'main' into task-manager/force-task-state-validation
kibanamachine Sep 25, 2023
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
8 changes: 2 additions & 6 deletions x-pack/plugins/task_manager/server/task_validator.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,7 @@ describe('TaskValidator', () => {
expect(result).toEqual(task);
});

// TODO: Remove skip once all task types have defined their state schema.
// https://github.com/elastic/kibana/issues/159347
it.skip(`should fail to validate the state schema when the task type doesn't have stateSchemaByVersion defined`, () => {
it(`should fail to validate the state schema when the task type doesn't have stateSchemaByVersion defined`, () => {
const definitions = new TaskTypeDictionary(mockLogger());
definitions.registerTaskDefinitions({
foo: fooTaskDefinition,
Expand Down Expand Up @@ -322,9 +320,7 @@ describe('TaskValidator', () => {
expect(result).toEqual(task);
});

// TODO: Remove skip once all task types have defined their state schema.
// https://github.com/elastic/kibana/issues/159347
it.skip(`should fail to validate the state schema when the task type doesn't have stateSchemaByVersion defined`, () => {
it(`should fail to validate the state schema when the task type doesn't have stateSchemaByVersion defined`, () => {
const definitions = new TaskTypeDictionary(mockLogger());
definitions.registerTaskDefinitions({
foo: fooTaskDefinition,
Expand Down
17 changes: 7 additions & 10 deletions x-pack/plugins/task_manager/server/task_validator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

import { max, memoize } from 'lodash';
import { max, memoize, isEmpty } from 'lodash';
import type { Logger } from '@kbn/core/server';
import type { ObjectType } from '@kbn/config-schema';
import { TaskTypeDictionary } from './task_type_dictionary';
Expand Down Expand Up @@ -64,14 +64,13 @@ export class TaskValidator {
const taskTypeDef = this.definitions.get(task.taskType);
const latestStateSchema = this.cachedGetLatestStateSchema(taskTypeDef);

// TODO: Remove once all task types have defined their state schema.
// https://github.com/elastic/kibana/issues/159347
// Otherwise, failures on read / write would occur. (don't forget to unskip test)
if (!latestStateSchema) {
let state = task.state;

// Skip validating tasks that don't use state
if (!latestStateSchema && isEmpty(state)) {
return task;
}

let state = task.state;
try {
state = this.getValidatedStateSchema(
this.migrateTaskState(task.state, task.stateVersion, taskTypeDef, latestStateSchema),
Expand Down Expand Up @@ -111,10 +110,8 @@ export class TaskValidator {
const taskTypeDef = this.definitions.get(task.taskType);
const latestStateSchema = this.cachedGetLatestStateSchema(taskTypeDef);

// TODO: Remove once all task types have defined their state schema.
// https://github.com/elastic/kibana/issues/159347
// Otherwise, failures on read / write would occur. (don't forget to unskip test)
if (!latestStateSchema) {
// Skip validating tasks that don't use state
if (!latestStateSchema && isEmpty(task.state)) {
return task;
}

Expand Down
Loading