Skip to content

[Serverless] #7099 Move install prepackaged timelines schema #162314

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

Merged
lgestc merged 5 commits into from
Jul 25, 2023
Merged

[Serverless] #7099 Move install prepackaged timelines schema #162314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
02e506e
[Serverless] #7099 Move install prepackaged timelines schema
lgestc Jul 20, 2023
0dc8734
Merge branch 'main' into move_prepackaged_timelines_schema
lgestc Jul 20, 2023
1b69745
Merge branch 'main' into move_prepackaged_timelines_schema
lgestc Jul 20, 2023
ffbeb74
Merge branch 'main' into move_prepackaged_timelines_schema
lgestc Jul 24, 2023
eb5319a
Merge branch 'main' into move_prepackaged_timelines_schema
kibanamachine Jul 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
1 change: 1 addition & 0 deletions x-pack/plugins/security_solution/common/api/timeline/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ export * from './patch_timelines/patch_timelines_schema';
export * from './persist_favorite/persist_favorite_schema';
export * from './persist_note/persist_note_route';
export * from './pinned_events/pinned_events_route';
export * from './install_prepackaged_timelines/install_prepackaged_timelines';
19 changes: 19 additions & 0 deletions ...lution/common/api/timeline/install_prepackaged_timelines/install_prepackaged_timelines.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/*
* 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 * as rt from 'io-ts';

import { unionWithNullType } from '../../../utility_types';
import { ImportTimelinesSchemaRt, TimelineSavedToReturnObjectRuntimeType } from '..';

export const checkTimelineStatusRt = rt.type({
Copy link
Copy Markdown
Contributor

@michaelolo24 michaelolo24 Jul 20, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if it's better to rename it to checkPrepackagedTimelines or checkImportTimelines or something a little bit more specific.

timelinesToInstall: rt.array(unionWithNullType(ImportTimelinesSchemaRt)),
timelinesToUpdate: rt.array(unionWithNullType(ImportTimelinesSchemaRt)),
prepackagedTimelines: rt.array(unionWithNullType(TimelineSavedToReturnObjectRuntimeType)),
});

export type CheckTimelineStatusRt = rt.TypeOf<typeof checkTimelineStatusRt>;
6 changes: 2 additions & 4 deletions .../get_prebuilt_rules_and_timelines_status/get_prebuilt_rules_and_timelines_status_route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import { transformError } from '@kbn/securitysolution-es-utils';
import { validate } from '@kbn/securitysolution-io-ts-utils';
import { checkTimelineStatusRt } from '../../../../../../common/api/timeline';
import { buildSiemResponse } from '../../../routes/utils';
import type { SetupPlugins } from '../../../../../plugin';
import type { SecuritySolutionPluginRouter } from '../../../../../types';
Expand All @@ -24,10 +25,7 @@ import { createPrebuiltRuleAssetsClient } from '../../logic/rule_assets/prebuilt
import { rulesToMap } from '../../logic/utils';

import { buildFrameworkRequest } from '../../../../timeline/utils/common';
import {
checkTimelinesStatus,
checkTimelineStatusRt,
} from '../../../../timeline/utils/check_timelines_status';
import { checkTimelinesStatus } from '../../../../timeline/utils/check_timelines_status';

export const getPrebuiltRulesAndTimelinesStatusRoute = (
router: SecuritySolutionPluginRouter,
Expand Down
3 changes: 2 additions & 1 deletion ...n/server/lib/timeline/routes/prepackaged_timelines/install_prepackaged_timelines/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import { transformError } from '@kbn/securitysolution-es-utils';
import { validate } from '@kbn/securitysolution-io-ts-utils';
import { checkTimelineStatusRt } from '../../../../../../common/api/timeline';
import type { SecuritySolutionPluginRouter } from '../../../../../types';

import { TIMELINE_PREPACKAGED_URL } from '../../../../../../common/constants';
Expand All @@ -18,7 +19,7 @@ import { buildSiemResponse } from '../../../../detection_engine/routes/utils';

import { installPrepackagedTimelines } from './helpers';

import { checkTimelinesStatus, checkTimelineStatusRt } from '../../../utils/check_timelines_status';
import { checkTimelinesStatus } from '../../../utils/check_timelines_status';

import { buildFrameworkRequest } from '../../../utils/common';

Expand Down
19 changes: 4 additions & 15 deletions x-pack/plugins/security_solution/server/lib/timeline/utils/check_timelines_status.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,29 +6,18 @@
*/

import path, { join, resolve } from 'path';
import * as rt from 'io-ts';
import type { TimelineSavedObject, ImportTimelinesSchema } from '../../../../common/api/timeline';
import {
TimelineSavedToReturnObjectRuntimeType,
ImportTimelinesSchemaRt,
import type {
CheckTimelineStatusRt,
TimelineSavedObject,
ImportTimelinesSchema,
} from '../../../../common/api/timeline';

import { unionWithNullType } from '../../../../common/utility_types';

import type { FrameworkRequest } from '../../framework';

import { getExistingPrepackagedTimelines } from '../saved_object/timelines';

import { loadData, getReadables } from './common';

export const checkTimelineStatusRt = rt.type({
timelinesToInstall: rt.array(unionWithNullType(ImportTimelinesSchemaRt)),
timelinesToUpdate: rt.array(unionWithNullType(ImportTimelinesSchemaRt)),
prepackagedTimelines: rt.array(unionWithNullType(TimelineSavedToReturnObjectRuntimeType)),
});

export type CheckTimelineStatusRt = rt.TypeOf<typeof checkTimelineStatusRt>;

export const getTimelinesToUpdate = (
timelinesFromFileSystem: ImportTimelinesSchema[],
installedTimelines: TimelineSavedObject[]
Expand Down