Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 17, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 src/legacy/server/keystore/errors.js → src/cli/keystore/errors.js
View file
Open in desktop
File renamed without changes.
0 src/legacy/server/keystore/index.js → src/cli/keystore/index.js
View file
Open in desktop
File renamed without changes.
0 src/legacy/server/keystore/keystore.js → src/cli/keystore/keystore.js
View file
Open in desktop
File renamed without changes.
0 src/legacy/server/keystore/keystore.test.js → src/cli/keystore/keystore.test.js
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/cli/serve/read_keystore.js → src/cli/keystore/read_keystore.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
Expand Down
4 changes: 2 additions & 2 deletions src/cli/serve/read_keystore.test.js → src/cli/keystore/read_keystore.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(() => {
Expand Down
2 changes: 1 addition & 1 deletion src/cli/serve/serve.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/cli_keystore/add.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/cli_keystore/cli_keystore.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/cli_keystore/create.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/cli_keystore/list.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion src/cli_keystore/remove.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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', () => {
Expand Down