[7.x] [es] disable wildcards in destructive actions (elastic#88986) (e…

…lastic#90804) Co-authored-by: spalger <spalger@users.noreply.github.com>
tylersmalley · Feb 9, 2021 · 684edff · 684edff
1 parent d1a1287
commit 684edff
Show file tree

Hide file tree

Showing 50 changed files with 229 additions and 151 deletions.
diff --git a/packages/kbn-es/src/cluster.js b/packages/kbn-es/src/cluster.js
@@ -246,7 +246,7 @@ exports.Cluster = class Cluster {
     this._log.info(chalk.bold('Starting'));
     this._log.indent(4);
 
-    const esArgs = [].concat(options.esArgs || []);
+    const esArgs = ['action.destructive_requires_name=true'].concat(options.esArgs || []);
     // Add to esArgs if ssl is enabled
     if (this._ssl) {
       esArgs.push('xpack.security.http.ssl.enabled=true');

diff --git a/packages/kbn-es/src/integration_tests/cluster.test.js b/packages/kbn-es/src/integration_tests/cluster.test.js
@@ -264,7 +264,9 @@ describe('#start(installPath)', () => {
     expect(extractConfigFiles.mock.calls).toMatchInlineSnapshot(`
       Array [
         Array [
-          Array [],
+          Array [
+            "action.destructive_requires_name=true",
+          ],
           undefined,
           Object {
             "log": <ToolingLog>,
@@ -340,7 +342,9 @@ describe('#run()', () => {
     expect(extractConfigFiles.mock.calls).toMatchInlineSnapshot(`
       Array [
         Array [
-          Array [],
+          Array [
+            "action.destructive_requires_name=true",
+          ],
           undefined,
           Object {
             "log": <ToolingLog>,

diff --git a/test/api_integration/apis/saved_objects/bulk_create.ts b/test/api_integration/apis/saved_objects/bulk_create.ts
@@ -12,8 +12,8 @@ import { getKibanaVersion } from './lib/saved_objects_test_utils';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
-  const es = getService('es');
   const esArchiver = getService('esArchiver');
+  const esDeleteAllIndices = getService('esDeleteAllIndices');
 
   const BULK_REQUESTS = [
     {
@@ -97,7 +97,7 @@ export default function ({ getService }: FtrProviderContext) {
       before(
         async () =>
           // just in case the kibana server has recreated it
-          await es.indices.delete({ index: '.kibana' }, { ignore: [404] })
+          await esDeleteAllIndices('.kibana')
       );
 
       it('should return 200 with individual responses', async () =>

diff --git a/test/api_integration/apis/saved_objects/bulk_get.ts b/test/api_integration/apis/saved_objects/bulk_get.ts
@@ -12,8 +12,8 @@ import { getKibanaVersion } from './lib/saved_objects_test_utils';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
-  const es = getService('es');
   const esArchiver = getService('esArchiver');
+  const esDeleteAllIndices = getService('esDeleteAllIndices');
 
   const BULK_REQUESTS = [
     {
@@ -108,7 +108,7 @@ export default function ({ getService }: FtrProviderContext) {
       before(
         async () =>
           // just in case the kibana server has recreated it
-          await es.indices.delete({ index: '.kibana' }, { ignore: [404] })
+          await esDeleteAllIndices('.kibana')
       );
 
       it('should return 200 with individual responses', async () =>

diff --git a/test/api_integration/apis/saved_objects/bulk_update.ts b/test/api_integration/apis/saved_objects/bulk_update.ts
@@ -12,8 +12,8 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
-  const es = getService('es');
   const esArchiver = getService('esArchiver');
+  const esDeleteAllIndices = getService('esDeleteAllIndices');
 
   describe('bulkUpdate', () => {
     describe('with kibana index', () => {
@@ -235,7 +235,7 @@ export default function ({ getService }: FtrProviderContext) {
       before(
         async () =>
           // just in case the kibana server has recreated it
-          await es.indices.delete({ index: '.kibana' }, { ignore: [404] })
+          await esDeleteAllIndices('.kibana')
       );
 
       it('should return generic 404', async () => {

diff --git a/test/api_integration/apis/saved_objects/create.ts b/test/api_integration/apis/saved_objects/create.ts
@@ -14,6 +14,7 @@ export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const es = getService('es');
   const esArchiver = getService('esArchiver');
+  const esDeleteAllIndices = getService('esDeleteAllIndices');
 
   describe('create', () => {
     let KIBANA_VERSION: string;
@@ -82,7 +83,7 @@ export default function ({ getService }: FtrProviderContext) {
       before(
         async () =>
           // just in case the kibana server has recreated it
-          await es.indices.delete({ index: '.kibana' }, { ignore: [404] })
+          await esDeleteAllIndices('.kibana')
       );
 
       it('should return 200 and create kibana index', async () => {

diff --git a/test/api_integration/apis/saved_objects/delete.ts b/test/api_integration/apis/saved_objects/delete.ts
@@ -11,8 +11,8 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
-  const es = getService('es');
   const esArchiver = getService('esArchiver');
+  const esDeleteAllIndices = getService('esDeleteAllIndices');
 
   describe('delete', () => {
     describe('with kibana index', () => {
@@ -44,7 +44,7 @@ export default function ({ getService }: FtrProviderContext) {
       before(
         async () =>
           // just in case the kibana server has recreated it
-          await es.indices.delete({ index: '.kibana' }, { ignore: [404] })
+          await esDeleteAllIndices('.kibana')
       );
 
       it('returns generic 404 when kibana index is missing', async () =>

diff --git a/test/api_integration/apis/saved_objects/export.ts b/test/api_integration/apis/saved_objects/export.ts
@@ -15,8 +15,8 @@ function ndjsonToObject(input: string) {
 }
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
-  const es = getService('es');
   const esArchiver = getService('esArchiver');
+  const esDeleteAllIndices = getService('esDeleteAllIndices');
 
   describe('export', () => {
     let KIBANA_VERSION: string;
@@ -534,7 +534,7 @@ export default function ({ getService }: FtrProviderContext) {
       before(
         async () =>
           // just in case the kibana server has recreated it
-          await es.indices.delete({ index: '.kibana' }, { ignore: [404] })
+          await esDeleteAllIndices('.kibana')
       );
 
       it('should return empty response', async () => {

diff --git a/test/api_integration/apis/saved_objects/find.ts b/test/api_integration/apis/saved_objects/find.ts
@@ -13,8 +13,8 @@ import { getKibanaVersion } from './lib/saved_objects_test_utils';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
-  const es = getService('es');
   const esArchiver = getService('esArchiver');
+  const esDeleteAllIndices = getService('esDeleteAllIndices');
 
   describe('find', () => {
     let KIBANA_VERSION: string;
@@ -430,7 +430,7 @@ export default function ({ getService }: FtrProviderContext) {
       before(
         async () =>
           // just in case the kibana server has recreated it
-          await es.indices.delete({ index: '.kibana' }, { ignore: [404] })
+          await esDeleteAllIndices('.kibana')
       );
 
       it('should return 200 with empty response', async () =>

diff --git a/test/api_integration/apis/saved_objects/get.ts b/test/api_integration/apis/saved_objects/get.ts
@@ -12,8 +12,8 @@ import { getKibanaVersion } from './lib/saved_objects_test_utils';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
-  const es = getService('es');
   const esArchiver = getService('esArchiver');
+  const esDeleteAllIndices = getService('esDeleteAllIndices');
 
   describe('get', () => {
     let KIBANA_VERSION: string;
@@ -78,7 +78,7 @@ export default function ({ getService }: FtrProviderContext) {
       before(
         async () =>
           // just in case the kibana server has recreated it
-          await es.indices.delete({ index: '.kibana' }, { ignore: [404] })
+          await esDeleteAllIndices('.kibana')
       );
 
       it('should return basic 404 without mentioning index', async () =>

diff --git a/test/api_integration/apis/saved_objects/migrations.ts b/test/api_integration/apis/saved_objects/migrations.ts
@@ -63,9 +63,10 @@ function getLogMock() {
 }
 export default ({ getService }: FtrProviderContext) => {
   const esClient = getService('es');
+  const esDeleteAllIndices = getService('esDeleteAllIndices');
 
   describe('Kibana index migration', () => {
-    before(() => esClient.indices.delete({ index: '.migrate-*' }));
+    before(() => esDeleteAllIndices('.migrate-*'));
 
     it('Migrates an existing index that has never been migrated before', async () => {
       const index = '.migration-a';
@@ -99,7 +100,7 @@ export default ({ getService }: FtrProviderContext) => {
         },
       ];
 
-      await createIndex({ esClient, index });
+      await createIndex({ esClient, index, esDeleteAllIndices });
       await createDocs({ esClient, index, docs: originalDocs });
 
       // Test that unrelated index templates are unaffected
@@ -233,7 +234,7 @@ export default ({ getService }: FtrProviderContext) => {
         },
       ];
 
-      await createIndex({ esClient, index });
+      await createIndex({ esClient, index, esDeleteAllIndices });
       await createDocs({ esClient, index, docs: originalDocs });
 
       await migrateIndex({ esClient, index, savedObjectTypes, mappingProperties });
@@ -347,7 +348,7 @@ export default ({ getService }: FtrProviderContext) => {
         },
       ];
 
-      await createIndex({ esClient, index });
+      await createIndex({ esClient, index, esDeleteAllIndices });
       await createDocs({ esClient, index, docs: originalDocs });
 
       const result = await Promise.all([
@@ -445,7 +446,7 @@ export default ({ getService }: FtrProviderContext) => {
         BAZ_TYPE, // must be registered for reference transforms to be applied to objects of this type
       ];
 
-      await createIndex({ esClient, index });
+      await createIndex({ esClient, index, esDeleteAllIndices });
       await createDocs({ esClient, index, docs: originalDocs });
 
       await migrateIndex({
@@ -554,8 +555,17 @@ export default ({ getService }: FtrProviderContext) => {
   });
 };
 
-async function createIndex({ esClient, index }: { esClient: ElasticsearchClient; index: string }) {
-  await esClient.indices.delete({ index: `${index}*` }, { ignore: [404] });
+async function createIndex({
+  esClient,
+  index,
+  esDeleteAllIndices,
+}: {
+  esClient: ElasticsearchClient;
+  index: string;
+  esDeleteAllIndices: (pattern: string) => Promise<void>;
+}) {
+  await esDeleteAllIndices(`${index}*`);
+
   const properties = {
     type: { type: 'keyword' },
     foo: { properties: { name: { type: 'keyword' } } },

diff --git a/test/api_integration/apis/saved_objects/resolve.ts b/test/api_integration/apis/saved_objects/resolve.ts
@@ -12,8 +12,8 @@ import { getKibanaVersion } from './lib/saved_objects_test_utils';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
-  const es = getService('es');
   const esArchiver = getService('esArchiver');
+  const esDeleteAllIndices = getService('esDeleteAllIndices');
 
   describe('resolve', () => {
     let KIBANA_VERSION: string;
@@ -81,7 +81,7 @@ export default function ({ getService }: FtrProviderContext) {
       before(
         async () =>
           // just in case the kibana server has recreated it
-          await es.indices.delete({ index: '.kibana' }, { ignore: [404] })
+          await esDeleteAllIndices('.kibana')
       );
 
       it('should return basic 404 without mentioning index', async () =>

diff --git a/test/api_integration/apis/saved_objects/update.ts b/test/api_integration/apis/saved_objects/update.ts
@@ -11,8 +11,8 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
-  const es = getService('es');
   const esArchiver = getService('esArchiver');
+  const esDeleteAllIndices = getService('esDeleteAllIndices');
 
   describe('update', () => {
     describe('with kibana index', () => {
@@ -121,7 +121,7 @@ export default function ({ getService }: FtrProviderContext) {
       before(
         async () =>
           // just in case the kibana server has recreated it
-          await es.indices.delete({ index: '.kibana' }, { ignore: [404] })
+          await esDeleteAllIndices('.kibana')
       );
 
       it('should return generic 404', async () =>

diff --git a/test/api_integration/apis/saved_objects_management/find.ts b/test/api_integration/apis/saved_objects_management/find.ts
@@ -11,7 +11,7 @@ import { Response } from 'supertest';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
-  const es = getService('es');
+  const esDeleteAllIndices = getService('esDeleteAllIndices');
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
   const kibanaServer = getService('kibanaServer');
@@ -184,7 +184,7 @@ export default function ({ getService }: FtrProviderContext) {
       before(
         async () =>
           // just in case the kibana server has recreated it
-          await es.indices.delete({ index: '.kibana' }, { ignore: [404] })
+          await esDeleteAllIndices('.kibana')
       );
 
       it('should return 200 with empty response', async () =>

diff --git a/test/api_integration/apis/saved_objects_management/get.ts b/test/api_integration/apis/saved_objects_management/get.ts
@@ -11,7 +11,7 @@ import { Response } from 'supertest';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
-  const es = getService('es');
+  const esDeleteAllIndices = getService('esDeleteAllIndices');
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
 
@@ -45,7 +45,7 @@ export default function ({ getService }: FtrProviderContext) {
       before(
         async () =>
           // just in case the kibana server has recreated it
-          await es.indices.delete({ index: '.kibana' }, { ignore: [404] })
+          await esDeleteAllIndices('.kibana')
       );
 
       it('should return 404 for object that no longer exists', async () =>

diff --git a/test/common/services/es_delete_all_indices.ts b/test/common/services/es_delete_all_indices.ts
@@ -0,0 +1,61 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { FtrProviderContext } from '../ftr_provider_context';
+
+export function EsDeleteAllIndicesProvider({ getService }: FtrProviderContext) {
+  const es = getService('es');
+  const log = getService('log');
+
+  async function deleteConcreteIndices(indices: string[]) {
+    try {
+      await es.indices.delete({
+        index: indices,
+        ignore_unavailable: true,
+      });
+    } catch (error) {
+      log.debug(`Failed to delete indices [${indices}], but ignoring error: ${error.message}`);
+    }
+  }
+
+  return async (patterns: string | string[]) => {
+    for (const pattern of [patterns].flat()) {
+      for (let attempt = 1; ; attempt++) {
+        if (attempt > 5) {
+          throw new Error(`Failed to delete all indices with pattern [${pattern}]`);
+        }
+
+        // resolve pattern to concrete index names
+        const resp = await es.indices.getAlias(
+          {
+            index: pattern,
+          },
+          {
+            ignore: [404],
+          }
+        );
+        const indices = Object.keys(resp.body) as string[];
+
+        // if no indexes exits then we're done with this pattern
+        if (resp.statusCode === 404 || !indices.length) {
+          if (attempt === 1) {
+            log.debug(`No indices to delete [pattern=${pattern}]`);
+          }
+          break;
+        }
+
+        log.debug(
+          `Deleting indices [attempt=${attempt}] [pattern=${pattern}] "${indices.join('", "')}"`
+        );
+
+        // delete the concrete indexes we found and try again until this pattern resolves to no indexes
+        await deleteConcreteIndices(indices);
+      }
+    }
+  };
+}
diff --git a/test/common/services/index.ts b/test/common/services/index.ts
@@ -14,6 +14,7 @@ import { KibanaServerProvider } from './kibana_server';
 import { RetryProvider } from './retry';
 import { RandomnessProvider } from './randomness';
 import { SecurityServiceProvider } from './security';
+import { EsDeleteAllIndicesProvider } from './es_delete_all_indices';
 
 export const services = {
   deployment: DeploymentProvider,
@@ -24,4 +25,5 @@ export const services = {
   retry: RetryProvider,
   randomness: RandomnessProvider,
   security: SecurityServiceProvider,
+  esDeleteAllIndices: EsDeleteAllIndicesProvider,
 };