Merge branch 'main' into fields_for_wildcard_stale_while_revalidate

elastic · Jan 14, 2024 · b12b865 · b12b865
2 parents 194527e + 8cc7cad
commit b12b865
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 9 deletions.
diff --git a/...dex_management/__jest__/client_integration/index_template_wizard/template_create.test.tsx b/...dex_management/__jest__/client_integration/index_template_wizard/template_create.test.tsx
@@ -528,7 +528,6 @@ describe('<TemplateCreate />', () => {
       await actions.completeStepOne({
         name: TEMPLATE_NAME,
         indexPatterns: DEFAULT_INDEX_PATTERNS,
-        dataStream: {},
         allowAutoCreate: true,
       });
       // Component templates
@@ -618,7 +617,6 @@ describe('<TemplateCreate />', () => {
       await testBed.actions.completeStepOne({
         name: TEMPLATE_NAME,
         indexPatterns: DEFAULT_INDEX_PATTERNS,
-        dataStream: {},
         lifecycle: {
           enabled: true,
           value: 1,

diff --git a/...dex_management/__jest__/client_integration/index_template_wizard/template_form.helpers.ts b/...dex_management/__jest__/client_integration/index_template_wizard/template_form.helpers.ts
@@ -145,10 +145,10 @@ export const formSetup = async (initTestBed: SetupFunc<TestSubjects>) => {
     order,
     priority,
     version,
-    dataStream,
+    enableDataStream,
     lifecycle,
     allowAutoCreate,
-  }: Partial<TemplateDeserialized> = {}) => {
+  }: Partial<TemplateDeserialized> & { enableDataStream?: boolean } = {}) => {
     const { component, form, find } = testBed;
 
     if (name) {
@@ -174,7 +174,12 @@ export const formSetup = async (initTestBed: SetupFunc<TestSubjects>) => {
         form.setInputValue('orderField.input', JSON.stringify(order));
       }
 
-      if (dataStream) {
+      // Deal with toggling the data stream switch
+      const isDataStreamEnabled = find('dataStreamField.input').props().checked;
+
+      if (enableDataStream && !isDataStreamEnabled) {
+        form.toggleEuiSwitch('dataStreamField.input');
+      } else if (!enableDataStream && isDataStreamEnabled) {
         form.toggleEuiSwitch('dataStreamField.input');
       }
 

diff --git a/...ck/plugins/index_management/public/application/components/template_form/template_form.tsx b/...ck/plugins/index_management/public/application/components/template_form/template_form.tsx
@@ -116,6 +116,7 @@ export const TemplateForm = ({
   const indexTemplate = defaultValue ?? {
     name: '',
     indexPatterns: [],
+    dataStream: {},
     template: {},
     _kbnMeta: {
       type: 'default',

diff --git a/x-pack/test/functional/apps/index_management/index_templates_tab/create_index_template.ts b/x-pack/test/functional/apps/index_management/index_templates_tab/create_index_template.ts
@@ -32,8 +32,6 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
       // Complete required fields from step 1
       await testSubjects.setValue('nameField', INDEX_TEMPLATE_NAME);
       await testSubjects.setValue('indexPatternsField', 'test-1');
-      // Enable data stream
-      await testSubjects.click('dataStreamField > input');
       // Enable data retention
       await testSubjects.click('dataRetentionToggle > input');
       // Set the retention to 7 hours

diff --git a/...t_serverless/functional/test_suites/common/management/index_management/index_templates.ts b/...t_serverless/functional/test_suites/common/management/index_management/index_templates.ts
@@ -16,8 +16,10 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
   const testSubjects = getService('testSubjects');
   const es = getService('es');
   const retry = getService('retry');
+  const log = getService('log');
 
   const TEST_TEMPLATE = 'a_test_template';
+  const INDEX_PATTERN = `index_pattern_${Math.random()}`;
 
   describe('Index Templates', function () {
     before(async () => {
@@ -32,6 +34,15 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
     });
 
     after(async () => {
+      log.debug('Cleaning up created template');
+
+      try {
+        await es.indices.deleteIndexTemplate({ name: TEST_TEMPLATE }, { ignore: [404] });
+      } catch (e) {
+        log.debug('[Setup error] Error creating test policy');
+        throw e;
+      }
+
       await pageObjects.svlCommonPage.forceLogout();
     });
 
@@ -45,7 +56,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
         await es.indices.putIndexTemplate({
           name: TEST_TEMPLATE,
           body: {
-            index_patterns: ['test*'],
+            index_patterns: [INDEX_PATTERN],
           },
         });
       });
@@ -85,7 +96,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
         await testSubjects.click('createTemplateButton');
 
         await testSubjects.setValue('nameField', TEST_TEMPLATE_NAME);
-        await testSubjects.setValue('indexPatternsField', 'test*');
+        await testSubjects.setValue('indexPatternsField', INDEX_PATTERN);
 
         // Click form summary step and then the submit button
         await testSubjects.click('formWizardStep-5');