Update incorrect SO index in tests

elastic · Apr 18, 2023 · 5f601bf · 5f601bf
1 parent a7f95c9
commit 5f601bf
Show file tree

Hide file tree

Showing 8 changed files with 1,964 additions and 9 deletions.
diff --git a/cases.patch b/cases.patch
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/migrations.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/migrations.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { SECURITY_SOLUTION_SAVED_OBJECT_INDEX } from '@kbn/core-saved-objects-server';
 import expect from '@kbn/expect';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
@@ -32,7 +33,7 @@ export default ({ getService }: FtrProviderContext): void => {
           references: [{}];
         }>(
           {
-            index: '.kibana',
+            index: SECURITY_SOLUTION_SAVED_OBJECT_INDEX,
             id: 'siem-detection-engine-rule-actions:fce024a0-0452-11ec-9b15-d13d79d162f3',
           },
           {
@@ -79,7 +80,7 @@ export default ({ getService }: FtrProviderContext): void => {
           };
         }>(
           {
-            index: '.kibana',
+            index: SECURITY_SOLUTION_SAVED_OBJECT_INDEX,
             id: 'siem-detection-engine-rule-actions:fce024a0-0452-11ec-9b15-d13d79d162f3',
           },
           {

diff --git a/x-pack/test/detection_engine_api_integration/utils/delete_all_rule_execution_info.ts b/x-pack/test/detection_engine_api_integration/utils/delete_all_rule_execution_info.ts
@@ -6,6 +6,7 @@
  */
 
 import type { Client } from '@elastic/elasticsearch';
+import { SECURITY_SOLUTION_SAVED_OBJECT_INDEX } from '@kbn/core-saved-objects-server';
 import type { ToolingLog } from '@kbn/tooling-log';
 import { countDownES } from './count_down_es';
 
@@ -20,7 +21,7 @@ export const deleteAllRuleExecutionInfo = async (es: Client, log: ToolingLog): P
     async () => {
       return es.deleteByQuery(
         {
-          index: '.kibana',
+          index: SECURITY_SOLUTION_SAVED_OBJECT_INDEX,
           q: 'type:siem-detection-engine-rule-execution-info',
           wait_for_completion: true,
           refresh: true,

diff --git a/x-pack/test/detection_engine_api_integration/utils/delete_all_timelines.ts b/x-pack/test/detection_engine_api_integration/utils/delete_all_timelines.ts
@@ -6,14 +6,15 @@
  */
 
 import type { Client } from '@elastic/elasticsearch';
+import { SECURITY_SOLUTION_SAVED_OBJECT_INDEX } from '@kbn/core-saved-objects-server';
 
 /**
  * Remove all timelines from the .kibana index
  * @param es The ElasticSearch handle
  */
 export const deleteAllTimelines = async (es: Client): Promise<void> => {
   await es.deleteByQuery({
-    index: '.kibana',
+    index: SECURITY_SOLUTION_SAVED_OBJECT_INDEX,
     q: 'type:siem-ui-timeline',
     wait_for_completion: true,
     refresh: true,

diff --git a/x-pack/test/detection_engine_api_integration/utils/get_legacy_action_so.ts b/x-pack/test/detection_engine_api_integration/utils/get_legacy_action_so.ts
@@ -6,6 +6,7 @@
  */
 import type { Client } from '@elastic/elasticsearch';
 import type { SearchResponse } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { SECURITY_SOLUTION_SAVED_OBJECT_INDEX } from '@kbn/core-saved-objects-server';
 import type { SavedObjectReference } from '@kbn/core/server';
 import type { LegacyRuleActions } from '@kbn/security-solution-plugin/server/lib/detection_engine/rule_actions_legacy';
 
@@ -19,6 +20,6 @@ interface LegacyActionSO extends LegacyRuleActions {
  */
 export const getLegacyActionSO = async (es: Client): Promise<SearchResponse<LegacyActionSO>> =>
   es.search({
-    index: '.kibana',
+    index: SECURITY_SOLUTION_SAVED_OBJECT_INDEX,
     q: 'type:siem-detection-engine-rule-actions',
   });
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_legacy_actions_so_by_id.ts b/x-pack/test/detection_engine_api_integration/utils/get_legacy_actions_so_by_id.ts
@@ -7,6 +7,7 @@
 
 import type { Client } from '@elastic/elasticsearch';
 import type { SearchResponse } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { SECURITY_SOLUTION_SAVED_OBJECT_INDEX } from '@kbn/core-saved-objects-server';
 import { SavedObjectReference } from '@kbn/core/server';
 import type { LegacyRuleActions } from '@kbn/security-solution-plugin/server/lib/detection_engine/rule_actions_legacy';
 
@@ -24,6 +25,6 @@ export const getLegacyActionSOById = async (
   id: string
 ): Promise<SearchResponse<LegacyActionSO>> =>
   es.search({
-    index: '.kibana',
+    index: SECURITY_SOLUTION_SAVED_OBJECT_INDEX,
     q: `type:siem-detection-engine-rule-actions AND _id:"siem-detection-engine-rule-actions:${id}"`,
   });
diff --git a/...tection_engine_api_integration/utils/prebuilt_rules/create_prebuilt_rule_saved_objects.ts b/...tection_engine_api_integration/utils/prebuilt_rules/create_prebuilt_rule_saved_objects.ts
@@ -12,6 +12,7 @@ import {
   getPrebuiltRuleWithExceptionsMock,
 } from '@kbn/security-solution-plugin/server/lib/detection_engine/prebuilt_rules/mocks';
 import { ELASTIC_SECURITY_RULE_ID } from '@kbn/security-solution-plugin/common';
+import { SECURITY_SOLUTION_SAVED_OBJECT_INDEX } from '@kbn/core-saved-objects-server';
 
 /**
  * A helper function to create a rule asset saved object
@@ -73,7 +74,12 @@ export const createPrebuiltRuleAssetSavedObjects = async (
   await es.bulk({
     refresh: true,
     body: rules.flatMap((doc) => [
-      { index: { _index: '.kibana', _id: `security-rule:${doc['security-rule'].rule_id}` } },
+      {
+        index: {
+          _index: SECURITY_SOLUTION_SAVED_OBJECT_INDEX,
+          _id: `security-rule:${doc['security-rule'].rule_id}`,
+        },
+      },
       doc,
     ]),
   });
@@ -97,7 +103,7 @@ export const createHistoricalPrebuiltRuleAssetSavedObjects = async (
     body: rules.flatMap((doc) => [
       {
         index: {
-          _index: '.kibana',
+          _index: SECURITY_SOLUTION_SAVED_OBJECT_INDEX,
           _id: `security-rule:${doc['security-rule'].rule_id}_${doc['security-rule'].version}`,
         },
       },

diff --git a/.../detection_engine_api_integration/utils/prebuilt_rules/delete_all_prebuilt_rule_assets.ts b/.../detection_engine_api_integration/utils/prebuilt_rules/delete_all_prebuilt_rule_assets.ts
@@ -6,14 +6,15 @@
  */
 
 import type { Client } from '@elastic/elasticsearch';
+import { SECURITY_SOLUTION_SAVED_OBJECT_INDEX } from '@kbn/core-saved-objects-server';
 
 /**
  * Remove all prebuilt rule assets from the .kibana index
  * @param es The ElasticSearch handle
  */
 export const deleteAllPrebuiltRuleAssets = async (es: Client): Promise<void> => {
   await es.deleteByQuery({
-    index: '.kibana',
+    index: SECURITY_SOLUTION_SAVED_OBJECT_INDEX,
     q: 'type:security-rule',
     wait_for_completion: true,
     refresh: true,