Update code generation (#969)

* Updated code generation scripts to use the new spec

* API generation

* Fix bad link

Author: delvedor

api/api/bulk.js

@@ -10,6 +10,7 @@
 function buildBulk (opts) {
   // eslint-disable-next-line no-unused-vars
   const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+<<<<<<< HEAD
   /**
    * Perform a [bulk](http://www.elastic.co/guide/en/elasticsearch/reference/master/docs-bulk.html) request
    *
@@ -26,6 +27,8 @@ function buildBulk (opts) {
    * @param {string} pipeline - The pipeline id to preprocess incoming documents with
    * @param {object} body - The operation definition and data (action-data pairs), separated by newlines
    */
+=======
+>>>>>>> 69247496... Update code generation (#969)
 
   const acceptedQuerystring = [
     'wait_for_active_shards',
@@ -56,6 +59,11 @@ function buildBulk (opts) {
     filterPath: 'filter_path'
   }
 
+  /**
+   * Perform a bulk request
+   * Allows to perform multiple index/update/delete operations in a single request.
+   * https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-bulk.html
+   */
   return function bulk (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
@@ -90,10 +98,6 @@ function buildBulk (opts) {
     var { method, body, index, type, ...querystring } = params
     querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
-    if (method == null) {
-      method = 'POST'
-    }
-
     var ignore = options.ignore
     if (typeof ignore === 'number') {
       options.ignore = [ignore]
@@ -102,10 +106,13 @@ function buildBulk (opts) {
     var path = ''
 
     if ((index) != null && (type) != null) {
+      if (method == null) method = 'POST'
       path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type) + '/' + '_bulk'
     } else if ((index) != null) {
+      if (method == null) method = 'POST'
       path = '/' + encodeURIComponent(index) + '/' + '_bulk'
     } else {
+      if (method == null) method = 'POST'
       path = '/' + '_bulk'
     }
 

api/api/cat.aliases.js

@@ -10,6 +10,7 @@
 function buildCatAliases (opts) {
   // eslint-disable-next-line no-unused-vars
   const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+<<<<<<< HEAD
   /**
    * Perform a [cat.aliases](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-alias.html) request
    *
@@ -22,6 +23,8 @@ function buildCatAliases (opts) {
    * @param {list} s - Comma-separated list of column names or column aliases to sort by
    * @param {boolean} v - Verbose mode. Display column headers
    */
+=======
+>>>>>>> 69247496... Update code generation (#969)
 
   const acceptedQuerystring = [
     'format',
@@ -44,6 +47,11 @@ function buildCatAliases (opts) {
     filterPath: 'filter_path'
   }
 
+  /**
+   * Perform a cat.aliases request
+   * Shows information about currently configured aliases to indices including filter and routing infos.
+   * https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-alias.html
+   */
   return function catAliases (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
@@ -56,12 +64,6 @@ function buildCatAliases (opts) {
       options = {}
     }
 
-    // check required parameters
-    if (params.body != null) {
-      const err = new ConfigurationError('This API does not require a body')
-      return handleError(err, callback)
-    }
-
     // validate headers object
     if (options.headers != null && typeof options.headers !== 'object') {
       const err = new ConfigurationError(`Headers should be an object, instead got: ${typeof options.headers}`)
@@ -72,10 +74,6 @@ function buildCatAliases (opts) {
     var { method, body, name, ...querystring } = params
     querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
-    if (method == null) {
-      method = 'GET'
-    }
-
     var ignore = options.ignore
     if (typeof ignore === 'number') {
       options.ignore = [ignore]
@@ -84,8 +82,10 @@ function buildCatAliases (opts) {
     var path = ''
 
     if ((name) != null) {
+      if (method == null) method = 'GET'
       path = '/' + '_cat' + '/' + 'aliases' + '/' + encodeURIComponent(name)
     } else {
+      if (method == null) method = 'GET'
       path = '/' + '_cat' + '/' + 'aliases'
     }
 

api/api/cat.allocation.js

@@ -10,6 +10,7 @@
 function buildCatAllocation (opts) {
   // eslint-disable-next-line no-unused-vars
   const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+<<<<<<< HEAD
   /**
    * Perform a [cat.allocation](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-allocation.html) request
    *
@@ -23,6 +24,8 @@ function buildCatAllocation (opts) {
    * @param {list} s - Comma-separated list of column names or column aliases to sort by
    * @param {boolean} v - Verbose mode. Display column headers
    */
+=======
+>>>>>>> 69247496... Update code generation (#969)
 
   const acceptedQuerystring = [
     'format',
@@ -46,6 +49,11 @@ function buildCatAllocation (opts) {
     filterPath: 'filter_path'
   }
 
+  /**
+   * Perform a cat.allocation request
+   * Provides a snapshot of how many shards are allocated to each data node and how much disk space they are using.
+   * https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-allocation.html
+   */
   return function catAllocation (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
@@ -58,12 +66,6 @@ function buildCatAllocation (opts) {
       options = {}
     }
 
-    // check required parameters
-    if (params.body != null) {
-      const err = new ConfigurationError('This API does not require a body')
-      return handleError(err, callback)
-    }
-
     // validate headers object
     if (options.headers != null && typeof options.headers !== 'object') {
       const err = new ConfigurationError(`Headers should be an object, instead got: ${typeof options.headers}`)
@@ -74,10 +76,6 @@ function buildCatAllocation (opts) {
     var { method, body, nodeId, node_id, ...querystring } = params
     querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
-    if (method == null) {
-      method = 'GET'
-    }
-
     var ignore = options.ignore
     if (typeof ignore === 'number') {
       options.ignore = [ignore]
@@ -86,8 +84,10 @@ function buildCatAllocation (opts) {
     var path = ''
 
     if ((node_id || nodeId) != null) {
+      if (method == null) method = 'GET'
       path = '/' + '_cat' + '/' + 'allocation' + '/' + encodeURIComponent(node_id || nodeId)
     } else {
+      if (method == null) method = 'GET'
       path = '/' + '_cat' + '/' + 'allocation'
     }
 

api/api/cat.count.js

@@ -10,6 +10,7 @@
 function buildCatCount (opts) {
   // eslint-disable-next-line no-unused-vars
   const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+<<<<<<< HEAD
   /**
    * Perform a [cat.count](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-count.html) request
    *
@@ -22,6 +23,8 @@ function buildCatCount (opts) {
    * @param {list} s - Comma-separated list of column names or column aliases to sort by
    * @param {boolean} v - Verbose mode. Display column headers
    */
+=======
+>>>>>>> 69247496... Update code generation (#969)
 
   const acceptedQuerystring = [
     'format',
@@ -44,6 +47,11 @@ function buildCatCount (opts) {
     filterPath: 'filter_path'
   }
 
+  /**
+   * Perform a cat.count request
+   * Provides quick access to the document count of the entire cluster, or individual indices.
+   * https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-count.html
+   */
   return function catCount (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
@@ -56,12 +64,6 @@ function buildCatCount (opts) {
       options = {}
     }
 
-    // check required parameters
-    if (params.body != null) {
-      const err = new ConfigurationError('This API does not require a body')
-      return handleError(err, callback)
-    }
-
     // validate headers object
     if (options.headers != null && typeof options.headers !== 'object') {
       const err = new ConfigurationError(`Headers should be an object, instead got: ${typeof options.headers}`)
@@ -72,10 +74,6 @@ function buildCatCount (opts) {
     var { method, body, index, ...querystring } = params
     querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
-    if (method == null) {
-      method = 'GET'
-    }
-
     var ignore = options.ignore
     if (typeof ignore === 'number') {
       options.ignore = [ignore]
@@ -84,8 +82,10 @@ function buildCatCount (opts) {
     var path = ''
 
     if ((index) != null) {
+      if (method == null) method = 'GET'
       path = '/' + '_cat' + '/' + 'count' + '/' + encodeURIComponent(index)
     } else {
+      if (method == null) method = 'GET'
       path = '/' + '_cat' + '/' + 'count'
     }
 

api/api/cat.fielddata.js

@@ -10,6 +10,7 @@
 function buildCatFielddata (opts) {
   // eslint-disable-next-line no-unused-vars
   const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+<<<<<<< HEAD
   /**
    * Perform a [cat.fielddata](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-fielddata.html) request
    *
@@ -24,6 +25,8 @@ function buildCatFielddata (opts) {
    * @param {boolean} v - Verbose mode. Display column headers
    * @param {list} fields - A comma-separated list of fields to return in the output
    */
+=======
+>>>>>>> 69247496... Update code generation (#969)
 
   const acceptedQuerystring = [
     'format',
@@ -48,6 +51,11 @@ function buildCatFielddata (opts) {
     filterPath: 'filter_path'
   }
 
+  /**
+   * Perform a cat.fielddata request
+   * Shows how much heap memory is currently being used by fielddata on every data node in the cluster.
+   * https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-fielddata.html
+   */
   return function catFielddata (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
@@ -60,12 +68,6 @@ function buildCatFielddata (opts) {
       options = {}
     }
 
-    // check required parameters
-    if (params.body != null) {
-      const err = new ConfigurationError('This API does not require a body')
-      return handleError(err, callback)
-    }
-
     // validate headers object
     if (options.headers != null && typeof options.headers !== 'object') {
       const err = new ConfigurationError(`Headers should be an object, instead got: ${typeof options.headers}`)
@@ -76,10 +78,6 @@ function buildCatFielddata (opts) {
     var { method, body, fields, ...querystring } = params
     querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
-    if (method == null) {
-      method = 'GET'
-    }
-
     var ignore = options.ignore
     if (typeof ignore === 'number') {
       options.ignore = [ignore]
@@ -88,8 +86,10 @@ function buildCatFielddata (opts) {
     var path = ''
 
     if ((fields) != null) {
+      if (method == null) method = 'GET'
       path = '/' + '_cat' + '/' + 'fielddata' + '/' + encodeURIComponent(fields)
     } else {
+      if (method == null) method = 'GET'
       path = '/' + '_cat' + '/' + 'fielddata'
     }
 

api/api/cat.health.js

@@ -10,6 +10,7 @@
 function buildCatHealth (opts) {
   // eslint-disable-next-line no-unused-vars
   const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+<<<<<<< HEAD
   /**
    * Perform a [cat.health](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-health.html) request
    *
@@ -22,6 +23,8 @@ function buildCatHealth (opts) {
    * @param {boolean} ts - Set to false to disable timestamping
    * @param {boolean} v - Verbose mode. Display column headers
    */
+=======
+>>>>>>> 69247496... Update code generation (#969)
 
   const acceptedQuerystring = [
     'format',
@@ -45,6 +48,11 @@ function buildCatHealth (opts) {
     filterPath: 'filter_path'
   }
 
+  /**
+   * Perform a cat.health request
+   * Returns a concise representation of the cluster health.
+   * https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-health.html
+   */
   return function catHealth (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
@@ -57,12 +65,6 @@ function buildCatHealth (opts) {
       options = {}
     }
 
-    // check required parameters
-    if (params.body != null) {
-      const err = new ConfigurationError('This API does not require a body')
-      return handleError(err, callback)
-    }
-
     // validate headers object
     if (options.headers != null && typeof options.headers !== 'object') {
       const err = new ConfigurationError(`Headers should be an object, instead got: ${typeof options.headers}`)
@@ -73,17 +75,14 @@ function buildCatHealth (opts) {
     var { method, body, ...querystring } = params
     querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
-    if (method == null) {
-      method = 'GET'
-    }
-
     var ignore = options.ignore
     if (typeof ignore === 'number') {
       options.ignore = [ignore]
     }
 
     var path = ''
 
+    if (method == null) method = 'GET'
     path = '/' + '_cat' + '/' + 'health'
 
     // build request object