[console] adding generated spec files for xpack endpoints and adjusting code to…

src/core_plugins/console/api_server/spec/index.js

@@ -23,11 +23,11 @@ import { readFileSync } from 'fs';
 import { merge } from 'lodash';
 
 const extensionSpecFilePaths = [];
-export function getSpec() {
-  const generatedFiles = glob.sync(join(__dirname, 'generated', '*.json'));
-  const overrideFiles = glob.sync(join(__dirname, 'overrides', '*.json'));
+function _getSpec(dirname = __dirname) {
+  const generatedFiles = glob.sync(join(dirname, 'generated', '*.json'));
+  const overrideFiles = glob.sync(join(dirname, 'overrides', '*.json'));
 
-  const result = generatedFiles.reduce((acc, file) => {
+  return generatedFiles.reduce((acc, file) => {
     const overrideFile = overrideFiles.find(f => basename(f) === basename(file));
     const loadedSpec = JSON.parse(readFileSync(file, 'utf8'));
     if (overrideFile) {
@@ -45,11 +45,11 @@ export function getSpec() {
 
     return { ...acc, ...spec };
   }, {});
+}
+export function getSpec() {
+  const result = _getSpec();
   extensionSpecFilePaths.forEach((extensionSpecFilePath) => {
-    const extensionFiles = glob.sync(join(extensionSpecFilePath, '*.json'));
-    extensionFiles.forEach((extensionFile) => {
-      merge(result, JSON.parse(readFileSync(extensionFile, 'utf8')));
-    });
+    merge(result, _getSpec(extensionSpecFilePath));
   });
   return result;
 }

src/core_plugins/console/public/src/autocomplete/body_completer.js

@@ -201,7 +201,7 @@ function compileDescription(description, compilingContext) {
 
 function compileParametrizedValue(value, compilingContext, template) {
   value = value.substr(1, value.length - 2).toLowerCase();
-  let component = compilingContext.parametrizedComponentFactories[value];
+  let component = compilingContext.parametrizedComponentFactories.getComponent(value, true);
   if (!component) {
     throw new Error('no factory found for \'' + value + '\'');
   }

src/core_plugins/console/public/src/autocomplete/components/url_pattern_matcher.js

@@ -44,7 +44,9 @@ export class UrlPatternMatcher {
     ['HEAD', 'GET', 'PUT', 'POST', 'DELETE'].forEach((method) => {
       this[method] = {
         rootComponent: new SharedComponent('ROOT'),
-        parametrizedComponentFactories: parametrizedComponentFactories || {}
+        parametrizedComponentFactories: parametrizedComponentFactories || {
+          getComponent: () => {}
+        }
       };
     });
   }
@@ -87,7 +89,7 @@ export class UrlPatternMatcher {
                 );
                 c = new SharedComponent(part);
               }
-            } else if ((c = this[method].parametrizedComponentFactories[part])) {
+            } else if ((c = this[method].parametrizedComponentFactories.getComponent(part))) {
               // c is a f
               c = c(part, activeComponent);
             } else {

src/core_plugins/console/public/src/controllers/sense_controller.js

@@ -64,7 +64,9 @@ module.controller('SenseController', function SenseController(Private, $scope, $
       const position = requests[0].range.end;
       position.column = position.column - 1;
       const endpoint = getEndpointFromPosition(input, position);
-      if (endpoint && endpoint.documentation) {
+      if (endpoint
+        && endpoint.documentation
+        && endpoint.documentation.indexOf('http') !== -1) {
         $scope.documentation = endpoint.documentation.replace('master', DOC_LINK_VERSION);
         $scope.$apply();
       } else {

src/core_plugins/console/public/src/kb.js

@@ -32,7 +32,17 @@ import Api from './kb/api';
 let ACTIVE_API = new Api();
 const isNotAnIndexName = name => name[0] === '_' && name !== '_all';
 
+const idAutocompleteComponentFactory = (name, parent) => {
+  return new IdAutocompleteComponent(name, parent);
+};
 const parametrizedComponentFactories = {
+  getComponent: function (name, parent, provideDefault) {
+    if (this[name]) {
+      return this[name];
+    } else if (provideDefault) {
+      return idAutocompleteComponentFactory;
+    }
+  },
   index: function (name, parent) {
     if (isNotAnIndexName(name)) return;
     return new IndexAutocompleteComponent(name, parent, false);
@@ -48,13 +58,13 @@ const parametrizedComponentFactories = {
     return new TypeAutocompleteComponent(name, parent, true);
   },
   id: function (name, parent) {
-    return new IdAutocompleteComponent(name, parent);
+    return idAutocompleteComponentFactory(name, parent);
   },
   task_id: function (name, parent) {
-    return new IdAutocompleteComponent(name, parent);
+    return idAutocompleteComponentFactory(name, parent);
   },
   ids: function (name, parent) {
-    return new IdAutocompleteComponent(name, parent, true);
+    return idAutocompleteComponentFactory(name, parent, true);
   },
   fields: function (name, parent) {
     return new FieldAutocompleteComponent(name, parent, true);

src/core_plugins/console/public/tests/src/url_autocomplete.test.js

@@ -304,6 +304,9 @@ describe('Url autocomplete', () => {
       p: function (name, parent) {
         return new ListComponent(name, ['g1', 'g2'], parent);
       },
+      getComponent(name) {
+        return this[name];
+      }
     };
 
     patternsTest(

x-pack/plugins/console_extensions/index.js

@@ -29,7 +29,7 @@ export function consoleExtensions(kibana) {
         server.plugins.console.addExtensionSpecFilePath
       ) {
         server.plugins.console.addExtensionSpecFilePath(
-          join(__dirname, 'spec')
+          join(__dirname, 'spec/')
         );
       } else {
         console.warn(

x-pack/plugins/console_extensions/spec/generated/xpack.graph.explore.json

@@ -0,0 +1,17 @@
+{
+  "xpack.graph.explore": {
+    "url_params": {
+      "routing": "",
+      "timeout": ""
+    },
+    "methods": [
+      "GET",
+      "POST"
+    ],
+    "patterns": [
+      "{indices}/_xpack/graph/_explore",
+      "{indices}/{type}/_xpack/graph/_explore"
+    ],
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/graph-explore-api.html"
+  }
+}

x-pack/plugins/console_extensions/spec/generated/xpack.info.json

@@ -0,0 +1,14 @@
+{
+  "xpack.info": {
+    "url_params": {
+      "categories": []
+    },
+    "methods": [
+      "GET"
+    ],
+    "patterns": [
+      "_xpack"
+    ],
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/info-api.html"
+  }
+}

x-pack/plugins/console_extensions/spec/generated/xpack.license.delete.json

@@ -0,0 +1,11 @@
+{
+  "xpack.license.delete": {
+    "methods": [
+      "DELETE"
+    ],
+    "patterns": [
+      "_xpack/license"
+    ],
+    "documentation": "https://www.elastic.co/guide/en/x-pack/current/license-management.html"
+  }
+}

x-pack/plugins/console_extensions/spec/generated/xpack.license.get.json

@@ -0,0 +1,14 @@
+{
+  "xpack.license.get": {
+    "url_params": {
+      "local": "__flag__"
+    },
+    "methods": [
+      "GET"
+    ],
+    "patterns": [
+      "_xpack/license"
+    ],
+    "documentation": "https://www.elastic.co/guide/en/x-pack/current/license-management.html"
+  }
+}

x-pack/plugins/console_extensions/spec/generated/xpack.license.get_basic_status.json

@@ -0,0 +1,11 @@
+{
+  "xpack.license.get_basic_status": {
+    "methods": [
+      "GET"
+    ],
+    "patterns": [
+      "_xpack/license/basic_status"
+    ],
+    "documentation": "https://www.elastic.co/guide/en/x-pack/current/license-management.html"
+  }
+}

x-pack/plugins/console_extensions/spec/generated/xpack.license.get_trial_status.json

@@ -0,0 +1,11 @@
+{
+  "xpack.license.get_trial_status": {
+    "methods": [
+      "GET"
+    ],
+    "patterns": [
+      "_xpack/license/trial_status"
+    ],
+    "documentation": "https://www.elastic.co/guide/en/x-pack/current/license-management.html"
+  }
+}

x-pack/plugins/console_extensions/spec/generated/xpack.license.post.json

@@ -0,0 +1,15 @@
+{
+  "xpack.license.post": {
+    "url_params": {
+      "acknowledge": "__flag__"
+    },
+    "methods": [
+      "PUT",
+      "POST"
+    ],
+    "patterns": [
+      "_xpack/license"
+    ],
+    "documentation": "https://www.elastic.co/guide/en/x-pack/current/license-management.html"
+  }
+}

x-pack/plugins/console_extensions/spec/generated/xpack.license.post_start_basic.json

@@ -0,0 +1,14 @@
+{
+  "xpack.license.post_start_basic": {
+    "url_params": {
+      "acknowledge": "__flag__"
+    },
+    "methods": [
+      "POST"
+    ],
+    "patterns": [
+      "_xpack/license/start_basic"
+    ],
+    "documentation": "https://www.elastic.co/guide/en/x-pack/current/license-management.html"
+  }
+}

x-pack/plugins/console_extensions/spec/generated/xpack.license.post_start_trial.json

@@ -0,0 +1,15 @@
+{
+  "xpack.license.post_start_trial": {
+    "url_params": {
+      "type": "\"trial\"",
+      "acknowledge": "__flag__"
+    },
+    "methods": [
+      "POST"
+    ],
+    "patterns": [
+      "_xpack/license/start_trial"
+    ],
+    "documentation": "https://www.elastic.co/guide/en/x-pack/current/license-management.html"
+  }
+}

x-pack/plugins/console_extensions/spec/generated/xpack.migration.deprecations.json

@@ -0,0 +1,12 @@
+{
+  "xpack.migration.deprecations": {
+    "methods": [
+      "GET"
+    ],
+    "patterns": [
+      "_xpack/migration/deprecations",
+      "{indices}/_xpack/migration/deprecations"
+    ],
+    "documentation": "http://www.elastic.co/guide/en/migration/current/migration-api-deprecation.html"
+  }
+}

x-pack/plugins/console_extensions/spec/generated/xpack.migration.get_assistance.json

@@ -0,0 +1,22 @@
+{
+  "xpack.migration.get_assistance": {
+    "url_params": {
+      "allow_no_indices": "__flag__",
+      "expand_wildcards": [
+        "open",
+        "closed",
+        "none",
+        "all"
+      ],
+      "ignore_unavailable": "__flag__"
+    },
+    "methods": [
+      "GET"
+    ],
+    "patterns": [
+      "_xpack/migration/assistance",
+      "_xpack/migration/assistance/{indices}"
+    ],
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/migration-api-assistance.html"
+  }
+}

x-pack/plugins/console_extensions/spec/generated/xpack.migration.upgrade.json

@@ -0,0 +1,14 @@
+{
+  "xpack.migration.upgrade": {
+    "url_params": {
+      "wait_for_completion": "__flag__"
+    },
+    "methods": [
+      "POST"
+    ],
+    "patterns": [
+      "_xpack/migration/upgrade/{indices}"
+    ],
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/migration-api-upgrade.html"
+  }
+}

x-pack/plugins/console_extensions/spec/generated/xpack.ml.close_job.json

@@ -0,0 +1,16 @@
+{
+  "xpack.ml.close_job": {
+    "url_params": {
+      "allow_no_jobs": "__flag__",
+      "force": "__flag__",
+      "timeout": ""
+    },
+    "methods": [
+      "POST"
+    ],
+    "patterns": [
+      "_xpack/ml/anomaly_detectors/{job_id}/_close"
+    ],
+    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-close-job.html"
+  }
+}

x-pack/plugins/console_extensions/spec/generated/xpack.ml.delete_calendar.json

@@ -0,0 +1,10 @@
+{
+  "xpack.ml.delete_calendar": {
+    "methods": [
+      "DELETE"
+    ],
+    "patterns": [
+      "_xpack/ml/calendars/{calendar_id}"
+    ]
+  }
+}

x-pack/plugins/console_extensions/spec/generated/xpack.ml.delete_calendar_event.json

@@ -0,0 +1,10 @@
+{
+  "xpack.ml.delete_calendar_event": {
+    "methods": [
+      "DELETE"
+    ],
+    "patterns": [
+      "_xpack/ml/calendars/{calendar_id}/events/{event_id}"
+    ]
+  }
+}

x-pack/plugins/console_extensions/spec/generated/xpack.ml.delete_calendar_job.json

@@ -0,0 +1,10 @@
+{
+  "xpack.ml.delete_calendar_job": {
+    "methods": [
+      "DELETE"
+    ],
+    "patterns": [
+      "_xpack/ml/calendars/{calendar_id}/jobs/{job_id}"
+    ]
+  }
+}

x-pack/plugins/console_extensions/spec/generated/xpack.ml.delete_datafeed.json

@@ -0,0 +1,14 @@
+{
+  "xpack.ml.delete_datafeed": {
+    "url_params": {
+      "force": "__flag__"
+    },
+    "methods": [
+      "DELETE"
+    ],
+    "patterns": [
+      "_xpack/ml/datafeeds/{datafeed_id}"
+    ],
+    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-delete-datafeed.html"
+  }
+}

x-pack/plugins/console_extensions/spec/generated/xpack.ml.delete_expired_data.json

@@ -0,0 +1,10 @@
+{
+  "xpack.ml.delete_expired_data": {
+    "methods": [
+      "DELETE"
+    ],
+    "patterns": [
+      "_xpack/ml/_delete_expired_data"
+    ]
+  }
+}

x-pack/plugins/console_extensions/spec/generated/xpack.ml.delete_filter.json

@@ -0,0 +1,10 @@
+{
+  "xpack.ml.delete_filter": {
+    "methods": [
+      "DELETE"
+    ],
+    "patterns": [
+      "_xpack/ml/filters/{filter_id}"
+    ]
+  }
+}