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

Jump to bottom

Revert "[Task Manager] Force validation on all tasks using state (#16… #167877

Merged
merged 4 commits into from
Oct 3, 2023
Merged

Revert "[Task Manager] Force validation on all tasks using state (#16… #167877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1df0ec8
Revert "[Task Manager] Force validation on all tasks using state (#16…
mikecote Oct 3, 2023
7ddbd5c
Merge branch 'main' into revert-164574-task-manager/force-task-state-…
kibanamachine Oct 3, 2023
b3bf72a
Merge branch 'main' into revert-164574-task-manager/force-task-state-…
kibanamachine Oct 3, 2023
6e8eb59
Merge branch 'main' into revert-164574-task-manager/force-task-state-…
XavierM Oct 3, 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: 6 additions & 2 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,7 +64,9 @@ describe('TaskValidator', () => {
expect(result).toEqual(task);
});

it(`should fail to validate the state schema when the task type doesn't have stateSchemaByVersion defined`, () => {
// 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`, () => {
const definitions = new TaskTypeDictionary(mockLogger());
definitions.registerTaskDefinitions({
foo: fooTaskDefinition,
Expand Down Expand Up @@ -320,7 +322,9 @@ describe('TaskValidator', () => {
expect(result).toEqual(task);
});

it(`should fail to validate the state schema when the task type doesn't have stateSchemaByVersion defined`, () => {
// 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`, () => {
const definitions = new TaskTypeDictionary(mockLogger());
definitions.registerTaskDefinitions({
foo: fooTaskDefinition,
Expand Down
17 changes: 10 additions & 7 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, isEmpty } from 'lodash';
import { max, memoize } 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,13 +64,14 @@ export class TaskValidator {
const taskTypeDef = this.definitions.get(task.taskType);
const latestStateSchema = this.cachedGetLatestStateSchema(taskTypeDef);

let state = task.state;

// Skip validating tasks that don't use state
if (!latestStateSchema && isEmpty(state)) {
// 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) {
return task;
}

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

// Skip validating tasks that don't use state
if (!latestStateSchema && isEmpty(task.state)) {
// 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) {
return task;
}

Expand Down
Loading