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.

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

[Response Ops][Task Manager] Changing task manager schedule.interval schema to string from duration #204413

Merged
merged 5 commits into from
Dec 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
import { SavedObjectsModelVersionMap } from '@kbn/core-saved-objects-server';
import { taskSchemaV1, taskSchemaV2 } from '../schemas/task';

// IMPORTANT!!!
// When adding new model versions, make sure to manually test
// downgrading to the previous version. This is a gap in our
// automated test coverage so manual testing is needed.
export const taskModelVersions: SavedObjectsModelVersionMap = {
'1': {
changes: [
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/

import { validateDuration } from './task';

test('allows valid duration', () => {
expect(validateDuration('1s')).toBeUndefined();
expect(validateDuration('45346s')).toBeUndefined();
expect(validateDuration('10m')).toBeUndefined();
expect(validateDuration('30000000h')).toBeUndefined();
expect(validateDuration('3245d')).toBeUndefined();
});

test('returns error message for invalid duration', () => {
expect(validateDuration('10x')).toBe('string is not a valid duration: 10x');
expect(validateDuration('PT1M')).toBe('string is not a valid duration: PT1M');
expect(validateDuration('foo')).toBe('string is not a valid duration: foo');
expect(validateDuration('1 minute')).toBe('string is not a valid duration: 1 minute');
expect(validateDuration('1hr')).toBe('string is not a valid duration: 1hr');
});
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@
*/

import { schema } from '@kbn/config-schema';
import { isInterval } from '../../lib/intervals';

export function validateDuration(duration: string) {
if (!isInterval(duration)) {
return 'string is not a valid duration: ' + duration;
}
}

export const taskSchemaV1 = schema.object({
taskType: schema.string(),
Expand All @@ -15,7 +22,7 @@ export const taskSchemaV1 = schema.object({
runAt: schema.string(),
schedule: schema.maybe(
schema.object({
interval: schema.duration(),
interval: schema.string({ validate: validateDuration }),
})
),
params: schema.string(),
Expand Down
Loading