legacy utils cleanup (#76608)

* move prompt to cli_keystore * move binder to cli * remove unused path_contains Co-authored-by: Elastic Machine <[email protected]>
elastic · Sep 9, 2020 · 7955a02 · 7955a02
1 parent c7dac80
commit 7955a02
Show file tree

Hide file tree

Showing 12 changed files with 5 additions and 31 deletions.
diff --git a/src/legacy/utils/binder.ts → src/cli/cluster/binder.ts b/src/legacy/utils/binder.ts → src/cli/cluster/binder.ts
diff --git a/src/legacy/utils/binder_for.ts → src/cli/cluster/binder_for.ts b/src/legacy/utils/binder_for.ts → src/cli/cluster/binder_for.ts
diff --git a/src/cli/cluster/worker.ts b/src/cli/cluster/worker.ts
@@ -21,7 +21,7 @@ import _ from 'lodash';
 import cluster from 'cluster';
 import { EventEmitter } from 'events';
 
-import { BinderFor } from '../../legacy/utils/binder_for';
+import { BinderFor } from './binder_for';
 import { fromRoot } from '../../core/server/utils';
 
 const cliPath = fromRoot('src/cli');

diff --git a/src/cli_keystore/add.js b/src/cli_keystore/add.js
@@ -18,7 +18,7 @@
  */
 
 import { Logger } from '../cli_plugin/lib/logger';
-import { confirm, question } from '../legacy/server/utils';
+import { confirm, question } from './utils';
 import { createPromiseFromStreams, createConcatStream } from '../core/server/utils';
 
 /**

diff --git a/src/cli_keystore/add.test.js b/src/cli_keystore/add.test.js
@@ -42,7 +42,7 @@ import { PassThrough } from 'stream';
 import { Keystore } from '../legacy/server/keystore';
 import { add } from './add';
 import { Logger } from '../cli_plugin/lib/logger';
-import * as prompt from '../legacy/server/utils/prompt';
+import * as prompt from './utils/prompt';
 
 describe('Kibana keystore', () => {
  describe('add', () => {

diff --git a/src/cli_keystore/create.js b/src/cli_keystore/create.js
@@ -18,7 +18,7 @@
  */
 
 import { Logger } from '../cli_plugin/lib/logger';
-import { confirm } from '../legacy/server/utils';
+import { confirm } from './utils';
 
 export async function create(keystore, command, options) {
  const logger = new Logger(options);

diff --git a/src/cli_keystore/create.test.js b/src/cli_keystore/create.test.js
@@ -41,7 +41,7 @@ import sinon from 'sinon';
 import { Keystore } from '../legacy/server/keystore';
 import { create } from './create';
 import { Logger } from '../cli_plugin/lib/logger';
-import * as prompt from '../legacy/server/utils/prompt';
+import * as prompt from './utils/prompt';
 
 describe('Kibana keystore', () => {
  describe('create', () => {

diff --git a/src/legacy/server/utils/index.js → src/cli_keystore/utils/index.js b/src/legacy/server/utils/index.js → src/cli_keystore/utils/index.js
diff --git a/src/legacy/server/utils/prompt.js → src/cli_keystore/utils/prompt.js b/src/legacy/server/utils/prompt.js → src/cli_keystore/utils/prompt.js
diff --git a/src/legacy/server/utils/prompt.test.js → src/cli_keystore/utils/prompt.test.js b/src/legacy/server/utils/prompt.test.js → src/cli_keystore/utils/prompt.test.js
diff --git a/src/legacy/utils/index.js b/src/legacy/utils/index.js
@@ -17,8 +17,6 @@
  * under the License.
  */
 
-export { BinderBase } from './binder';
-export { BinderFor } from './binder_for';
 export { deepCloneWithBuffers } from './deep_clone_with_buffers';
 export { unset } from './unset';
 export { IS_KIBANA_DISTRIBUTABLE } from './artifact_type';

diff --git a/src/legacy/utils/path_contains.js b/src/legacy/utils/path_contains.js