[8.10] [Security Solution] Prebuilt rules installation / upgrade flyo…

…ut improvements (elastic#164179) (elastic#164897) # Backport This will backport the following commits from `main` to `8.10`: - [[Security Solution] Prebuilt rules installation / upgrade flyout improvements (elastic#164179)](elastic#164179)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport)  Co-authored-by: Nikita Indik <[email protected]> Co-authored-by: Patryk Kopyciński <[email protected]>
maximpn · Aug 26, 2023 · 41b32c7 · 41b32c7
1 parent 1453526
commit 41b32c7
Show file tree

Hide file tree

Showing 29 changed files with 536 additions and 685 deletions.
diff --git a/...k/plugins/security_solution/common/api/detection_engine/model/rule_schema/rule_schemas.ts b/...k/plugins/security_solution/common/api/detection_engine/model/rule_schema/rule_schemas.ts
@@ -221,7 +221,7 @@ export const KqlQueryLanguage = t.keyof({ kuery: null, lucene: null });
 export type EqlQueryLanguage = t.TypeOf<typeof EqlQueryLanguage>;
 export const EqlQueryLanguage = t.literal('eql');
 
-export const eqlSchema = buildRuleSchemas({
+const eqlSchema = buildRuleSchemas({
   required: {
     type: t.literal('eql'),
     language: EqlQueryLanguage,
@@ -256,7 +256,7 @@ export const EqlPatchParams = eqlSchema.patch;
 // -------------------------------------------------------------------------------------------------
 // Indicator Match rule schema
 
-export const threatMatchSchema = buildRuleSchemas({
+const threatMatchSchema = buildRuleSchemas({
   required: {
     type: t.literal('threat_match'),
     query: RuleQuery,
@@ -307,7 +307,7 @@ export const ThreatMatchPatchParams = threatMatchSchema.patch;
 // -------------------------------------------------------------------------------------------------
 // Custom Query rule schema
 
-export const querySchema = buildRuleSchemas({
+const querySchema = buildRuleSchemas({
   required: {
     type: t.literal('query'),
   },
@@ -343,7 +343,7 @@ export const QueryPatchParams = querySchema.patch;
 // -------------------------------------------------------------------------------------------------
 // Saved Query rule schema
 
-export const savedQuerySchema = buildRuleSchemas({
+const savedQuerySchema = buildRuleSchemas({
   required: {
     type: t.literal('saved_query'),
     saved_id,
@@ -387,7 +387,7 @@ export const SavedQueryPatchParams = savedQuerySchema.patch;
 // -------------------------------------------------------------------------------------------------
 // Threshold rule schema
 
-export const thresholdSchema = buildRuleSchemas({
+const thresholdSchema = buildRuleSchemas({
   required: {
     type: t.literal('threshold'),
     query: RuleQuery,
@@ -422,7 +422,7 @@ export const ThresholdPatchParams = thresholdSchema.patch;
 // -------------------------------------------------------------------------------------------------
 // Machine Learning rule schema
 
-export const machineLearningSchema = buildRuleSchemas({
+const machineLearningSchema = buildRuleSchemas({
   required: {
     type: t.literal('machine_learning'),
     anomaly_threshold,
@@ -462,7 +462,7 @@ export const MachineLearningPatchParams = machineLearningSchema.patch;
 // -------------------------------------------------------------------------------------------------
 // New Terms rule schema
 
-export const newTermsSchema = buildRuleSchemas({
+const newTermsSchema = buildRuleSchemas({
   required: {
     type: t.literal('new_terms'),
     query: RuleQuery,

diff --git a/...etection_engine/prebuilt_rules/review_rule_installation/review_rule_installation_route.ts b/...etection_engine/prebuilt_rules/review_rule_installation/review_rule_installation_route.ts
@@ -5,15 +5,15 @@
  * 2.0.
  */
 
-import type { RuleSignatureId, RuleTagArray, RuleVersion } from '../../model';
-import type { DiffableRule } from '../model';
+import type { RuleTagArray } from '../../model';
+import type { RuleResponse } from '../../model/rule_schema/rule_schemas';
 
 export interface ReviewRuleInstallationResponseBody {
   /** Aggregated info about all rules available for installation */
   stats: RuleInstallationStatsForReview;
 
   /** Info about individual rules: one object per each rule available for installation */
-  rules: RuleInstallationInfoForReview[];
+  rules: RuleResponse[];
 }
 
 export interface RuleInstallationStatsForReview {
@@ -23,8 +23,3 @@ export interface RuleInstallationStatsForReview {
   /** A union of all tags of all rules available for installation */
   tags: RuleTagArray;
 }
-
-export type RuleInstallationInfoForReview = DiffableRule & {
-  rule_id: RuleSignatureId;
-  version: RuleVersion;
-};
diff --git a/...mmon/api/detection_engine/prebuilt_rules/review_rule_upgrade/review_rule_upgrade_route.ts b/...mmon/api/detection_engine/prebuilt_rules/review_rule_upgrade/review_rule_upgrade_route.ts
@@ -6,7 +6,8 @@
  */
 
 import type { RuleObjectId, RuleSignatureId, RuleTagArray } from '../../model';
-import type { DiffableRule, PartialRuleDiff } from '../model';
+import type { PartialRuleDiff } from '../model';
+import type { RuleResponse } from '../../model/rule_schema/rule_schemas';
 
 export interface ReviewRuleUpgradeResponseBody {
   /** Aggregated info about all rules available for upgrade */
@@ -27,8 +28,8 @@ export interface RuleUpgradeStatsForReview {
 export interface RuleUpgradeInfoForReview {
   id: RuleObjectId;
   rule_id: RuleSignatureId;
-  rule: DiffableRule;
-  target_rule: DiffableRule;
+  current_rule: RuleResponse;
+  target_rule: RuleResponse;
   diff: PartialRuleDiff;
   revision: number;
 }