Remove remaining usage of rule_schema_legacy types

elastic · Jul 11, 2024 · bb89371 · bb89371
1 parent cd4a782
commit bb89371
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 77 deletions.
diff --git a/...curity_solution/common/api/detection_engine/model/rule_schema_legacy/common_attributes.ts b/...curity_solution/common/api/detection_engine/model/rule_schema_legacy/common_attributes.ts
diff --git a/...k/plugins/security_solution/common/api/detection_engine/model/rule_schema_legacy/index.ts b/...k/plugins/security_solution/common/api/detection_engine/model/rule_schema_legacy/index.ts
diff --git a/...ction_engine/rule_exceptions/find_exception_references/find_exception_references_route.ts b/...ction_engine/rule_exceptions/find_exception_references/find_exception_references_route.ts
@@ -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
-// eslint-disable-next-line no-restricted-imports
-import { RuleName, RuleObjectId, RuleSignatureId } from '../../model/rule_schema_legacy';
+export type RuleObjectId = t.TypeOf<typeof RuleObjectId>;
+export const RuleObjectId = UUID;
+
+export type RuleSignatureId = t.TypeOf<typeof RuleSignatureId>;
+export const RuleSignatureId = t.string;
+
+export type RuleName = t.TypeOf<typeof RuleName>;
+export const RuleName = NonEmptyString;
 
 // If ids and list_ids are undefined, route will fetch all lists matching the
 // specified namespace type

diff --git a/x-pack/plugins/security_solution/common/api/timeline/model/api.ts b/x-pack/plugins/security_solution/common/api/timeline/model/api.ts
@@ -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
-// 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([