Move src/legacy/server/keystore to src/cli (#83483)

Currently keystore parsing is in the legacy http server folder.
Keystore references end in src/cli so instead of migrating to
core/server the I opted for the closest fit in the CLI folder.

Closes #52107
This commit is contained in:
Jonathan Budzenski 2020-11-17 09:19:46 -06:00 committed by GitHub
parent 8b658fbcd2
commit d0441e1fee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 10 additions and 10 deletions

2
.github/CODEOWNERS vendored
View file

@ -158,7 +158,7 @@
/packages/kbn-ui-shared-deps/ @elastic/kibana-operations
/packages/kbn-es-archiver/ @elastic/kibana-operations
/packages/kbn-utils/ @elastic/kibana-operations
/src/legacy/server/keystore/ @elastic/kibana-operations
/src/cli/keystore/ @elastic/kibana-operations
/src/legacy/server/warnings/ @elastic/kibana-operations
/.ci/es-snapshots/ @elastic/kibana-operations
/vars/ @elastic/kibana-operations

View file

@ -19,7 +19,7 @@
import { set } from '@elastic/safer-lodash-set';
import { Keystore } from '../../legacy/server/keystore';
import { Keystore } from '../keystore';
import { getKeystore } from '../../cli_keystore/get_keystore';
export function readKeystore(keystorePath = getKeystore()) {

View file

@ -20,8 +20,8 @@
import path from 'path';
import { readKeystore } from './read_keystore';
jest.mock('../../legacy/server/keystore');
import { Keystore } from '../../legacy/server/keystore';
jest.mock('../keystore');
import { Keystore } from '../keystore';
describe('cli/serve/read_keystore', () => {
beforeEach(() => {

View file

@ -27,7 +27,7 @@ import { getConfigPath } from '@kbn/utils';
import { IS_KIBANA_DISTRIBUTABLE } from '../../legacy/utils';
import { fromRoot } from '../../core/server/utils';
import { bootstrap } from '../../core/server';
import { readKeystore } from './read_keystore';
import { readKeystore } from '../keystore/read_keystore';
function canRequire(path) {
try {

View file

@ -39,7 +39,7 @@ jest.mock('fs', () => ({
import sinon from 'sinon';
import { PassThrough } from 'stream';
import { Keystore } from '../legacy/server/keystore';
import { Keystore } from '../cli/keystore';
import { add } from './add';
import { Logger } from '../cli_plugin/lib/logger';
import * as prompt from './utils/prompt';

View file

@ -21,7 +21,7 @@ import _ from 'lodash';
import { pkg } from '../core/server/utils';
import Command from '../cli/command';
import { Keystore } from '../legacy/server/keystore';
import { Keystore } from '../cli/keystore';
import { createCli } from './create';
import { listCli } from './list';

View file

@ -38,7 +38,7 @@ jest.mock('fs', () => ({
import sinon from 'sinon';
import { Keystore } from '../legacy/server/keystore';
import { Keystore } from '../cli/keystore';
import { create } from './create';
import { Logger } from '../cli_plugin/lib/logger';
import * as prompt from './utils/prompt';

View file

@ -36,7 +36,7 @@ jest.mock('fs', () => ({
}));
import sinon from 'sinon';
import { Keystore } from '../legacy/server/keystore';
import { Keystore } from '../cli//keystore';
import { list } from './list';
import { Logger } from '../cli_plugin/lib/logger';

View file

@ -30,7 +30,7 @@ jest.mock('fs', () => ({
import sinon from 'sinon';
import { Keystore } from '../legacy/server/keystore';
import { Keystore } from '../cli/keystore';
import { remove } from './remove';
describe('Kibana keystore', () => {