[kbn/test/es] remove unnecessary es user management logic

elastic · Jun 17, 2021 · 217d4c9 · 217d4c9
1 parent b5f0bc9
commit 217d4c9
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 235 deletions.
diff --git a/packages/kbn-test/src/functional_tests/lib/auth.ts b/packages/kbn-test/src/functional_tests/lib/auth.ts
diff --git a/packages/kbn-test/src/functional_tests/lib/run_elasticsearch.ts b/packages/kbn-test/src/functional_tests/lib/run_elasticsearch.ts
@@ -12,8 +12,6 @@ import { KIBANA_ROOT } from './paths';
 import type { Config } from '../../functional_test_runner/';
 import { createTestEsCluster } from '../../es';
 
-import { setupUsers, DEFAULT_SUPERUSER_PASS } from './auth';
-
 interface RunElasticsearchOptions {
   log: ToolingLog;
   esFrom: string;
@@ -34,9 +32,7 @@ export async function runElasticsearch({
 
   const cluster = createTestEsCluster({
     port: config.get('servers.elasticsearch.port'),
-    password: isSecurityEnabled
-      ? DEFAULT_SUPERUSER_PASS
-      : config.get('servers.elasticsearch.password'),
+    password: isSecurityEnabled ? 'changeme' : config.get('servers.elasticsearch.password'),
     license,
     log,
     basePath: resolve(KIBANA_ROOT, '.es'),
@@ -49,22 +45,5 @@ export async function runElasticsearch({
 
   await cluster.start();
 
-  if (isSecurityEnabled) {
-    await setupUsers({
-      log,
-      esPort: config.get('servers.elasticsearch.port'),
-      updates: [config.get('servers.elasticsearch'), config.get('servers.kibana')],
-      protocol: config.get('servers.elasticsearch').protocol,
-      caPath: getRelativeCertificateAuthorityPath(config.get('kbnTestServer.serverArgs')),
-    });
-  }
-
   return cluster;
 }
-
-function getRelativeCertificateAuthorityPath(esConfig: string[] = []) {
-  const caConfig = esConfig.find(
-    (config) => config.indexOf('--elasticsearch.ssl.certificateAuthorities') === 0
-  );
-  return caConfig ? caConfig.split('=')[1] : undefined;
-}
diff --git a/packages/kbn-test/src/index.ts b/packages/kbn-test/src/index.ts
@@ -29,8 +29,6 @@ export { esTestConfig, createTestEsCluster } from './es';
 
 export { kbnTestConfig, kibanaServerTestUser, kibanaTestUser, adminTestUser } from './kbn';
 
-export { setupUsers, DEFAULT_SUPERUSER_PASS } from './functional_tests/lib/auth';
-
 export { readConfigFile } from './functional_test_runner/lib/config/read_config_file';
 
 export { runFtrCli } from './functional_test_runner/cli';

diff --git a/src/core/test_helpers/kbn_server.ts b/src/core/test_helpers/kbn_server.ts
@@ -7,15 +7,7 @@
  */
 
 import { ToolingLog, REPO_ROOT } from '@kbn/dev-utils';
-import {
-  createTestEsCluster,
-  DEFAULT_SUPERUSER_PASS,
-  esTestConfig,
-  kbnTestConfig,
-  kibanaServerTestUser,
-  kibanaTestUser,
-  setupUsers,
-} from '@kbn/test';
+import { createTestEsCluster, esTestConfig, kibanaServerTestUser, kibanaTestUser } from '@kbn/test';
 import { defaultsDeep } from 'lodash';
 import { resolve } from 'path';
 import { BehaviorSubject } from 'rxjs';
@@ -208,7 +200,7 @@ export function createTestServers({
     defaultsDeep({}, settings.es ?? {}, {
       log,
       license,
-      password: license === 'trial' ? DEFAULT_SUPERUSER_PASS : undefined,
+      password: license === 'trial' ? 'changeme' : undefined,
     })
   );
 
@@ -224,19 +216,7 @@ export function createTestServers({
       await es.start();
 
       if (['gold', 'trial'].includes(license)) {
-        await setupUsers({
-          log,
-          esPort: esTestConfig.getUrlParts().port,
-          updates: [
-            ...usersToBeAdded,
-            // user elastic
-            esTestConfig.getUrlParts() as { username: string; password: string },
-            // user kibana
-            kbnTestConfig.getUrlParts() as { username: string; password: string },
-          ],
-        });
-
-        // Override provided configs, we know what the elastic user is now
+        // Override provided configs
         kbnSettings.elasticsearch = {
           hosts: [esTestConfig.getUrl()],
           username: kibanaServerTestUser.username,