Use new platform CLI as the main entry point.

elastic · Sep 7, 2018 · a5989d4 · a5989d4
1 parent 3d6de7c
commit a5989d4
Show file tree

Hide file tree

Showing 48 changed files with 734 additions and 687 deletions.
diff --git a/bin/kibana b/bin/kibana
@@ -21,4 +21,4 @@ if [ ! -x "$NODE" ]; then
   exit 1
 fi
 
-NODE_ENV=production exec "${NODE}" $NODE_OPTIONS --no-warnings "${DIR}/src/cli" ${@}
+NODE_ENV=production exec "${NODE}" $NODE_OPTIONS --no-warnings "${DIR}/src/core/cli" ${@}
diff --git a/bin/kibana.bat b/bin/kibana.bat
@@ -14,7 +14,7 @@ If Not Exist "%NODE%" (
   Exit /B 1
 )
 
-"%NODE%" %NODE_OPTIONS% --no-warnings "%DIR%\src\cli" %*
+"%NODE%" %NODE_OPTIONS% --no-warnings "%DIR%\src\core\cli" %*
 
 :finally
 

diff --git a/package.json b/package.json
@@ -198,6 +198,7 @@
     "whatwg-fetch": "^2.0.3",
     "wreck": "12.4.0",
     "x-pack": "link:x-pack",
+    "yargs": "^12.0.1",
     "yauzl": "2.7.0"
   },
   "devDependencies": {
@@ -222,6 +223,7 @@
     "@types/fetch-mock": "^5.12.2",
     "@types/getopts": "^2.0.0",
     "@types/glob": "^5.0.35",
+    "@types/hapi": "^13.0.38",
     "@types/hapi-latest": "npm:@types/hapi@17.0.12",
     "@types/has-ansi": "^3.0.0",
     "@types/jest": "^22.2.3",
@@ -241,6 +243,7 @@
     "@types/strip-ansi": "^3.0.0",
     "@types/supertest": "^2.0.5",
     "@types/type-detect": "^4.0.1",
+    "@types/yargs": "^11.1.0",
     "angular-mocks": "1.4.7",
     "babel-eslint": "8.1.2",
     "babel-jest": "^22.4.3",
@@ -336,5 +339,8 @@
   "engines": {
     "node": "8.11.4",
     "yarn": "^1.6.0"
+  },
+  "yargs": {
+    "dot-notation": false
   }
 }
diff --git a/scripts/kibana.js b/scripts/kibana.js
@@ -18,4 +18,4 @@
  */
 
 require('../src/setup_node_env');
-require('../src/cli/cli');
+require('../src/core/cli');
diff --git a/src/cli/cli.js b/src/cli/cli.js
diff --git a/src/cli/serve/integration_tests/__fixtures__/invalid_config.yml b/src/cli/serve/integration_tests/__fixtures__/invalid_config.yml
diff --git a/src/cli/serve/integration_tests/__fixtures__/reload_logging_config/kibana.test.yml b/src/cli/serve/integration_tests/__fixtures__/reload_logging_config/kibana.test.yml
diff --git a/src/cli/serve/integration_tests/__snapshots__/invalid_config.test.js.snap b/src/cli/serve/integration_tests/__snapshots__/invalid_config.test.js.snap
diff --git a/src/cli/serve/integration_tests/__snapshots__/reload_logging_config.test.js.snap b/src/cli/serve/integration_tests/__snapshots__/reload_logging_config.test.js.snap
diff --git a/src/cli/serve/integration_tests/invalid_config.test.js b/src/cli/serve/integration_tests/invalid_config.test.js
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,4 +21,4 @@ if [ ! -x "$NODE" ]; then @@
       exit 1
     fi
-    NODE_ENV=production exec "${NODE}" $NODE_OPTIONS --no-warnings "${DIR}/src/cli" ${@}
+    NODE_ENV=production exec "${NODE}" $NODE_OPTIONS --no-warnings "${DIR}/src/core/cli" ${@}