Fix unit tests

elastic · Jan 2, 2025 · e6ae446 · e6ae446
1 parent dae22c8
commit e6ae446
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 19 deletions.
diff --git a/x-pack/platform/plugins/shared/alerting/server/alerts_service/alerts_service.test.ts b/x-pack/platform/plugins/shared/alerting/server/alerts_service/alerts_service.test.ts
@@ -144,7 +144,10 @@ const getIndexTemplatePutBody = (opts?: GetIndexTemplatePutBodyOpts) => {
 
   const indexPatterns = useDataStream
     ? [`.alerts-${context ? context : 'test'}.alerts-${namespace}`]
-    : [`.internal.alerts-${context ? context : 'test'}.alerts-${namespace}-*`];
+    : [
+        `.internal.alerts-${context ? context : 'test'}.alerts-${namespace}-*`,
+        `.reindexed-v8-internal.alerts-${context ? context : 'test'}.alerts-${namespace}-*`,
+      ];
   return {
     name: `.alerts-${context ? context : 'test'}.alerts-${namespace}-index-template`,
     body: {
@@ -564,7 +567,10 @@ describe('Alerts Service', () => {
               },
             });
             expect(clusterClient.indices.getAlias).toHaveBeenCalledWith({
-              index: '.internal.alerts-test.alerts-default-*',
+              index: [
+                '.internal.alerts-test.alerts-default-*',
+                `.reindexed-v8-internal.alerts-test.alerts-default-*`,
+              ],
               name: '.alerts-test.alerts-*',
             });
           }
@@ -627,7 +633,10 @@ describe('Alerts Service', () => {
               },
             });
             expect(clusterClient.indices.getAlias).toHaveBeenCalledWith({
-              index: '.internal.alerts-test.alerts-default-*',
+              index: [
+                '.internal.alerts-test.alerts-default-*',
+                `.reindexed-v8-internal.alerts-test.alerts-default-*`,
+              ],
               name: '.alerts-test.alerts-*',
             });
           }
@@ -686,7 +695,10 @@ describe('Alerts Service', () => {
               },
             });
             expect(clusterClient.indices.getAlias).toHaveBeenCalledWith({
-              index: '.internal.alerts-test.alerts-default-*',
+              index: [
+                '.internal.alerts-test.alerts-default-*',
+                `.reindexed-v8-internal.alerts-test.alerts-default-*`,
+              ],
               name: '.alerts-test.alerts-*',
             });
           }
@@ -728,7 +740,10 @@ describe('Alerts Service', () => {
               },
             });
             expect(clusterClient.indices.getAlias).toHaveBeenNthCalledWith(1, {
-              index: '.internal.alerts-test.alerts-default-*',
+              index: [
+                '.internal.alerts-test.alerts-default-*',
+                `.reindexed-v8-internal.alerts-test.alerts-default-*`,
+              ],
               name: '.alerts-test.alerts-*',
             });
           }
@@ -792,7 +807,10 @@ describe('Alerts Service', () => {
               },
             });
             expect(clusterClient.indices.getAlias).toHaveBeenNthCalledWith(2, {
-              index: '.internal.alerts-test.alerts-another-namespace-*',
+              index: [
+                '.internal.alerts-test.alerts-another-namespace-*',
+                '.reindexed-v8-internal.alerts-test.alerts-another-namespace-*',
+              ],
               name: '.alerts-test.alerts-*',
             });
           }
@@ -826,7 +844,10 @@ describe('Alerts Service', () => {
             })
           );
           expect(clusterClient.indices.getAlias).toHaveBeenCalledWith({
-            index: '.internal.alerts-test.alerts-default-*',
+            index: [
+              '.internal.alerts-test.alerts-default-*',
+              '.reindexed-v8-internal.alerts-test.alerts-default-*',
+            ],
             name: '.alerts-test.alerts-*',
           });
           expect(clusterClient.indices.putSettings).toHaveBeenCalledTimes(2);
