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

[Security Solution] Remove remaining usage of rule_schema_legacy types #188079

Merged
merged 6 commits into from
Jul 22, 2024
+35 −77
Merged

[Security Solution] Remove remaining usage of rule_schema_legacy types #188079

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bb89371
Remove remaining usage of rule_schema_legacy types
jpdjere Jul 11, 2024
f520c4c
Merge branch 'main' into remove-rule-schema-legacy
jpdjere Jul 18, 2024
e91e3fe
Merge branch 'main' into remove-rule-schema-legacy
jpdjere Jul 19, 2024
218adc4
remove export
jpdjere Jul 19, 2024
64b88e0
Merge branch 'main' into remove-rule-schema-legacy
banderror Jul 19, 2024
0cdc762
Merge branch 'main' into remove-rule-schema-legacy
jpdjere Jul 22, 2024
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
60 changes: 0 additions & 60 deletions ...curity_solution/common/api/detection_engine/model/rule_schema_legacy/common_attributes.ts
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions ...k/plugins/security_solution/common/api/detection_engine/model/rule_schema_legacy/index.ts
View file
Open in desktop

This file was deleted.

13 changes: 10 additions & 3 deletions ...ction_engine/rule_exceptions/find_exception_references/find_exception_references_route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,17 @@ import {
list_id,
DefaultNamespaceArray,
} from '@kbn/securitysolution-io-ts-list-types';
import { NonEmptyStringArray } from '@kbn/securitysolution-io-ts-types';
import { NonEmptyStringArray, NonEmptyString, UUID } from '@kbn/securitysolution-io-ts-types';

// TODO https://github.com/elastic/security-team/issues/7491
jpdjere marked this conversation as resolved.
Show resolved Hide resolved
// eslint-disable-next-line no-restricted-imports
import { RuleName, RuleObjectId, RuleSignatureId } from '../../model/rule_schema_legacy';
type RuleObjectId = t.TypeOf<typeof RuleObjectId>;
const RuleObjectId = UUID;

type RuleSignatureId = t.TypeOf<typeof RuleSignatureId>;
const RuleSignatureId = t.string;

type RuleName = t.TypeOf<typeof RuleName>;
const RuleName = NonEmptyString;

// If ids and list_ids are undefined, route will fetch all lists matching the
// specified namespace type
Expand Down
31 changes: 25 additions & 6 deletions x-pack/plugins/security_solution/common/api/timeline/model/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,31 @@ import { Direction } from '../../../search_strategy';
import type { PinnedEvent } from '../pinned_events/pinned_events_route';
import { PinnedEventRuntimeType } from '../pinned_events/pinned_events_route';
// TODO https://github.com/elastic/security-team/issues/7491
Copy link
Contributor

Choose a reason for hiding this comment

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

And this

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Same as above

// eslint-disable-next-line no-restricted-imports
import {
SavedObjectResolveAliasPurpose,
SavedObjectResolveAliasTargetId,
SavedObjectResolveOutcome,
} from '../../detection_engine/model/rule_schema_legacy';

/**
* Outcome is a property of the saved object resolve api
* will tell us info about the rule after 8.0 migrations
*/
export type SavedObjectResolveOutcome = runtimeTypes.TypeOf<typeof SavedObjectResolveOutcome>;
export const SavedObjectResolveOutcome = runtimeTypes.union([
runtimeTypes.literal('exactMatch'),
runtimeTypes.literal('aliasMatch'),
runtimeTypes.literal('conflict'),
]);

export type SavedObjectResolveAliasTargetId = runtimeTypes.TypeOf<
typeof SavedObjectResolveAliasTargetId
>;
export const SavedObjectResolveAliasTargetId = runtimeTypes.string;

export type SavedObjectResolveAliasPurpose = runtimeTypes.TypeOf<
typeof SavedObjectResolveAliasPurpose
>;
export const SavedObjectResolveAliasPurpose = runtimeTypes.union([
runtimeTypes.literal('savedObjectConversion'),
runtimeTypes.literal('savedObjectImport'),
]);

import { ErrorSchema } from './error_schema';

export const BareNoteSchema = runtimeTypes.intersection([
Expand Down