github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 17:59:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

chore(NA): merge and solve conflicts with upstream (#52972)

Browse source
This commit is contained in:
Tiago Costa 2019-12-13 04:25:21 +00:00 • committed by GitHub
parent bf2db8d5a6
commit 6ee092e8ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 30 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -152,7 +152,7 @@
"check-disk-space": "^2.1.0",
"chokidar": "3.2.1",
"color": "1.0.3",
"commander": "2.20.0",
"commander": "3.0.2",
"compare-versions": "3.5.1",
"core-js": "^3.2.1",
"css-loader": "2.1.1",

25
src/cli_keystore/cli_keystore.js
View file

@ -17,6 +17,7 @@
* under the License.
*/
import _ from 'lodash';
import { join } from 'path';
import { pkg } from '../core/server/utils';
@ -32,6 +33,7 @@ import { listCli } from './list';
import { addCli } from './add';
import { removeCli } from './remove';
const argv = process.env.kbnWorkerArgv ? JSON.parse(process.env.kbnWorkerArgv) : process.argv.slice();
const program = new Command('bin/kibana-keystore');
program
@ -43,8 +45,25 @@ listCli(program, keystore);
addCli(program, keystore);
removeCli(program, keystore);
program.parse(process.argv);
program
.command('help <command>')
.description('get the help for a specific command')
.action(function (cmdName) {
const cmd = _.find(program.commands, { _name: cmdName });
if (!cmd) return program.error(`unknown command ${cmdName}`);
cmd.help();
});
if (!program.args.length) {
program.help();
program
.command('*', null, { noHelp: true })
.action(function (cmd) {
program.error(`unknown command ${cmd}`);
});
// check for no command name
const subCommand = argv[2] && !String(argv[2][0]).match(/^-|^\.|\//);
if (!subCommand) {
program.defaultHelp();
}
program.parse(process.argv);

2
x-pack/package.json
View file

@ -114,7 +114,7 @@
"chalk": "^2.4.2",
"chance": "1.0.18",
"cheerio": "0.22.0",
"commander": "2.20.0",
"commander": "3.0.2",
"copy-webpack-plugin": "^5.0.4",
"cypress": "^3.6.1",
"cypress-multi-reporters": "^1.2.3",

7
yarn.lock
View file

@ -8306,7 +8306,12 @@ commander@2.17.x, commander@~2.17.1:
resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==
commander@2.20.0, commander@^2.13.0, commander@^2.15.1, commander@^2.16.0, commander@^2.19.0, commander@^2.20.0, commander@^2.7.1:
commander@3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/commander/-/commander-3.0.2.tgz#6837c3fb677ad9933d1cfba42dd14d5117d6b39e"
integrity sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow==
commander@^2.13.0, commander@^2.15.1, commander@^2.16.0, commander@^2.19.0, commander@^2.20.0, commander@^2.7.1:
version "2.20.0"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==