@@ -871,11 +892,12 @@ describe('Alerts Service', () => {
           const template = {
             name: `.alerts-empty.alerts-default-index-template`,
             body: {
-              index_patterns: [
-                useDataStreamForAlerts
-                  ? `.alerts-empty.alerts-default`
-                  : `.internal.alerts-empty.alerts-default-*`,
-              ],
+              index_patterns: useDataStreamForAlerts
+                ? [`.alerts-empty.alerts-default`]
+                : [
+                    `.internal.alerts-empty.alerts-default-*`,
+                    `.reindexed-v8-internal.alerts-empty.alerts-default-*`,
+                  ],
               composed_of: ['.alerts-framework-mappings'],
               ...(useDataStreamForAlerts ? { data_stream: { hidden: true } } : {}),
               priority: 7,
@@ -931,7 +953,10 @@ describe('Alerts Service', () => {
               },
             });
             expect(clusterClient.indices.getAlias).toHaveBeenCalledWith({
-              index: '.internal.alerts-empty.alerts-default-*',
+              index: [
+                '.internal.alerts-empty.alerts-default-*',
+                '.reindexed-v8-internal.alerts-empty.alerts-default-*',
+              ],
               name: '.alerts-empty.alerts-*',
             });
           }

diff --git a/...k/platform/plugins/shared/alerting/server/alerts_service/resource_installer_utils.test.ts b/...k/platform/plugins/shared/alerting/server/alerts_service/resource_installer_utils.test.ts
@@ -36,14 +36,17 @@ describe('getIndexTemplateAndPattern', () => {
     expect(getIndexTemplateAndPattern({ context: 'test' })).toEqual({
       template: '.alerts-test.alerts-default-index-template',
       pattern: '.internal.alerts-test.alerts-default-*',
+      reindexedPattern: '.reindexed-v8-internal.alerts-test.alerts-default-*',
       basePattern: '.alerts-test.alerts-*',
       alias: '.alerts-test.alerts-default',
       validPrefixes: [
         '.ds-.alerts-',
-        '.internal.alerts-',
         '.alerts-',
-        '.internal.preview.alerts-',
+        '.internal.alerts-',
+        '.reindexed-v8-internal.alerts-',
         '.preview.alerts-',
+        '.internal.preview.alerts-',
+        '.reindexed-v8-internal.preview.alerts-',
       ],
       name: '.internal.alerts-test.alerts-default-000001',
     });
@@ -53,14 +56,17 @@ describe('getIndexTemplateAndPattern', () => {
     expect(getIndexTemplateAndPattern({ context: 'test', namespace: 'special' })).toEqual({
       template: '.alerts-test.alerts-special-index-template',
       pattern: '.internal.alerts-test.alerts-special-*',
+      reindexedPattern: '.reindexed-v8-internal.alerts-test.alerts-special-*',
       basePattern: '.alerts-test.alerts-*',
       alias: '.alerts-test.alerts-special',
       validPrefixes: [
         '.ds-.alerts-',
-        '.internal.alerts-',
         '.alerts-',
-        '.internal.preview.alerts-',
+        '.internal.alerts-',
+        '.reindexed-v8-internal.alerts-',
         '.preview.alerts-',
+        '.internal.preview.alerts-',
+        '.reindexed-v8-internal.preview.alerts-',
       ],
       name: '.internal.alerts-test.alerts-special-000001',
     });
@@ -76,15 +82,18 @@ describe('getIndexTemplateAndPattern', () => {
     ).toEqual({
       template: '.alerts-test.alerts-special-index-template',
       pattern: '.internal.alerts-test.alerts-special-*',
+      reindexedPattern: '.reindexed-v8-internal.alerts-test.alerts-special-*',
       basePattern: '.alerts-test.alerts-*',
       alias: '.alerts-test.alerts-special',
       name: '.internal.alerts-test.alerts-special-000001',
       validPrefixes: [
         '.ds-.alerts-',
-        '.internal.alerts-',
         '.alerts-',
-        '.internal.preview.alerts-',
+        '.internal.alerts-',
+        '.reindexed-v8-internal.alerts-',
         '.preview.alerts-',
+        '.internal.preview.alerts-',
+        '.reindexed-v8-internal.preview.alerts-',
       ],
       secondaryAlias: `siem.signals-special`,
     });