Bumped v5.6.16-rc.3

* Added User-Agent header

* Updated test

* Updated user-agent format

* Updated test

.ci/docker-compose.yml

@@ -22,7 +22,7 @@ services:
       - elasticsearch-oss
 
   elasticsearch-oss:
-    image: docker.elastic.co/elasticsearch/elasticsearch:${ELASTICSEARCH_VERSION:-7.0.0-beta1}
+    image: docker.elastic.co/elasticsearch/elasticsearch:${ELASTICSEARCH_VERSION:-5.6.15}
     volumes:
       - esvol:/tmp
     networks:
@@ -32,63 +32,10 @@ services:
       - "repositories.url.allowed_urls=http://snapshot.*"
       - node.attr.testattr=test
       - bootstrap.memory_lock=false
+      - "xpack.security.enabled=false"
       - "discovery.type=single-node"
       - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
-
-  client-platinum:
-    image: docker.elastic.co/clients/elasticsearch-js:${NODE_JS_VERSION:-10}
-    build:
-      context: ..
-      dockerfile: .ci/Dockerfile
-      args:
-          NODE_JS_VERSION: ${NODE_JS_VERSION:-10}
-    environment:
-      - "TEST_ES_SERVER=https://elastic:changeme@elasticsearch-platinum:9200"
-    volumes:
-      - ..:/usr/src/app
-      # This will mount the node_modules directory
-      # to the host machine using the buildtime directory.
-      - /usr/src/app/node_modules
-      - esvol:/tmp
-    networks:
-      - esnet-platinum
-    depends_on:
-      - elasticsearch-platinum
-    # there is not need to run again also the unit test
-    command: ["npm", "run", "test:integration"]
-
-  elasticsearch-platinum:
-    image: docker.elastic.co/elasticsearch/elasticsearch:${ELASTICSEARCH_VERSION:-7.0.0-beta1}
-    ports:
-      - "9200:9200"
-    networks:
-      - esnet-platinum
-    environment:
-      - "node.attr.testattr=test"
-      - "path.repo=/tmp"
-      - "repositories.url.allowed_urls=http://snapshot.*"
-      - "discovery.type=single-node"
-      - "ES_JAVA_OPTS=-Xms1g -Xmx1g"
-      - "ELASTIC_PASSWORD=changeme"
-      - "xpack.security.enabled=true"
-      - "xpack.license.self_generated.type=trial"
-      - "xpack.security.http.ssl.enabled=true"
-      - "xpack.security.http.ssl.verification_mode=certificate"
-      - "xpack.security.http.ssl.key=certs/testnode.key"
-      - "xpack.security.http.ssl.certificate=certs/testnode.crt"
-      - "xpack.security.http.ssl.certificate_authorities=certs/ca.crt"
-      - "xpack.security.transport.ssl.enabled=true"
-      - "xpack.security.transport.ssl.key=certs/testnode.key"
-      - "xpack.security.transport.ssl.certificate=certs/testnode.crt"
-      - "xpack.security.transport.ssl.certificate_authorities=certs/ca.crt"
-    volumes:
-      - "./certs/testnode.crt:/usr/share/elasticsearch/config/certs/testnode.crt"
-      - "./certs/testnode.key:/usr/share/elasticsearch/config/certs/testnode.key"
-      - "./certs/ca.crt:/usr/share/elasticsearch/config/certs/ca.crt"
-
 networks:
-  # we need two networks otherwise the two ES instances will join each other
   esnet-oss:
-  esnet-platinum:
 volumes:
   esvol:

.ci/run-tests

@@ -20,18 +20,14 @@ set -x
 
 function cleanup {
   docker container rm --force --volumes elasticsearch-oss > /dev/null 2>&1 || true
-  docker container rm --force --volumes elasticsearch-platinum > /dev/null 2>&1 || true
   docker container rm --force --volumes elasticsearch-js-oss > /dev/null 2>&1 || true
-  docker container rm --force --volumes elasticsearch-js-platinum > /dev/null 2>&1 || true
   docker network rm esnet-oss > /dev/null
-  docker network rm esnet-platinum > /dev/null
 }
 
 trap cleanup EXIT
 
 # create network and volume
 docker network create esnet-oss
-docker network create esnet-platinum
 
 # create client image
 docker build \
@@ -46,43 +42,14 @@ docker run \
   --env "node.attr.testattr=test" \
   --env "path.repo=/tmp" \
   --env "repositories.url.allowed_urls=http://snapshot.*" \
-  --env "discovery.type=single-node" \
+  --env "discovery.zen.ping.unicast.hosts=elasticsearch"  \
+  --env "xpack.security.enabled=false" \
+  --env "xpack.monitoring.enabled=false" \
+  --env "xpack.ml.enabled=false" \
+  --env ES_JAVA_OPTS="-Xms1g -Xmx1g" \
   --network=esnet-oss \
   --name=elasticsearch-oss \
   --detach \
-  docker.elastic.co/elasticsearch/elasticsearch-oss:${ELASTICSEARCH_VERSION}
-
-# run elasticsearch platinum
-repo=$(pwd)
-testnodecrt="/.ci/certs/testnode.crt"
-testnodekey="/.ci/certs/testnode.key"
-cacrt="/.ci/certs/ca.crt"
-
-docker run \
-  --rm \
-  --env "node.attr.testattr=test" \
-  --env "path.repo=/tmp" \
-  --env "repositories.url.allowed_urls=http://snapshot.*" \
-  --env "discovery.type=single-node" \
-  --env "ES_JAVA_OPTS=-Xms1g -Xmx1g" \
-  --env "ELASTIC_PASSWORD=changeme" \
-  --env "xpack.security.enabled=true" \
-  --env "xpack.license.self_generated.type=trial" \
-  --env "xpack.security.http.ssl.enabled=true" \
-  --env "xpack.security.http.ssl.verification_mode=certificate" \
-  --env "xpack.security.http.ssl.key=certs/testnode.key" \
-  --env "xpack.security.http.ssl.certificate=certs/testnode.crt" \
-  --env "xpack.security.http.ssl.certificate_authorities=certs/ca.crt" \
-  --env "xpack.security.transport.ssl.enabled=true" \
-  --env "xpack.security.transport.ssl.key=certs/testnode.key" \
-  --env "xpack.security.transport.ssl.certificate=certs/testnode.crt" \
-  --env "xpack.security.transport.ssl.certificate_authorities=certs/ca.crt" \
-  --volume "$repo$testnodecrt:/usr/share/elasticsearch/config/certs/testnode.crt" \
-  --volume "$repo$testnodekey:/usr/share/elasticsearch/config/certs/testnode.key" \
-  --volume "$repo$cacrt:/usr/share/elasticsearch/config/certs/ca.crt" \
-  --network=esnet-platinum \
-  --name=elasticsearch-platinum \
-  --detach \
   docker.elastic.co/elasticsearch/elasticsearch:${ELASTICSEARCH_VERSION}
 
 # run the client unit and oss integration test
@@ -90,21 +57,9 @@ docker run \
   --network=esnet-oss \
   --env "TEST_ES_SERVER=http://elasticsearch-oss:9200" \
   --env "CODECOV_TOKEN" \
-  --volume $repo:/usr/src/app \
+  --volume $(pwd):/usr/src/app \
   --volume /usr/src/app/node_modules \
   --name elasticsearch-js-oss \
   --rm \
   elastic/elasticsearch-js \
   npm run ci
-
-# run the client platinium integration test
-docker run \
-  --network=esnet-platinum \
-  --env "TEST_ES_SERVER=https://elastic:changeme@elasticsearch-platinum:9200" \
-  --volume $repo:/usr/src/app \
-  --volume /usr/src/app/node_modules \
-  --name elasticsearch-js-platinum \
-  --rm \
-  elastic/elasticsearch-js \
-  npm run test:integration
-

.ci/test-matrix.yml

@@ -1,11 +1,10 @@
 ---
 ELASTICSEARCH_VERSION:
-- 7.0.0-beta1
+  - 5.6.16
 
 NODE_JS_VERSION:
-- 11
+  - 12
-- 10
+  - 10
-- 8
+  - 8
-- 6
 
 exclude: ~

.npmignore

@@ -67,3 +67,6 @@ scripts
 .ci
 .travis.yml
 certs
+.github
+CODE_OF_CONDUCT.md
+CONTRIBUTING.md

.travis.yml

@@ -5,25 +5,15 @@ sudo: required
 language: node_js
 
 node_js:
+  - "12"
   - "10"
   - "8"
-  - "6"
-
-env:
-  global:
-    - ELASTICSEARCH_VERSION=7.0.0-beta1
-    - QUIET=true
-
-before_install:
-  - wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ELASTICSEARCH_VERSION}-linux-x86_64.tar.gz
-  - tar -xzf elasticsearch-${ELASTICSEARCH_VERSION}-linux-x86_64.tar.gz
-  - ./elasticsearch-${ELASTICSEARCH_VERSION}/bin/elasticsearch -Enode.attr.testattr=test -Epath.repo=/tmp -Erepositories.url.allowed_urls='http://snapshot.*' &> /dev/null &
 
 install:
   - npm install
 
 script:
-  - npm run ci
+  - npm run license-checker && npm run test
 
 notifications:
   email:

CODE_OF_CONDUCT.md

@@ -0,0 +1,3 @@
+303 See Other
+
+Location: https://www.elastic.co/community/codeofconduct

CONTRIBUTING.md

@@ -0,0 +1,100 @@
+# Contributing to the Elasticsearch Node.js client
+
+The Elasticsearch Node.js client is open source and we love to receive contributions from our community — you!
+
+There are many ways to contribute,
+from writing tutorials or blog posts,
+improving the documentation,
+submitting bug reports and feature requests or writing code.
+
+## Repository structure
+The `master` branch is considered unstable, and it's compatible with Elasticsearch master. Unless you are patching an issue, new features should always be sent to the `master` branch, in case of a bugfix, it depends if the bug affects all the release lines.<br/>
+There is a branch for every supported release line, such as `7.x` or `6.x`. We release bugfixes as soon as possible, while minor and major releases are published at the same time of the Elastic Stack.
+
+Usually for every release line there will be a *published* version and a *next* version. Eg: the `7.x` branch contains the version published on npm, and bugfixes should be sent there, while `7.2` *(assuming that 7.1.x is released)* contains the next version, and new features should be sent there.
+
+## Code contributions
+
+If you have a bugfix or new feature that you would like to contribute,
+please find or open an issue about it first.
+Talk about what you would like to do.
+It may be that somebody is already working on it,
+or that there are particular issues that you should know about before implementing the change.
+
+Note that we strictly follow the [Elastic EOL schedule](https://www.elastic.co/support/eol).
+
+### Submitting your changes
+
+Generally, we require that you test any code you are adding or modifying.
+Once your changes are ready to submit for review:
+
+1. Test your changes
+
+    Run the test suite to make sure that nothing is broken.
+    Usually run `npm test` is enough, our CI will take care of running the integration test. If you want to run the integration test yourself, see the *Testing* section below.
+
+2. Submit a pull request
+
+    Push your local changes to your forked copy of the repository and [submit a pull request](https://help.github.com/articles/using-pull-requests).
+    In the pull request,
+    choose a title which sums up the changes that you have made,
+    and in the body provide more details about what your changes do.
+    Also mention the number of the issue where discussion has taken place,
+    eg "Closes #123".
+
+3. Sign the Contributor License Agreement
+
+    Please make sure you have signed our [Contributor License Agreement](https://www.elastic.co/contributor-agreement/).
+    We are not asking you to assign copyright to us,
+    but to give us the right to distribute your code without restriction.
+    We ask this of all contributors in order to assure our users of the origin and continuing existence of the code.
+    You only need to sign the CLA once.
+
+4. Be patient
+
+    We might not be able to review your code as fast as we would like to,
+    but we'll do our best to dedicate it the attention it deserves.
+    Your effort is much appreciated!
+
+### Code generation
+
+The entire content of the API folder is generated as well as the `docs/reference.asciidoc` file.<br/>
+If you want to run the code generation you should run the following command:
+```sh
+node scripts/generate --tag <tag name>
+# or
+node scripts/generate --branch <branch name>
+```
+Then you should copy the content of `api/generated.d.ts` into the `index.d.ts` file *(automate this step would be a nice pr!)*.
+
+### Testing
+There are different test scripts, usually during development you only need to run `npm test`, but if you want you can run just a part of the suite, following you will find all the testing scripts and what they do.
+
+| Script | Description |
+|---|---|
+| `npm run test:unit` | Runs the content of the `test/unit` folder. |
+| `npm run test:behavior` | Runs the content of the `test/behavior` folder. |
+| `npm run test:types` | Runs the content of the `test/types` folder. |
+| `npm run test:unit -- --cov --coverage-report=html` | Runs the content of the `test/unit` folder and calculates the code coverage. |
+| `npm run test:integration` | Runs the integration test runner.<br/>*Note: it requires a living instance of Elasticsearch.* |
+| `npm run lint` | Run the [linter](https://standardjs.com/). |
+| `npm run lint:fix` | Fixes the lint errors. |
+| `npm test` | Runs lint, unit, behavior, and types test. |
+
+#### Integration test
+The integration test are generated on the fly by the runner you will find inside `test/integration`, once you execute it, it will clone the Elasticsearch repository and checkout the correct version to grab the [OSS yaml files](https://github.com/elastic/elasticsearch/tree/master/rest-api-spec/src/main/resources/rest-api-spec/test) and the [Elastic licensed yaml files](https://github.com/elastic/elasticsearch/tree/master/x-pack/plugin/src/test/resources/rest-api-spec/test) that will be used for generating the test.
+
+Usually this step is executed by CI since it takes some time, but you can easily run this yourself! Just follow this steps:
+1. Boot an Elasticsearch instance, you can do that by running `./scripts/es-docker.sh` or `./scripts/es-docker-platinum.sh`, the first one will work only with the OSS APIs, while the second will work also with the Elastic licensed APIs;
+1. If you are running the OSS test, you should use `npm run test:integration`, otherwise use `TEST_ES_SERVER=https://elastic:changeme@localhost:9200 npm run test:integration`. You can also pass a `-b` parameter if you want the test to bail out at the first failure: `npm run test:integration -- -b`;
+1. Grab a coffee, it will take some time ;)
+
+### Releasing
+
+If you have access to make releases, the process is as follows:
+
+1. Update the version in `package.json` according to the scale of the change. (major, minor or patch)
+1. Commit changes with message `Bumped vx.y.z` where `x.y.z` is the version in `package.json`
+1. Create a release via the GitHub UI.
+1. Wait for CI to finish running the test.
+1. Publish to npm with `npm publish` *(see [publish](https://docs.npmjs.com/cli/publish) and [dist-tag](https://docs.npmjs.com/cli/dist-tag) docs)*

README.md

@@ -6,8 +6,7 @@
 
 ---
 
-**Note:** In the past months we have worked on the new Elasticsearch Node.js client, we will announce it soon!
+**Note:** In the past months we have worked on the new Elasticsearch Node.js client, and if you want you can already try it by following the instructions below, while if you're going to use the legacy one or report an issue, please check out [elastic/elasticsearch-js-legacy](https://github.com/elastic/elasticsearch-js-legacy).
-If you want you can already try it by following the instructions below, while if you're going to use the legacy one or report an issue, please check out [elastic/elasticsearch-js-legacy](https://github.com/elastic/elasticsearch-js-legacy).
 
 ---
 
@@ -28,11 +27,7 @@ npm install @elastic/elasticsearch
 
 ### Compatibility
 
----
+The minimum supported version of Node.js is `v8`.
-
-**Warning:** currently on npm you will only find a beta release that works with Elasticsearch 7, we will add the support for Elasticsearch 5, 6, and 7 once we release the final version of this library.
-
----
 
 The library is compatible with all Elasticsearch versions since 5.x, but you should use the same major version of the Elasticsearch instance that you are using.
 ```
@@ -46,8 +41,46 @@ The library is compatible with all Elasticsearch versions since 5.x, but you sho
 @elastic/elasticsearch@5
 ```
 
+#### Install multiple versions
+If you are using multiple versions of Elasticsearch, you need to use multiple versions of the client. In the past, install multiple versions of the same package was not possible, but with `npm v6.9`, you can do that via aliasing.
+
+The command you must run to install different version of the client is:
+```sh
+npm install <alias>@npm:@elastic/elasticsearch@<version>
+```
+So for example if you need to install `7.x` and `6.x`, you will run
+```sh
+npm install es6@npm:@elastic/elasticsearch@6
+npm install es7@npm:@elastic/elasticsearch@7
+```
+And your `package.json` will look like the following:
+```json
+"dependencies": {
+  "es6": "npm:@elastic/elasticsearch@^6.7.0",
+  "es7": "npm:@elastic/elasticsearch@^7.0.0"
+}
+```
+And finally, you will require the packages from your code by using the alias you have defined.
+```js
+const { Client: Client6 } = require('es6')
+const { Client: Client7 } = require('es7')
+
+const client6 = new Client6({ node: 'http://localhost:9200' })
+const client7 = new Client7({ node: 'http://localhost:9201' })
+
+client6.info(console.log)
+client7.info(console.log)
+```
+
+Finally, if you want to install the client for the next version of Elasticsearch *(the one that lives in Elasticsearch’s master branch)*, you can use the following command:
+```sh
+npm install esmaster@github:elastic/elasticsearch-js
+```
+
 ## Usage
-You can find the full documentation in the [docs](https://github.com/elastic/elasticsearch-js/tree/master/docs) folder.
+
+You can find the full documentation in our [docs](https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/index.html) website.
+
 ```js
 const { Client } = require('@elastic/elasticsearch')
 const client = new Client({ node: 'http://localhost:9200' })
@@ -77,7 +110,9 @@ The returned value of **every** API call is formed as follows:
 }
 ```
 ### Client options
+
 The client is designed to be easily configured as you see fit for your needs, following you can see all the possible options that you can use to configure it.
+
 ```ts
 {
   // the Elasticsearch endpoint to use
@@ -120,6 +155,10 @@ The client is designed to be easily configured as you see fit for your needs, fo
   nodeFilter: nodeFilterFn;
   // custom selection strategy, defaults `round-robin`
   nodeSelector: nodeSelectorFn | string;
+  // function to generate the request id for every request
+  generateRequestId: generateRequestIdFn;
+  // name to identify the client instance in the events
+  name: string;
 }
 ```
 
@@ -144,7 +183,9 @@ The supported *request specific options* are:
   asStream: boolean, // default `false`
   compression: string, // default `false`
   headers: object, // default `null`
-  querystring: object // default `null`
+  querystring: object // default `null`,
+  context: object // default `null`,
+  id: any // default incr. integer
 }
 ```
 

api/api/bulk.js

@@ -24,9 +24,9 @@
 
 function buildBulk (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [bulk](http://www.elastic.co/guide/en/elasticsearch/reference/master/docs-bulk.html) request
+   * Perform a [bulk](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/docs-bulk.html) request
    *
    * @param {string} index - Default index for items which don't provide one
    * @param {string} type - Default document type for items which don't provide one
@@ -35,9 +35,10 @@ function buildBulk (opts) {
    * @param {string} routing - Specific routing value
    * @param {time} timeout - Explicit operation timeout
    * @param {string} type - Default document type for items which don't provide one
+   * @param {list} fields - Default comma-separated list of fields to return in the response for updates, can be overridden on each sub-request
    * @param {list} _source - True or false to return the _source field or not, or default list of fields to return, can be overridden on each sub-request
-   * @param {list} _source_excludes - Default list of fields to exclude from the returned _source field, can be overridden on each sub-request
+   * @param {list} _source_exclude - Default list of fields to exclude from the returned _source field, can be overridden on each sub-request
-   * @param {list} _source_includes - Default list of fields to extract and return from the _source field, can be overridden on each sub-request
+   * @param {list} _source_include - Default list of fields to extract and return from the _source field, can be overridden on each sub-request
    * @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
    */
@@ -48,9 +49,10 @@ function buildBulk (opts) {
     'routing',
     'timeout',
     'type',
+    'fields',
     '_source',
-    '_source_excludes',
+    '_source_exclude',
-    '_source_includes',
+    '_source_include',
     'pipeline',
     'pretty',
     'human',
@@ -61,8 +63,8 @@ function buildBulk (opts) {
 
   const snakeCase = {
     waitForActiveShards: 'wait_for_active_shards',
-    _sourceExcludes: '_source_excludes',
+    _sourceExclude: '_source_exclude',
-    _sourceIncludes: '_source_includes',
+    _sourceInclude: '_source_include',
     errorTrace: 'error_trace',
     filterPath: 'filter_path'
   }
@@ -97,17 +99,17 @@ function buildBulk (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index, type } = params
+    var { method, body, index, type, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index', 'type'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'POST'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -128,34 +130,8 @@ function buildBulk (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/cat.aliases.js

@@ -24,9 +24,9 @@
 
 function buildCatAliases (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [cat.aliases](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-alias.html) request
+   * Perform a [cat.aliases](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cat-alias.html) request
    *
    * @param {list} name - A comma-separated list of alias names to return
    * @param {string} format - a short version of the Accept header, e.g. json, yaml
@@ -83,17 +83,17 @@ function buildCatAliases (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, name } = params
+    var { method, body, name, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'name'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -112,34 +112,8 @@ function buildCatAliases (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/cat.allocation.js

@@ -24,9 +24,9 @@
 
 function buildCatAllocation (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [cat.allocation](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-allocation.html) request
+   * Perform a [cat.allocation](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cat-allocation.html) request
    *
    * @param {list} node_id - A comma-separated list of node IDs or names to limit the returned information
    * @param {string} format - a short version of the Accept header, e.g. json, yaml
@@ -85,17 +85,17 @@ function buildCatAllocation (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, nodeId, node_id } = params
+    var { method, body, nodeId, node_id, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'nodeId', 'node_id'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -114,34 +114,8 @@ function buildCatAllocation (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/cat.count.js

@@ -24,9 +24,9 @@
 
 function buildCatCount (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [cat.count](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-count.html) request
+   * Perform a [cat.count](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cat-count.html) request
    *
    * @param {list} index - A comma-separated list of index names to limit the returned information
    * @param {string} format - a short version of the Accept header, e.g. json, yaml
@@ -83,17 +83,17 @@ function buildCatCount (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index } = params
+    var { method, body, index, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -112,34 +112,8 @@ function buildCatCount (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/cat.fielddata.js

@@ -24,9 +24,9 @@
 
 function buildCatFielddata (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [cat.fielddata](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-fielddata.html) request
+   * Perform a [cat.fielddata](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cat-fielddata.html) request
    *
    * @param {list} fields - A comma-separated list of fields to return the fielddata size
    * @param {string} format - a short version of the Accept header, e.g. json, yaml
@@ -87,17 +87,17 @@ function buildCatFielddata (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, fields } = params
+    var { method, body, fields, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'fields'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -116,34 +116,8 @@ function buildCatFielddata (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/cat.health.js

@@ -24,9 +24,9 @@
 
 function buildCatHealth (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [cat.health](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-health.html) request
+   * Perform a [cat.health](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cat-health.html) request
    *
    * @param {string} format - a short version of the Accept header, e.g. json, yaml
    * @param {boolean} local - Return local information, do not retrieve the state from master node (default: false)
@@ -84,17 +84,17 @@ function buildCatHealth (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body } = params
+    var { method, body, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -109,34 +109,8 @@ function buildCatHealth (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/cat.help.js

@@ -24,9 +24,9 @@
 
 function buildCatHelp (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [cat.help](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat.html) request
+   * Perform a [cat.help](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cat.html) request
    *
    * @param {boolean} help - Return help information
    * @param {list} s - Comma-separated list of column names or column aliases to sort by
@@ -71,17 +71,17 @@ function buildCatHelp (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body } = params
+    var { method, body, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -96,34 +96,8 @@ function buildCatHelp (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/cat.indices.js

@@ -24,9 +24,9 @@
 
 function buildCatIndices (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [cat.indices](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-indices.html) request
+   * Perform a [cat.indices](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cat-indices.html) request
    *
    * @param {list} index - A comma-separated list of index names to limit the returned information
    * @param {string} format - a short version of the Accept header, e.g. json, yaml
@@ -89,17 +89,17 @@ function buildCatIndices (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index } = params
+    var { method, body, index, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -118,34 +118,8 @@ function buildCatIndices (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/cat.master.js

@@ -24,9 +24,9 @@
 
 function buildCatMaster (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [cat.master](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-master.html) request
+   * Perform a [cat.master](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cat-master.html) request
    *
    * @param {string} format - a short version of the Accept header, e.g. json, yaml
    * @param {boolean} local - Return local information, do not retrieve the state from master node (default: false)
@@ -82,17 +82,17 @@ function buildCatMaster (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body } = params
+    var { method, body, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -107,34 +107,8 @@ function buildCatMaster (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/cat.nodeattrs.js

@@ -24,9 +24,9 @@
 
 function buildCatNodeattrs (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [cat.nodeattrs](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-nodeattrs.html) request
+   * Perform a [cat.nodeattrs](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cat-nodeattrs.html) request
    *
    * @param {string} format - a short version of the Accept header, e.g. json, yaml
    * @param {boolean} local - Return local information, do not retrieve the state from master node (default: false)
@@ -82,17 +82,17 @@ function buildCatNodeattrs (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body } = params
+    var { method, body, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -107,34 +107,8 @@ function buildCatNodeattrs (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/cat.nodes.js

@@ -24,9 +24,9 @@
 
 function buildCatNodes (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [cat.nodes](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-nodes.html) request
+   * Perform a [cat.nodes](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cat-nodes.html) request
    *
    * @param {string} format - a short version of the Accept header, e.g. json, yaml
    * @param {boolean} full_id - Return the full node ID instead of the shortened version (default: false)
@@ -85,17 +85,17 @@ function buildCatNodes (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body } = params
+    var { method, body, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -110,34 +110,8 @@ function buildCatNodes (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/cat.pending_tasks.js

@@ -24,9 +24,9 @@
 
 function buildCatPendingTasks (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [cat.pending_tasks](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-pending-tasks.html) request
+   * Perform a [cat.pending_tasks](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cat-pending-tasks.html) request
    *
    * @param {string} format - a short version of the Accept header, e.g. json, yaml
    * @param {boolean} local - Return local information, do not retrieve the state from master node (default: false)
@@ -82,17 +82,17 @@ function buildCatPendingTasks (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body } = params
+    var { method, body, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -107,34 +107,8 @@ function buildCatPendingTasks (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/cat.plugins.js

@@ -24,9 +24,9 @@
 
 function buildCatPlugins (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [cat.plugins](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-plugins.html) request
+   * Perform a [cat.plugins](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cat-plugins.html) request
    *
    * @param {string} format - a short version of the Accept header, e.g. json, yaml
    * @param {boolean} local - Return local information, do not retrieve the state from master node (default: false)
@@ -82,17 +82,17 @@ function buildCatPlugins (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body } = params
+    var { method, body, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -107,34 +107,8 @@ function buildCatPlugins (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/cat.recovery.js

@@ -24,9 +24,9 @@
 
 function buildCatRecovery (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [cat.recovery](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-recovery.html) request
+   * Perform a [cat.recovery](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cat-recovery.html) request
    *
    * @param {list} index - A comma-separated list of index names to limit the returned information
    * @param {string} format - a short version of the Accept header, e.g. json, yaml
@@ -83,17 +83,17 @@ function buildCatRecovery (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index } = params
+    var { method, body, index, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -112,34 +112,8 @@ function buildCatRecovery (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/cat.repositories.js

@@ -24,9 +24,9 @@
 
 function buildCatRepositories (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [cat.repositories](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-repositories.html) request
+   * Perform a [cat.repositories](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cat-repositories.html) request
    *
    * @param {string} format - a short version of the Accept header, e.g. json, yaml
    * @param {boolean} local - Return local information, do not retrieve the state from master node
@@ -82,17 +82,17 @@ function buildCatRepositories (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body } = params
+    var { method, body, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -107,34 +107,8 @@ function buildCatRepositories (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/cat.segments.js

@@ -24,9 +24,9 @@
 
 function buildCatSegments (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [cat.segments](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-segments.html) request
+   * Perform a [cat.segments](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cat-segments.html) request
    *
    * @param {list} index - A comma-separated list of index names to limit the returned information
    * @param {string} format - a short version of the Accept header, e.g. json, yaml
@@ -80,17 +80,17 @@ function buildCatSegments (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index } = params
+    var { method, body, index, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -109,34 +109,8 @@ function buildCatSegments (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/cat.shards.js

@@ -24,9 +24,9 @@
 
 function buildCatShards (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [cat.shards](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-shards.html) request
+   * Perform a [cat.shards](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cat-shards.html) request
    *
    * @param {list} index - A comma-separated list of index names to limit the returned information
    * @param {string} format - a short version of the Accept header, e.g. json, yaml
@@ -85,17 +85,17 @@ function buildCatShards (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index } = params
+    var { method, body, index, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -114,34 +114,8 @@ function buildCatShards (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/cat.snapshots.js

@@ -24,9 +24,9 @@
 
 function buildCatSnapshots (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [cat.snapshots](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-snapshots.html) request
+   * Perform a [cat.snapshots](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cat-snapshots.html) request
    *
    * @param {list} repository - Name of repository from which to fetch the snapshot information
    * @param {string} format - a short version of the Accept header, e.g. json, yaml
@@ -73,6 +73,10 @@ function buildCatSnapshots (opts) {
     }
 
     // check required parameters
+    if (params['repository'] == null) {
+      const err = new ConfigurationError('Missing required parameter: repository')
+      return handleError(err, callback)
+    }
     if (params.body != null) {
       const err = new ConfigurationError('This API does not require a body')
       return handleError(err, callback)
@@ -84,17 +88,17 @@ function buildCatSnapshots (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, repository } = params
+    var { method, body, repository, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'repository'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -113,34 +117,8 @@ function buildCatSnapshots (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/cat.tasks.js

@@ -24,14 +24,15 @@
 
 function buildCatTasks (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [cat.tasks](http://www.elastic.co/guide/en/elasticsearch/reference/master/tasks.html) request
+   * Perform a [cat.tasks](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/tasks.html) request
    *
    * @param {string} format - a short version of the Accept header, e.g. json, yaml
    * @param {list} node_id - A comma-separated list of node IDs or names to limit the returned information; use `_local` to return information from the node you're connecting to, leave empty to get information from all nodes
    * @param {list} actions - A comma-separated list of actions that should be returned. Leave empty to return all.
    * @param {boolean} detailed - Return detailed task information (default: false)
+   * @param {string} parent_node - Return tasks with specified parent node.
    * @param {number} parent_task - Return tasks with specified parent task id. Set to -1 to return all.
    * @param {list} h - Comma-separated list of column names to display
    * @param {boolean} help - Return help information
@@ -44,6 +45,7 @@ function buildCatTasks (opts) {
     'node_id',
     'actions',
     'detailed',
+    'parent_node',
     'parent_task',
     'h',
     'help',
@@ -58,6 +60,7 @@ function buildCatTasks (opts) {
 
   const snakeCase = {
     nodeId: 'node_id',
+    parentNode: 'parent_node',
     parentTask: 'parent_task',
     errorTrace: 'error_trace',
     filterPath: 'filter_path'
@@ -87,17 +90,17 @@ function buildCatTasks (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body } = params
+    var { method, body, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -112,34 +115,8 @@ function buildCatTasks (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/cat.templates.js

@@ -24,9 +24,9 @@
 
 function buildCatTemplates (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [cat.templates](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-templates.html) request
+   * Perform a [cat.templates](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cat-templates.html) request
    *
    * @param {string} name - A pattern that returned template names must match
    * @param {string} format - a short version of the Accept header, e.g. json, yaml
@@ -83,17 +83,17 @@ function buildCatTemplates (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, name } = params
+    var { method, body, name, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'name'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -112,34 +112,8 @@ function buildCatTemplates (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/cat.thread_pool.js

@@ -24,9 +24,9 @@
 
 function buildCatThreadPool (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [cat.thread_pool](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-thread-pool.html) request
+   * Perform a [cat.thread_pool](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cat-thread-pool.html) request
    *
    * @param {list} thread_pool_patterns - A comma-separated list of regular-expressions to filter the thread pools in the output
    * @param {string} format - a short version of the Accept header, e.g. json, yaml
@@ -85,17 +85,17 @@ function buildCatThreadPool (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, threadPoolPatterns, thread_pool_patterns } = params
+    var { method, body, threadPoolPatterns, thread_pool_patterns, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'threadPoolPatterns', 'thread_pool_patterns'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -114,34 +114,8 @@ function buildCatThreadPool (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/ccr.delete_auto_follow_pattern.js

@@ -1,122 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-'use strict'
-
-/* eslint camelcase: 0 */
-/* eslint no-unused-vars: 0 */
-
-function buildCcrDeleteAutoFollowPattern (opts) {
-  // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
-  /**
-   * Perform a [ccr.delete_auto_follow_pattern](https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-delete-auto-follow-pattern.html) request
-   *
-   * @param {string} name - The name of the auto follow pattern.
-   */
-
-  const acceptedQuerystring = [
-
-  ]
-
-  const snakeCase = {
-
-  }
-
-  return function ccrDeleteAutoFollowPattern (params, options, callback) {
-    options = options || {}
-    if (typeof options === 'function') {
-      callback = options
-      options = {}
-    }
-    if (typeof params === 'function' || params == null) {
-      callback = params
-      params = {}
-      options = {}
-    }
-
-    // check required parameters
-    if (params['name'] == null) {
-      const err = new ConfigurationError('Missing required parameter: name')
-      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}`)
-      return handleError(err, callback)
-    }
-
-    var warnings = null
-    var { method, body, name } = params
-    var querystring = semicopy(params, ['method', 'body', 'name'])
-
-    if (method == null) {
-      method = 'DELETE'
-    }
-
-    var ignore = options.ignore || null
-    if (typeof ignore === 'number') {
-      ignore = [ignore]
-    }
-
-    var path = ''
-
-    path = '/' + '_ccr' + '/' + 'auto_follow' + '/' + encodeURIComponent(name)
-
-    // build request object
-    const request = {
-      method,
-      path,
-      body: body || '',
-      querystring
-    }
-
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
-  }
-}
-
-module.exports = buildCcrDeleteAutoFollowPattern

api/api/ccr.follow.js

@@ -1,128 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-'use strict'
-
-/* eslint camelcase: 0 */
-/* eslint no-unused-vars: 0 */
-
-function buildCcrFollow (opts) {
-  // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
-  /**
-   * Perform a [ccr.follow](https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-put-follow.html) request
-   *
-   * @param {string} index - The name of the follower index
-   * @param {string} wait_for_active_shards - Sets the number of shard copies that must be active before returning. Defaults to 0. Set to `all` for all shard copies, otherwise set to any non-negative value less than or equal to the total number of copies for the shard (number of replicas + 1)
-   * @param {object} body - The name of the leader index and other optional ccr related parameters
-   */
-
-  const acceptedQuerystring = [
-    'wait_for_active_shards'
-  ]
-
-  const snakeCase = {
-    waitForActiveShards: 'wait_for_active_shards'
-  }
-
-  return function ccrFollow (params, options, callback) {
-    options = options || {}
-    if (typeof options === 'function') {
-      callback = options
-      options = {}
-    }
-    if (typeof params === 'function' || params == null) {
-      callback = params
-      params = {}
-      options = {}
-    }
-
-    // check required parameters
-    if (params['index'] == null) {
-      const err = new ConfigurationError('Missing required parameter: index')
-      return handleError(err, callback)
-    }
-    if (params['body'] == null) {
-      const err = new ConfigurationError('Missing required parameter: 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}`)
-      return handleError(err, callback)
-    }
-
-    var warnings = null
-    var { method, body, index } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
-
-    if (method == null) {
-      method = 'PUT'
-    }
-
-    var ignore = options.ignore || null
-    if (typeof ignore === 'number') {
-      ignore = [ignore]
-    }
-
-    var path = ''
-
-    path = '/' + encodeURIComponent(index) + '/' + '_ccr' + '/' + 'follow'
-
-    // build request object
-    const request = {
-      method,
-      path,
-      body: body || '',
-      querystring
-    }
-
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
-  }
-}
-
-module.exports = buildCcrFollow

api/api/ccr.follow_info.js

@@ -1,116 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-'use strict'
-
-/* eslint camelcase: 0 */
-/* eslint no-unused-vars: 0 */
-
-function buildCcrFollowInfo (opts) {
-  // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
-  /**
-   * Perform a [ccr.follow_info](https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-get-follow-info.html) request
-   *
-   * @param {list} index - A comma-separated list of index patterns; use `_all` to perform the operation on all indices
-   */
-
-  const acceptedQuerystring = [
-
-  ]
-
-  const snakeCase = {
-
-  }
-
-  return function ccrFollowInfo (params, options, callback) {
-    options = options || {}
-    if (typeof options === 'function') {
-      callback = options
-      options = {}
-    }
-    if (typeof params === 'function' || params == null) {
-      callback = params
-      params = {}
-      options = {}
-    }
-
-    // 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}`)
-      return handleError(err, callback)
-    }
-
-    var warnings = null
-    var { method, body, index } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
-
-    if (method == null) {
-      method = 'GET'
-    }
-
-    var ignore = options.ignore || null
-    if (typeof ignore === 'number') {
-      ignore = [ignore]
-    }
-
-    var path = ''
-
-    path = '/' + encodeURIComponent(index) + '/' + '_ccr' + '/' + 'info'
-
-    // build request object
-    const request = {
-      method,
-      path,
-      body: null,
-      querystring
-    }
-
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
-  }
-}
-
-module.exports = buildCcrFollowInfo

api/api/ccr.follow_stats.js

@@ -1,116 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-'use strict'
-
-/* eslint camelcase: 0 */
-/* eslint no-unused-vars: 0 */
-
-function buildCcrFollowStats (opts) {
-  // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
-  /**
-   * Perform a [ccr.follow_stats](https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-get-follow-stats.html) request
-   *
-   * @param {list} index - A comma-separated list of index patterns; use `_all` to perform the operation on all indices
-   */
-
-  const acceptedQuerystring = [
-
-  ]
-
-  const snakeCase = {
-
-  }
-
-  return function ccrFollowStats (params, options, callback) {
-    options = options || {}
-    if (typeof options === 'function') {
-      callback = options
-      options = {}
-    }
-    if (typeof params === 'function' || params == null) {
-      callback = params
-      params = {}
-      options = {}
-    }
-
-    // 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}`)
-      return handleError(err, callback)
-    }
-
-    var warnings = null
-    var { method, body, index } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
-
-    if (method == null) {
-      method = 'GET'
-    }
-
-    var ignore = options.ignore || null
-    if (typeof ignore === 'number') {
-      ignore = [ignore]
-    }
-
-    var path = ''
-
-    path = '/' + encodeURIComponent(index) + '/' + '_ccr' + '/' + 'stats'
-
-    // build request object
-    const request = {
-      method,
-      path,
-      body: null,
-      querystring
-    }
-
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
-  }
-}
-
-module.exports = buildCcrFollowStats

api/api/ccr.get_auto_follow_pattern.js

@@ -1,120 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-'use strict'
-
-/* eslint camelcase: 0 */
-/* eslint no-unused-vars: 0 */
-
-function buildCcrGetAutoFollowPattern (opts) {
-  // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
-  /**
-   * Perform a [ccr.get_auto_follow_pattern](https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-get-auto-follow-pattern.html) request
-   *
-   * @param {string} name - The name of the auto follow pattern.
-   */
-
-  const acceptedQuerystring = [
-
-  ]
-
-  const snakeCase = {
-
-  }
-
-  return function ccrGetAutoFollowPattern (params, options, callback) {
-    options = options || {}
-    if (typeof options === 'function') {
-      callback = options
-      options = {}
-    }
-    if (typeof params === 'function' || params == null) {
-      callback = params
-      params = {}
-      options = {}
-    }
-
-    // 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}`)
-      return handleError(err, callback)
-    }
-
-    var warnings = null
-    var { method, body, name } = params
-    var querystring = semicopy(params, ['method', 'body', 'name'])
-
-    if (method == null) {
-      method = 'GET'
-    }
-
-    var ignore = options.ignore || null
-    if (typeof ignore === 'number') {
-      ignore = [ignore]
-    }
-
-    var path = ''
-
-    if ((name) != null) {
-      path = '/' + '_ccr' + '/' + 'auto_follow' + '/' + encodeURIComponent(name)
-    } else {
-      path = '/' + '_ccr' + '/' + 'auto_follow'
-    }
-
-    // build request object
-    const request = {
-      method,
-      path,
-      body: null,
-      querystring
-    }
-
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
-  }
-}
-
-module.exports = buildCcrGetAutoFollowPattern

api/api/ccr.pause_follow.js

@@ -1,122 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-'use strict'
-
-/* eslint camelcase: 0 */
-/* eslint no-unused-vars: 0 */
-
-function buildCcrPauseFollow (opts) {
-  // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
-  /**
-   * Perform a [ccr.pause_follow](https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-post-pause-follow.html) request
-   *
-   * @param {string} index - The name of the follower index that should pause following its leader index.
-   */
-
-  const acceptedQuerystring = [
-
-  ]
-
-  const snakeCase = {
-
-  }
-
-  return function ccrPauseFollow (params, options, callback) {
-    options = options || {}
-    if (typeof options === 'function') {
-      callback = options
-      options = {}
-    }
-    if (typeof params === 'function' || params == null) {
-      callback = params
-      params = {}
-      options = {}
-    }
-
-    // check required parameters
-    if (params['index'] == null) {
-      const err = new ConfigurationError('Missing required parameter: index')
-      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}`)
-      return handleError(err, callback)
-    }
-
-    var warnings = null
-    var { method, body, index } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
-
-    if (method == null) {
-      method = 'POST'
-    }
-
-    var ignore = options.ignore || null
-    if (typeof ignore === 'number') {
-      ignore = [ignore]
-    }
-
-    var path = ''
-
-    path = '/' + encodeURIComponent(index) + '/' + '_ccr' + '/' + 'pause_follow'
-
-    // build request object
-    const request = {
-      method,
-      path,
-      body: body || '',
-      querystring
-    }
-
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
-  }
-}
-
-module.exports = buildCcrPauseFollow

api/api/ccr.put_auto_follow_pattern.js

@@ -1,127 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-'use strict'
-
-/* eslint camelcase: 0 */
-/* eslint no-unused-vars: 0 */
-
-function buildCcrPutAutoFollowPattern (opts) {
-  // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
-  /**
-   * Perform a [ccr.put_auto_follow_pattern](https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-put-auto-follow-pattern.html) request
-   *
-   * @param {string} name - The name of the auto follow pattern.
-   * @param {object} body - The specification of the auto follow pattern
-   */
-
-  const acceptedQuerystring = [
-
-  ]
-
-  const snakeCase = {
-
-  }
-
-  return function ccrPutAutoFollowPattern (params, options, callback) {
-    options = options || {}
-    if (typeof options === 'function') {
-      callback = options
-      options = {}
-    }
-    if (typeof params === 'function' || params == null) {
-      callback = params
-      params = {}
-      options = {}
-    }
-
-    // check required parameters
-    if (params['name'] == null) {
-      const err = new ConfigurationError('Missing required parameter: name')
-      return handleError(err, callback)
-    }
-    if (params['body'] == null) {
-      const err = new ConfigurationError('Missing required parameter: 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}`)
-      return handleError(err, callback)
-    }
-
-    var warnings = null
-    var { method, body, name } = params
-    var querystring = semicopy(params, ['method', 'body', 'name'])
-
-    if (method == null) {
-      method = 'PUT'
-    }
-
-    var ignore = options.ignore || null
-    if (typeof ignore === 'number') {
-      ignore = [ignore]
-    }
-
-    var path = ''
-
-    path = '/' + '_ccr' + '/' + 'auto_follow' + '/' + encodeURIComponent(name)
-
-    // build request object
-    const request = {
-      method,
-      path,
-      body: body || '',
-      querystring
-    }
-
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
-  }
-}
-
-module.exports = buildCcrPutAutoFollowPattern

api/api/ccr.resume_follow.js

@@ -1,123 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-'use strict'
-
-/* eslint camelcase: 0 */
-/* eslint no-unused-vars: 0 */
-
-function buildCcrResumeFollow (opts) {
-  // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
-  /**
-   * Perform a [ccr.resume_follow](https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-post-resume-follow.html) request
-   *
-   * @param {string} index - The name of the follow index to resume following.
-   * @param {object} body - The name of the leader index and other optional ccr related parameters
-   */
-
-  const acceptedQuerystring = [
-
-  ]
-
-  const snakeCase = {
-
-  }
-
-  return function ccrResumeFollow (params, options, callback) {
-    options = options || {}
-    if (typeof options === 'function') {
-      callback = options
-      options = {}
-    }
-    if (typeof params === 'function' || params == null) {
-      callback = params
-      params = {}
-      options = {}
-    }
-
-    // check required parameters
-    if (params['index'] == null) {
-      const err = new ConfigurationError('Missing required parameter: index')
-      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}`)
-      return handleError(err, callback)
-    }
-
-    var warnings = null
-    var { method, body, index } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
-
-    if (method == null) {
-      method = 'POST'
-    }
-
-    var ignore = options.ignore || null
-    if (typeof ignore === 'number') {
-      ignore = [ignore]
-    }
-
-    var path = ''
-
-    path = '/' + encodeURIComponent(index) + '/' + '_ccr' + '/' + 'resume_follow'
-
-    // build request object
-    const request = {
-      method,
-      path,
-      body: body || '',
-      querystring
-    }
-
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
-  }
-}
-
-module.exports = buildCcrResumeFollow

api/api/ccr.stats.js

@@ -1,115 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-'use strict'
-
-/* eslint camelcase: 0 */
-/* eslint no-unused-vars: 0 */
-
-function buildCcrStats (opts) {
-  // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
-  /**
-   * Perform a [ccr.stats](https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-get-stats.html) request
-   *
-   */
-
-  const acceptedQuerystring = [
-
-  ]
-
-  const snakeCase = {
-
-  }
-
-  return function ccrStats (params, options, callback) {
-    options = options || {}
-    if (typeof options === 'function') {
-      callback = options
-      options = {}
-    }
-    if (typeof params === 'function' || params == null) {
-      callback = params
-      params = {}
-      options = {}
-    }
-
-    // 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}`)
-      return handleError(err, callback)
-    }
-
-    var warnings = null
-    var { method, body } = params
-    var querystring = semicopy(params, ['method', 'body'])
-
-    if (method == null) {
-      method = 'GET'
-    }
-
-    var ignore = options.ignore || null
-    if (typeof ignore === 'number') {
-      ignore = [ignore]
-    }
-
-    var path = ''
-
-    path = '/' + '_ccr' + '/' + 'stats'
-
-    // build request object
-    const request = {
-      method,
-      path,
-      body: null,
-      querystring
-    }
-
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
-  }
-}
-
-module.exports = buildCcrStats

api/api/ccr.unfollow.js

@@ -1,122 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-'use strict'
-
-/* eslint camelcase: 0 */
-/* eslint no-unused-vars: 0 */
-
-function buildCcrUnfollow (opts) {
-  // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
-  /**
-   * Perform a [ccr.unfollow](http://www.elastic.co/guide/en/elasticsearch/reference/current) request
-   *
-   * @param {string} index - The name of the follower index that should be turned into a regular index.
-   */
-
-  const acceptedQuerystring = [
-
-  ]
-
-  const snakeCase = {
-
-  }
-
-  return function ccrUnfollow (params, options, callback) {
-    options = options || {}
-    if (typeof options === 'function') {
-      callback = options
-      options = {}
-    }
-    if (typeof params === 'function' || params == null) {
-      callback = params
-      params = {}
-      options = {}
-    }
-
-    // check required parameters
-    if (params['index'] == null) {
-      const err = new ConfigurationError('Missing required parameter: index')
-      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}`)
-      return handleError(err, callback)
-    }
-
-    var warnings = null
-    var { method, body, index } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
-
-    if (method == null) {
-      method = 'POST'
-    }
-
-    var ignore = options.ignore || null
-    if (typeof ignore === 'number') {
-      ignore = [ignore]
-    }
-
-    var path = ''
-
-    path = '/' + encodeURIComponent(index) + '/' + '_ccr' + '/' + 'unfollow'
-
-    // build request object
-    const request = {
-      method,
-      path,
-      body: body || '',
-      querystring
-    }
-
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
-  }
-}
-
-module.exports = buildCcrUnfollow

api/api/clear_scroll.js

@@ -24,9 +24,9 @@
 
 function buildClearScroll (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [clear_scroll](http://www.elastic.co/guide/en/elasticsearch/reference/master/search-request-scroll.html) request
+   * Perform a [clear_scroll](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/search-request-scroll.html) request
    *
    * @param {list} scroll_id - A comma-separated list of scroll IDs to clear
    * @param {object} body - A comma-separated list of scroll IDs to clear if none was specified via the scroll_id parameter
@@ -63,17 +63,17 @@ function buildClearScroll (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, scrollId, scroll_id } = params
+    var { method, body, scrollId, scroll_id, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'scrollId', 'scroll_id'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'DELETE'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -92,34 +92,8 @@ function buildClearScroll (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/cluster.allocation_explain.js

@@ -24,9 +24,9 @@
 
 function buildClusterAllocationExplain (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [cluster.allocation_explain](http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-allocation-explain.html) request
+   * Perform a [cluster.allocation_explain](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cluster-allocation-explain.html) request
    *
    * @param {boolean} include_yes_decisions - Return 'YES' decisions in explanation (default: false)
    * @param {boolean} include_disk_info - Return information about disk usage and shard sizes (default: false)
@@ -68,17 +68,17 @@ function buildClusterAllocationExplain (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body } = params
+    var { method, body, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = body == null ? 'GET' : 'POST'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -93,34 +93,8 @@ function buildClusterAllocationExplain (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/cluster.get_settings.js

@@ -24,9 +24,9 @@
 
 function buildClusterGetSettings (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [cluster.get_settings](http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-update-settings.html) request
+   * Perform a [cluster.get_settings](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cluster-update-settings.html) request
    *
    * @param {boolean} flat_settings - Return settings in flat format (default: false)
    * @param {time} master_timeout - Explicit operation timeout for connection to master node
@@ -78,17 +78,17 @@ function buildClusterGetSettings (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body } = params
+    var { method, body, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -103,34 +103,8 @@ function buildClusterGetSettings (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/cluster.health.js

@@ -24,9 +24,9 @@
 
 function buildClusterHealth (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [cluster.health](http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-health.html) request
+   * Perform a [cluster.health](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cluster-health.html) request
    *
    * @param {list} index - Limit the information returned to a specific index
    * @param {enum} level - Specify the level of detail for returned information
@@ -37,7 +37,6 @@ function buildClusterHealth (opts) {
    * @param {string} wait_for_nodes - Wait until the specified number of nodes is available
    * @param {enum} wait_for_events - Wait until all currently queued events with the given priority are processed
    * @param {boolean} wait_for_no_relocating_shards - Whether to wait until there are no relocating shards in the cluster
-   * @param {boolean} wait_for_no_initializing_shards - Whether to wait until there are no initializing shards in the cluster
    * @param {enum} wait_for_status - Wait until cluster is in a specific state
    */
 
@@ -50,7 +49,6 @@ function buildClusterHealth (opts) {
     'wait_for_nodes',
     'wait_for_events',
     'wait_for_no_relocating_shards',
-    'wait_for_no_initializing_shards',
     'wait_for_status',
     'pretty',
     'human',
@@ -65,7 +63,6 @@ function buildClusterHealth (opts) {
     waitForNodes: 'wait_for_nodes',
     waitForEvents: 'wait_for_events',
     waitForNoRelocatingShards: 'wait_for_no_relocating_shards',
-    waitForNoInitializingShards: 'wait_for_no_initializing_shards',
     waitForStatus: 'wait_for_status',
     errorTrace: 'error_trace',
     filterPath: 'filter_path'
@@ -95,17 +92,17 @@ function buildClusterHealth (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index } = params
+    var { method, body, index, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -124,34 +121,8 @@ function buildClusterHealth (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/cluster.pending_tasks.js

@@ -24,9 +24,9 @@
 
 function buildClusterPendingTasks (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [cluster.pending_tasks](http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-pending.html) request
+   * Perform a [cluster.pending_tasks](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cluster-pending.html) request
    *
    * @param {boolean} local - Return local information, do not retrieve the state from master node (default: false)
    * @param {time} master_timeout - Specify timeout for connection to master
@@ -72,17 +72,17 @@ function buildClusterPendingTasks (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body } = params
+    var { method, body, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -97,34 +97,8 @@ function buildClusterPendingTasks (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/cluster.put_settings.js

@@ -24,9 +24,9 @@
 
 function buildClusterPutSettings (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [cluster.put_settings](http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-update-settings.html) request
+   * Perform a [cluster.put_settings](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cluster-update-settings.html) request
    *
    * @param {boolean} flat_settings - Return settings in flat format (default: false)
    * @param {time} master_timeout - Explicit operation timeout for connection to master node
@@ -64,29 +64,23 @@ function buildClusterPutSettings (opts) {
       options = {}
     }
 
-    // check required parameters
-    if (params['body'] == null) {
-      const err = new ConfigurationError('Missing required parameter: 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}`)
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body } = params
+    var { method, body, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'PUT'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -101,34 +95,8 @@ function buildClusterPutSettings (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/cluster.remote_info.js

@@ -24,9 +24,9 @@
 
 function buildClusterRemoteInfo (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [cluster.remote_info](http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-remote-info.html) request
+   * Perform a [cluster.remote_info](http://www.elastic.co/guide/en/elasticsearch/reference/5.x/cluster-remote-info.html) request
    *
    */
 
@@ -67,17 +67,17 @@ function buildClusterRemoteInfo (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body } = params
+    var { method, body, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -92,34 +92,8 @@ function buildClusterRemoteInfo (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/cluster.reroute.js

@@ -24,9 +24,9 @@
 
 function buildClusterReroute (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [cluster.reroute](http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-reroute.html) request
+   * Perform a [cluster.reroute](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cluster-reroute.html) request
    *
    * @param {boolean} dry_run - Simulate the operation only and return the resulting state
    * @param {boolean} explain - Return an explanation of why the commands can or cannot be executed
@@ -77,17 +77,17 @@ function buildClusterReroute (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body } = params
+    var { method, body, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'POST'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -102,34 +102,8 @@ function buildClusterReroute (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/cluster.state.js

@@ -24,17 +24,15 @@
 
 function buildClusterState (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [cluster.state](http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-state.html) request
+   * Perform a [cluster.state](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cluster-state.html) request
    *
    * @param {list} index - A comma-separated list of index names; use `_all` or empty string to perform the operation on all indices
    * @param {list} metric - Limit the information returned to the specified metrics
    * @param {boolean} local - Return local information, do not retrieve the state from master node (default: false)
    * @param {time} master_timeout - Specify timeout for connection to master
    * @param {boolean} flat_settings - Return settings in flat format (default: false)
-   * @param {number} wait_for_metadata_version - Wait for the metadata version to be equal or greater than the specified metadata version
-   * @param {time} wait_for_timeout - The maximum time to wait for wait_for_metadata_version before timing out
    * @param {boolean} ignore_unavailable - Whether specified concrete indices should be ignored when unavailable (missing or closed)
    * @param {boolean} allow_no_indices - Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)
    * @param {enum} expand_wildcards - Whether to expand wildcard expression to concrete indices that are open, closed or both.
@@ -44,8 +42,6 @@ function buildClusterState (opts) {
     'local',
     'master_timeout',
     'flat_settings',
-    'wait_for_metadata_version',
-    'wait_for_timeout',
     'ignore_unavailable',
     'allow_no_indices',
     'expand_wildcards',
@@ -59,8 +55,6 @@ function buildClusterState (opts) {
   const snakeCase = {
     masterTimeout: 'master_timeout',
     flatSettings: 'flat_settings',
-    waitForMetadataVersion: 'wait_for_metadata_version',
-    waitForTimeout: 'wait_for_timeout',
     ignoreUnavailable: 'ignore_unavailable',
     allowNoIndices: 'allow_no_indices',
     expandWildcards: 'expand_wildcards',
@@ -98,17 +92,17 @@ function buildClusterState (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index, metric } = params
+    var { method, body, index, metric, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index', 'metric'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -129,34 +123,8 @@ function buildClusterState (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/cluster.stats.js

@@ -24,9 +24,9 @@
 
 function buildClusterStats (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [cluster.stats](http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-stats.html) request
+   * Perform a [cluster.stats](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cluster-stats.html) request
    *
    * @param {list} node_id - A comma-separated list of node IDs or names to limit the returned information; use `_local` to return information from the node you're connecting to, leave empty to get information from all nodes
    * @param {boolean} flat_settings - Return settings in flat format (default: false)
@@ -73,17 +73,17 @@ function buildClusterStats (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, nodeId, node_id } = params
+    var { method, body, nodeId, node_id, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'nodeId', 'node_id'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -102,34 +102,8 @@ function buildClusterStats (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/count.js

@@ -24,14 +24,13 @@
 
 function buildCount (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [count](http://www.elastic.co/guide/en/elasticsearch/reference/master/search-count.html) request
+   * Perform a [count](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/search-count.html) request
    *
    * @param {list} index - A comma-separated list of indices to restrict the results
    * @param {list} type - A comma-separated list of types to restrict the results
    * @param {boolean} ignore_unavailable - Whether specified concrete indices should be ignored when unavailable (missing or closed)
-   * @param {boolean} ignore_throttled - Whether specified concrete, expanded or aliased indices should be ignored when throttled
    * @param {boolean} allow_no_indices - Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)
    * @param {enum} expand_wildcards - Whether to expand wildcard expression to concrete indices that are open, closed or both.
    * @param {number} min_score - Include only documents with a specific `_score` value in the result
@@ -49,7 +48,6 @@ function buildCount (opts) {
 
   const acceptedQuerystring = [
     'ignore_unavailable',
-    'ignore_throttled',
     'allow_no_indices',
     'expand_wildcards',
     'min_score',
@@ -71,7 +69,6 @@ function buildCount (opts) {
 
   const snakeCase = {
     ignoreUnavailable: 'ignore_unavailable',
-    ignoreThrottled: 'ignore_throttled',
     allowNoIndices: 'allow_no_indices',
     expandWildcards: 'expand_wildcards',
     minScore: 'min_score',
@@ -106,17 +103,17 @@ function buildCount (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index, type } = params
+    var { method, body, index, type, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index', 'type'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = body == null ? 'GET' : 'POST'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -137,34 +134,8 @@ function buildCount (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/count_percolate.js

@@ -0,0 +1,145 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+'use strict'
+
+/* eslint camelcase: 0 */
+/* eslint no-unused-vars: 0 */
+
+function buildCountPercolate (opts) {
+  // eslint-disable-next-line no-unused-vars
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  /**
+   * Perform a [count_percolate](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/search-percolate.html) request
+   *
+   * @param {string} index - The index of the document being count percolated.
+   * @param {string} type - The type of the document being count percolated.
+   * @param {string} id - Substitute the document in the request body with a document that is known by the specified id. On top of the id, the index and type parameter will be used to retrieve the document from within the cluster.
+   * @param {list} routing - A comma-separated list of specific routing values
+   * @param {string} preference - Specify the node or shard the operation should be performed on (default: random)
+   * @param {boolean} ignore_unavailable - Whether specified concrete indices should be ignored when unavailable (missing or closed)
+   * @param {boolean} allow_no_indices - Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)
+   * @param {enum} expand_wildcards - Whether to expand wildcard expression to concrete indices that are open, closed or both.
+   * @param {string} percolate_index - The index to count percolate the document into. Defaults to index.
+   * @param {string} percolate_type - The type to count percolate document into. Defaults to type.
+   * @param {number} version - Explicit version number for concurrency control
+   * @param {enum} version_type - Specific version type
+   * @param {object} body - The count percolator request definition using the percolate DSL
+   */
+
+  const acceptedQuerystring = [
+    'routing',
+    'preference',
+    'ignore_unavailable',
+    'allow_no_indices',
+    'expand_wildcards',
+    'percolate_index',
+    'percolate_type',
+    'version',
+    'version_type',
+    'pretty',
+    'human',
+    'error_trace',
+    'source',
+    'filter_path'
+  ]
+
+  const snakeCase = {
+    ignoreUnavailable: 'ignore_unavailable',
+    allowNoIndices: 'allow_no_indices',
+    expandWildcards: 'expand_wildcards',
+    percolateIndex: 'percolate_index',
+    percolateType: 'percolate_type',
+    versionType: 'version_type',
+    errorTrace: 'error_trace',
+    filterPath: 'filter_path'
+  }
+
+  return function countPercolate (params, options, callback) {
+    options = options || {}
+    if (typeof options === 'function') {
+      callback = options
+      options = {}
+    }
+    if (typeof params === 'function' || params == null) {
+      callback = params
+      params = {}
+      options = {}
+    }
+
+    // check required parameters
+    if (params['index'] == null) {
+      const err = new ConfigurationError('Missing required parameter: index')
+      return handleError(err, callback)
+    }
+    if (params['type'] == null) {
+      const err = new ConfigurationError('Missing required parameter: type')
+      return handleError(err, callback)
+    }
+
+    // check required url components
+    if (params['id'] != null && (params['type'] == null || params['index'] == null)) {
+      const err = new ConfigurationError('Missing required parameter of the url: type, index')
+      return handleError(err, callback)
+    } else if (params['type'] != null && (params['index'] == null)) {
+      const err = new ConfigurationError('Missing required parameter of the url: index')
+      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}`)
+      return handleError(err, callback)
+    }
+
+    var warnings = []
+    var { method, body, index, type, id, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
+
+    if (method == null) {
+      method = body == null ? 'GET' : 'POST'
+    }
+
+    var ignore = options.ignore
+    if (typeof ignore === 'number') {
+      options.ignore = [ignore]
+    }
+
+    var path = ''
+
+    if ((index) != null && (type) != null && (id) != null) {
+      path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type) + '/' + encodeURIComponent(id) + '/' + '_percolate' + '/' + 'count'
+    } else {
+      path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type) + '/' + '_percolate' + '/' + 'count'
+    }
+
+    // build request object
+    const request = {
+      method,
+      path,
+      body: body || '',
+      querystring
+    }
+
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
+  }
+}
+
+module.exports = buildCountPercolate

api/api/create.js

@@ -24,9 +24,9 @@
 
 function buildCreate (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [create](http://www.elastic.co/guide/en/elasticsearch/reference/master/docs-index_.html) request
+   * Perform a [create](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/docs-index_.html) request
    *
    * @param {string} id - Document ID
    * @param {string} index - The name of the index
@@ -36,6 +36,8 @@ function buildCreate (opts) {
    * @param {enum} refresh - If `true` then refresh the affected shards to make this operation visible to search, if `wait_for` then wait for a refresh to make this operation visible to search, if `false` (the default) then do nothing with refreshes.
    * @param {string} routing - Specific routing value
    * @param {time} timeout - Explicit operation timeout
+   * @param {time} timestamp - Explicit timestamp for the document
+   * @param {time} ttl - Expiration time for the document
    * @param {number} version - Explicit version number for concurrency control
    * @param {enum} version_type - Specific version type
    * @param {string} pipeline - The pipeline id to preprocess incoming documents with
@@ -48,6 +50,8 @@ function buildCreate (opts) {
     'refresh',
     'routing',
     'timeout',
+    'timestamp',
+    'ttl',
     'version',
     'version_type',
     'pipeline',
@@ -86,6 +90,10 @@ function buildCreate (opts) {
       const err = new ConfigurationError('Missing required parameter: index')
       return handleError(err, callback)
     }
+    if (params['type'] == null) {
+      const err = new ConfigurationError('Missing required parameter: type')
+      return handleError(err, callback)
+    }
     if (params['body'] == null) {
       const err = new ConfigurationError('Missing required parameter: body')
       return handleError(err, callback)
@@ -97,26 +105,22 @@ function buildCreate (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, id, index, type } = params
+    var { method, body, id, index, type, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'id', 'index', 'type'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'PUT'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
 
-    if ((index) != null && (type) != null && (id) != null) {
+    path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type) + '/' + encodeURIComponent(id) + '/' + '_create'
-      path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type) + '/' + encodeURIComponent(id) + '/' + '_create'
-    } else {
-      path = '/' + encodeURIComponent(index) + '/' + '_create' + '/' + encodeURIComponent(id)
-    }
 
     // build request object
     const request = {
@@ -126,34 +130,8 @@ function buildCreate (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/delete.js

@@ -24,9 +24,9 @@
 
 function buildDelete (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [delete](http://www.elastic.co/guide/en/elasticsearch/reference/master/docs-delete.html) request
+   * Perform a [delete](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/docs-delete.html) request
    *
    * @param {string} id - The document ID
    * @param {string} index - The name of the index
@@ -36,8 +36,6 @@ function buildDelete (opts) {
    * @param {enum} refresh - If `true` then refresh the effected shards to make this operation visible to search, if `wait_for` then wait for a refresh to make this operation visible to search, if `false` (the default) then do nothing with refreshes.
    * @param {string} routing - Specific routing value
    * @param {time} timeout - Explicit operation timeout
-   * @param {number} if_seq_no - only perform the delete operation if the last operation that has changed the document has the specified sequence number
-   * @param {number} if_primary_term - only perform the delete operation if the last operation that has changed the document has the specified primary term
    * @param {number} version - Explicit version number for concurrency control
    * @param {enum} version_type - Specific version type
    */
@@ -48,8 +46,6 @@ function buildDelete (opts) {
     'refresh',
     'routing',
     'timeout',
-    'if_seq_no',
-    'if_primary_term',
     'version',
     'version_type',
     'pretty',
@@ -61,8 +57,6 @@ function buildDelete (opts) {
 
   const snakeCase = {
     waitForActiveShards: 'wait_for_active_shards',
-    ifSeqNo: 'if_seq_no',
-    ifPrimaryTerm: 'if_primary_term',
     versionType: 'version_type',
     errorTrace: 'error_trace',
     filterPath: 'filter_path'
@@ -89,13 +83,20 @@ function buildDelete (opts) {
       const err = new ConfigurationError('Missing required parameter: index')
       return handleError(err, callback)
     }
+    if (params['type'] == null) {
+      const err = new ConfigurationError('Missing required parameter: type')
+      return handleError(err, callback)
+    }
     if (params.body != null) {
       const err = new ConfigurationError('This API does not require a body')
       return handleError(err, callback)
     }
 
     // check required url components
-    if (params['id'] != null && (params['index'] == null)) {
+    if (params['id'] != null && (params['type'] == null || params['index'] == null)) {
+      const err = new ConfigurationError('Missing required parameter of the url: type, index')
+      return handleError(err, callback)
+    } else if (params['type'] != null && (params['index'] == null)) {
       const err = new ConfigurationError('Missing required parameter of the url: index')
       return handleError(err, callback)
     }
@@ -106,26 +107,22 @@ function buildDelete (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, id, index, type } = params
+    var { method, body, id, index, type, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'id', 'index', 'type'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'DELETE'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
 
-    if ((index) != null && (type) != null && (id) != null) {
+    path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type) + '/' + encodeURIComponent(id)
-      path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type) + '/' + encodeURIComponent(id)
-    } else {
-      path = '/' + encodeURIComponent(index) + '/' + '_doc' + '/' + encodeURIComponent(id)
-    }
 
     // build request object
     const request = {
@@ -135,34 +132,8 @@ function buildDelete (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/delete_by_query.js

@@ -24,9 +24,9 @@
 
 function buildDeleteByQuery (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [delete_by_query](https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-delete-by-query.html) request
+   * Perform a [delete_by_query](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/docs-delete-by-query.html) request
    *
    * @param {list} index - A comma-separated list of index names to search; use `_all` or empty string to perform the operation on all indices
    * @param {list} type - A comma-separated list of document types to search; leave empty to perform the operation on all types
@@ -37,7 +37,7 @@ function buildDeleteByQuery (opts) {
    * @param {number} from - Starting offset (default: 0)
    * @param {boolean} ignore_unavailable - Whether specified concrete indices should be ignored when unavailable (missing or closed)
    * @param {boolean} allow_no_indices - Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)
-   * @param {enum} conflicts - What to do when the delete by query hits version conflicts?
+   * @param {enum} conflicts - What to do when the delete-by-query hits version conflicts?
    * @param {enum} expand_wildcards - Whether to expand wildcard expression to concrete indices that are open, closed or both.
    * @param {boolean} lenient - Specify whether format-based query failures (such as providing text to a numeric field) should be ignored
    * @param {string} preference - Specify the node or shard the operation should be performed on (default: random)
@@ -49,8 +49,8 @@ function buildDeleteByQuery (opts) {
    * @param {number} size - Number of hits to return (default: 10)
    * @param {list} sort - A comma-separated list of <field>:<direction> pairs
    * @param {list} _source - True or false to return the _source field or not, or a list of fields to return
-   * @param {list} _source_excludes - A list of fields to exclude from the returned _source field
+   * @param {list} _source_exclude - A list of fields to exclude from the returned _source field
-   * @param {list} _source_includes - A list of fields to extract and return from the _source field
+   * @param {list} _source_include - A list of fields to extract and return from the _source field
    * @param {number} terminate_after - The maximum number of documents to collect for each shard, upon reaching which the query execution will terminate early.
    * @param {list} stats - Specific 'tag' of the request for logging and statistical purposes
    * @param {boolean} version - Specify whether to return document version as part of a hit
@@ -58,8 +58,8 @@ function buildDeleteByQuery (opts) {
    * @param {boolean} refresh - Should the effected indexes be refreshed?
    * @param {time} timeout - Time each individual bulk request should wait for shards that are unavailable.
    * @param {string} wait_for_active_shards - Sets the number of shard copies that must be active before proceeding with the delete by query operation. Defaults to 1, meaning the primary shard only. Set to `all` for all shard copies, otherwise set to any non-negative value less than or equal to the total number of copies for the shard (number of replicas + 1)
-   * @param {number} scroll_size - Size on the scroll request powering the delete by query
+   * @param {number} scroll_size - Size on the scroll request powering the update_by_query
-   * @param {boolean} wait_for_completion - Should the request should block until the delete by query is complete.
+   * @param {boolean} wait_for_completion - Should the request should block until the delete-by-query is complete.
    * @param {number} requests_per_second - The throttle for this request in sub-requests per second. -1 means no throttle.
    * @param {number} slices - The number of slices this task should be divided into. Defaults to 1 meaning the task isn't sliced into subtasks.
    * @param {object} body - The search definition using the Query DSL
@@ -85,8 +85,8 @@ function buildDeleteByQuery (opts) {
     'size',
     'sort',
     '_source',
-    '_source_excludes',
+    '_source_exclude',
-    '_source_includes',
+    '_source_include',
     'terminate_after',
     'stats',
     'version',
@@ -113,8 +113,8 @@ function buildDeleteByQuery (opts) {
     expandWildcards: 'expand_wildcards',
     searchType: 'search_type',
     searchTimeout: 'search_timeout',
-    _sourceExcludes: '_source_excludes',
+    _sourceExclude: '_source_exclude',
-    _sourceIncludes: '_source_includes',
+    _sourceInclude: '_source_include',
     terminateAfter: 'terminate_after',
     requestCache: 'request_cache',
     waitForActiveShards: 'wait_for_active_shards',
@@ -159,17 +159,17 @@ function buildDeleteByQuery (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index, type } = params
+    var { method, body, index, type, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index', 'type'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'POST'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -188,34 +188,8 @@ function buildDeleteByQuery (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/delete_by_query_rethrottle.js

@@ -1,138 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-'use strict'
-
-/* eslint camelcase: 0 */
-/* eslint no-unused-vars: 0 */
-
-function buildDeleteByQueryRethrottle (opts) {
-  // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
-  /**
-   * Perform a [delete_by_query_rethrottle](https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-delete-by-query.html) request
-   *
-   * @param {string} task_id - The task id to rethrottle
-   * @param {number} requests_per_second - The throttle to set on this request in floating sub-requests per second. -1 means set no throttle.
-   */
-
-  const acceptedQuerystring = [
-    'requests_per_second',
-    'pretty',
-    'human',
-    'error_trace',
-    'source',
-    'filter_path'
-  ]
-
-  const snakeCase = {
-    requestsPerSecond: 'requests_per_second',
-    errorTrace: 'error_trace',
-    filterPath: 'filter_path'
-  }
-
-  return function deleteByQueryRethrottle (params, options, callback) {
-    options = options || {}
-    if (typeof options === 'function') {
-      callback = options
-      options = {}
-    }
-    if (typeof params === 'function' || params == null) {
-      callback = params
-      params = {}
-      options = {}
-    }
-
-    // check required parameters
-    if (params['task_id'] == null && params['taskId'] == null) {
-      const err = new ConfigurationError('Missing required parameter: task_id or taskId')
-      return handleError(err, callback)
-    }
-    if (params['requests_per_second'] == null && params['requestsPerSecond'] == null) {
-      const err = new ConfigurationError('Missing required parameter: requests_per_second or requestsPerSecond')
-      return handleError(err, callback)
-    }
-    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}`)
-      return handleError(err, callback)
-    }
-
-    var warnings = null
-    var { method, body, taskId, task_id } = params
-    var querystring = semicopy(params, ['method', 'body', 'taskId', 'task_id'])
-
-    if (method == null) {
-      method = 'POST'
-    }
-
-    var ignore = options.ignore || null
-    if (typeof ignore === 'number') {
-      ignore = [ignore]
-    }
-
-    var path = ''
-
-    path = '/' + '_delete_by_query' + '/' + encodeURIComponent(task_id || taskId) + '/' + '_rethrottle'
-
-    // build request object
-    const request = {
-      method,
-      path,
-      body: '',
-      querystring
-    }
-
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
-  }
-}
-
-module.exports = buildDeleteByQueryRethrottle

api/api/delete_script.js

@@ -24,11 +24,12 @@
 
 function buildDeleteScript (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [delete_script](http://www.elastic.co/guide/en/elasticsearch/reference/master/modules-scripting.html) request
+   * Perform a [delete_script](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/modules-scripting.html) request
    *
    * @param {string} id - Script ID
+   * @param {string} lang - Script language
    * @param {time} timeout - Explicit operation timeout
    * @param {time} master_timeout - Specify timeout for connection to master
    */
@@ -66,33 +67,47 @@ function buildDeleteScript (opts) {
       const err = new ConfigurationError('Missing required parameter: id')
       return handleError(err, callback)
     }
+    if (params['lang'] == null) {
+      const err = new ConfigurationError('Missing required parameter: lang')
+      return handleError(err, callback)
+    }
     if (params.body != null) {
       const err = new ConfigurationError('This API does not require a body')
       return handleError(err, callback)
     }
 
+    // check required url components
+    if (params['id'] != null && (params['lang'] == null)) {
+      const err = new ConfigurationError('Missing required parameter of the url: lang')
+      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}`)
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, id } = params
+    var { method, body, id, lang, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'id'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'DELETE'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
 
-    path = '/' + '_scripts' + '/' + encodeURIComponent(id)
+    if ((lang) != null && (id) != null) {
+      path = '/' + '_scripts' + '/' + encodeURIComponent(lang) + '/' + encodeURIComponent(id)
+    } else {
+      path = '/' + '_scripts' + '/' + encodeURIComponent(lang)
+    }
 
     // build request object
     const request = {
@@ -102,34 +117,8 @@ function buildDeleteScript (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/delete_template.js

@@ -22,23 +22,29 @@
 /* eslint camelcase: 0 */
 /* eslint no-unused-vars: 0 */
 
-function buildMlDeleteExpiredData (opts) {
+function buildDeleteTemplate (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [ml.delete_expired_data](undefined) request
+   * Perform a [delete_template](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/search-template.html) request
    *
+   * @param {string} id - Template ID
    */
 
   const acceptedQuerystring = [
-
+    'pretty',
+    'human',
+    'error_trace',
+    'source',
+    'filter_path'
   ]
 
   const snakeCase = {
-
+    errorTrace: 'error_trace',
+    filterPath: 'filter_path'
   }
 
-  return function mlDeleteExpiredData (params, options, callback) {
+  return function deleteTemplate (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
       callback = options
@@ -51,6 +57,10 @@ function buildMlDeleteExpiredData (opts) {
     }
 
     // check required parameters
+    if (params['id'] == null) {
+      const err = new ConfigurationError('Missing required parameter: id')
+      return handleError(err, callback)
+    }
     if (params.body != null) {
       const err = new ConfigurationError('This API does not require a body')
       return handleError(err, callback)
@@ -62,22 +72,22 @@ function buildMlDeleteExpiredData (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body } = params
+    var { method, body, id, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'DELETE'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
 
-    path = '/' + '_ml' + '/' + '_delete_expired_data'
+    path = '/' + '_search' + '/' + 'template' + '/' + encodeURIComponent(id)
 
     // build request object
     const request = {
@@ -87,35 +97,9 @@ function buildMlDeleteExpiredData (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 
-module.exports = buildMlDeleteExpiredData
+module.exports = buildDeleteTemplate

api/api/exists.js

@@ -24,9 +24,9 @@
 
 function buildExists (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [exists](http://www.elastic.co/guide/en/elasticsearch/reference/master/docs-get.html) request
+   * Perform a [exists](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/docs-get.html) request
    *
    * @param {string} id - The document ID
    * @param {string} index - The name of the index
@@ -38,8 +38,8 @@ function buildExists (opts) {
    * @param {boolean} refresh - Refresh the shard containing the document before performing the operation
    * @param {string} routing - Specific routing value
    * @param {list} _source - True or false to return the _source field or not, or a list of fields to return
-   * @param {list} _source_excludes - A list of fields to exclude from the returned _source field
+   * @param {list} _source_exclude - A list of fields to exclude from the returned _source field
-   * @param {list} _source_includes - A list of fields to extract and return from the _source field
+   * @param {list} _source_include - A list of fields to extract and return from the _source field
    * @param {number} version - Explicit version number for concurrency control
    * @param {enum} version_type - Specific version type
    */
@@ -52,8 +52,8 @@ function buildExists (opts) {
     'refresh',
     'routing',
     '_source',
-    '_source_excludes',
+    '_source_exclude',
-    '_source_includes',
+    '_source_include',
     'version',
     'version_type',
     'pretty',
@@ -65,8 +65,8 @@ function buildExists (opts) {
 
   const snakeCase = {
     storedFields: 'stored_fields',
-    _sourceExcludes: '_source_excludes',
+    _sourceExclude: '_source_exclude',
-    _sourceIncludes: '_source_includes',
+    _sourceInclude: '_source_include',
     versionType: 'version_type',
     errorTrace: 'error_trace',
     filterPath: 'filter_path'
@@ -93,6 +93,10 @@ function buildExists (opts) {
       const err = new ConfigurationError('Missing required parameter: index')
       return handleError(err, callback)
     }
+    if (params['type'] == null) {
+      const err = new ConfigurationError('Missing required parameter: type')
+      return handleError(err, callback)
+    }
     if (params.body != null) {
       const err = new ConfigurationError('This API does not require a body')
       return handleError(err, callback)
@@ -104,26 +108,22 @@ function buildExists (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, id, index, type } = params
+    var { method, body, id, index, type, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'id', 'index', 'type'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'HEAD'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
 
-    if ((index) != null && (type) != null && (id) != null) {
+    path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type) + '/' + encodeURIComponent(id)
-      path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type) + '/' + encodeURIComponent(id)
-    } else {
-      path = '/' + encodeURIComponent(index) + '/' + '_doc' + '/' + encodeURIComponent(id)
-    }
 
     // build request object
     const request = {
@@ -133,34 +133,8 @@ function buildExists (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/exists_source.js

@@ -24,21 +24,21 @@
 
 function buildExistsSource (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [exists_source](http://www.elastic.co/guide/en/elasticsearch/reference/master/docs-get.html) request
    *
    * @param {string} id - The document ID
    * @param {string} index - The name of the index
-   * @param {string} type - The type of the document; deprecated and optional starting with 7.0
+   * @param {string} type - The type of the document; use `_all` to fetch the first document matching the ID across all types
    * @param {string} parent - The ID of the parent document
    * @param {string} preference - Specify the node or shard the operation should be performed on (default: random)
    * @param {boolean} realtime - Specify whether to perform the operation in realtime or search mode
    * @param {boolean} refresh - Refresh the shard containing the document before performing the operation
    * @param {string} routing - Specific routing value
    * @param {list} _source - True or false to return the _source field or not, or a list of fields to return
-   * @param {list} _source_excludes - A list of fields to exclude from the returned _source field
+   * @param {list} _source_exclude - A list of fields to exclude from the returned _source field
-   * @param {list} _source_includes - A list of fields to extract and return from the _source field
+   * @param {list} _source_include - A list of fields to extract and return from the _source field
    * @param {number} version - Explicit version number for concurrency control
    * @param {enum} version_type - Specific version type
    */
@@ -50,8 +50,8 @@ function buildExistsSource (opts) {
     'refresh',
     'routing',
     '_source',
-    '_source_excludes',
+    '_source_exclude',
-    '_source_includes',
+    '_source_include',
     'version',
     'version_type',
     'pretty',
@@ -62,8 +62,8 @@ function buildExistsSource (opts) {
   ]
 
   const snakeCase = {
-    _sourceExcludes: '_source_excludes',
+    _sourceExclude: '_source_exclude',
-    _sourceIncludes: '_source_includes',
+    _sourceInclude: '_source_include',
     versionType: 'version_type',
     errorTrace: 'error_trace',
     filterPath: 'filter_path'
@@ -90,6 +90,10 @@ function buildExistsSource (opts) {
       const err = new ConfigurationError('Missing required parameter: index')
       return handleError(err, callback)
     }
+    if (params['type'] == null) {
+      const err = new ConfigurationError('Missing required parameter: type')
+      return handleError(err, callback)
+    }
     if (params.body != null) {
       const err = new ConfigurationError('This API does not require a body')
       return handleError(err, callback)
@@ -110,26 +114,22 @@ function buildExistsSource (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, id, index, type } = params
+    var { method, body, id, index, type, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'id', 'index', 'type'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'HEAD'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
 
-    if ((index) != null && (type) != null && (id) != null) {
+    path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type) + '/' + encodeURIComponent(id) + '/' + '_source'
-      path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type) + '/' + encodeURIComponent(id) + '/' + '_source'
-    } else {
-      path = '/' + encodeURIComponent(index) + '/' + '_source' + '/' + encodeURIComponent(id)
-    }
 
     // build request object
     const request = {
@@ -139,34 +139,8 @@ function buildExistsSource (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/explain.js

@@ -24,9 +24,9 @@
 
 function buildExplain (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [explain](http://www.elastic.co/guide/en/elasticsearch/reference/master/search-explain.html) request
+   * Perform a [explain](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/search-explain.html) request
    *
    * @param {string} id - The document ID
    * @param {string} index - The name of the index
@@ -42,8 +42,8 @@ function buildExplain (opts) {
    * @param {string} q - Query in the Lucene query string syntax
    * @param {string} routing - Specific routing value
    * @param {list} _source - True or false to return the _source field or not, or a list of fields to return
-   * @param {list} _source_excludes - A list of fields to exclude from the returned _source field
+   * @param {list} _source_exclude - A list of fields to exclude from the returned _source field
-   * @param {list} _source_includes - A list of fields to extract and return from the _source field
+   * @param {list} _source_include - A list of fields to extract and return from the _source field
    * @param {object} body - The query definition using the Query DSL
    */
 
@@ -59,8 +59,8 @@ function buildExplain (opts) {
     'q',
     'routing',
     '_source',
-    '_source_excludes',
+    '_source_exclude',
-    '_source_includes',
+    '_source_include',
     'pretty',
     'human',
     'error_trace',
@@ -72,8 +72,8 @@ function buildExplain (opts) {
     analyzeWildcard: 'analyze_wildcard',
     defaultOperator: 'default_operator',
     storedFields: 'stored_fields',
-    _sourceExcludes: '_source_excludes',
+    _sourceExclude: '_source_exclude',
-    _sourceIncludes: '_source_includes',
+    _sourceInclude: '_source_include',
     errorTrace: 'error_trace',
     filterPath: 'filter_path'
   }
@@ -99,6 +99,10 @@ function buildExplain (opts) {
       const err = new ConfigurationError('Missing required parameter: index')
       return handleError(err, callback)
     }
+    if (params['type'] == null) {
+      const err = new ConfigurationError('Missing required parameter: type')
+      return handleError(err, callback)
+    }
 
     // validate headers object
     if (options.headers != null && typeof options.headers !== 'object') {
@@ -106,26 +110,22 @@ function buildExplain (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, id, index, type } = params
+    var { method, body, id, index, type, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'id', 'index', 'type'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = body == null ? 'GET' : 'POST'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
 
-    if ((index) != null && (type) != null && (id) != null) {
+    path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type) + '/' + encodeURIComponent(id) + '/' + '_explain'
-      path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type) + '/' + encodeURIComponent(id) + '/' + '_explain'
-    } else {
-      path = '/' + encodeURIComponent(index) + '/' + '_explain' + '/' + encodeURIComponent(id)
-    }
 
     // build request object
     const request = {
@@ -135,34 +135,8 @@ function buildExplain (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/field_caps.js

@@ -24,15 +24,16 @@
 
 function buildFieldCaps (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [field_caps](http://www.elastic.co/guide/en/elasticsearch/reference/master/search-field-caps.html) request
+   * Perform a [field_caps](http://www.elastic.co/guide/en/elasticsearch/reference/5.x/search-field-caps.html) request
    *
    * @param {list} index - A comma-separated list of index names; use `_all` or empty string to perform the operation on all indices
    * @param {list} fields - A comma-separated list of field names
    * @param {boolean} ignore_unavailable - Whether specified concrete indices should be ignored when unavailable (missing or closed)
    * @param {boolean} allow_no_indices - Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)
    * @param {enum} expand_wildcards - Whether to expand wildcard expression to concrete indices that are open, closed or both.
+   * @param {object} body - Field json objects containing an array of field names
    */
 
   const acceptedQuerystring = [
@@ -67,29 +68,23 @@ function buildFieldCaps (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}`)
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index } = params
+    var { method, body, index, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = body == null ? 'GET' : 'POST'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -104,38 +99,12 @@ function buildFieldCaps (opts) {
     const request = {
       method,
       path,
-      body: '',
+      body: body || '',
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/field_stats.js

@@ -22,31 +22,43 @@
 /* eslint camelcase: 0 */
 /* eslint no-unused-vars: 0 */
 
-function buildXpackMigrationGetAssistance (opts) {
+function buildFieldStats (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [xpack.migration.get_assistance](https://www.elastic.co/guide/en/elasticsearch/reference/current/migration-api-assistance.html) request
+   * Perform a [field_stats](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/search-field-stats.html) request
    *
    * @param {list} index - A comma-separated list of index names; use `_all` or empty string to perform the operation on all indices
+   * @param {list} fields - A comma-separated list of fields for to get field statistics for (min value, max value, and more)
+   * @param {enum} level - Defines if field stats should be returned on a per index level or on a cluster wide level
+   * @param {boolean} ignore_unavailable - Whether specified concrete indices should be ignored when unavailable (missing or closed)
    * @param {boolean} allow_no_indices - Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)
    * @param {enum} expand_wildcards - Whether to expand wildcard expression to concrete indices that are open, closed or both.
-   * @param {boolean} ignore_unavailable - Whether specified concrete indices should be ignored when unavailable (missing or closed)
+   * @param {object} body - Field json objects containing the name and optionally a range to filter out indices result, that have results outside the defined bounds
    */
 
   const acceptedQuerystring = [
+    'fields',
+    'level',
+    'ignore_unavailable',
     'allow_no_indices',
     'expand_wildcards',
-    'ignore_unavailable'
+    'pretty',
+    'human',
+    'error_trace',
+    'source',
+    'filter_path'
   ]
 
   const snakeCase = {
+    ignoreUnavailable: 'ignore_unavailable',
     allowNoIndices: 'allow_no_indices',
     expandWildcards: 'expand_wildcards',
-    ignoreUnavailable: 'ignore_unavailable'
+    errorTrace: 'error_trace',
+    filterPath: 'filter_path'
   }
 
-  return function xpackMigrationGetAssistance (params, options, callback) {
+  return function fieldStats (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
       callback = options
@@ -64,64 +76,38 @@ function buildXpackMigrationGetAssistance (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index } = params
+    var { method, body, index, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
-      method = 'GET'
+      method = body == null ? 'GET' : 'POST'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
 
     if ((index) != null) {
-      path = '/' + '_migration' + '/' + 'assistance' + '/' + encodeURIComponent(index)
+      path = '/' + encodeURIComponent(index) + '/' + '_field_stats'
     } else {
-      path = '/' + '_migration' + '/' + 'assistance'
+      path = '/' + '_field_stats'
     }
 
     // build request object
     const request = {
       method,
       path,
-      body: null,
+      body: body || '',
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 
-module.exports = buildXpackMigrationGetAssistance
+module.exports = buildFieldStats

api/api/get.js

@@ -24,9 +24,9 @@
 
 function buildGet (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [get](http://www.elastic.co/guide/en/elasticsearch/reference/master/docs-get.html) request
+   * Perform a [get](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/docs-get.html) request
    *
    * @param {string} id - The document ID
    * @param {string} index - The name of the index
@@ -38,8 +38,6 @@ function buildGet (opts) {
    * @param {boolean} refresh - Refresh the shard containing the document before performing the operation
    * @param {string} routing - Specific routing value
    * @param {list} _source - True or false to return the _source field or not, or a list of fields to return
-   * @param {list} _source_excludes - A list of fields to exclude from the returned _source field
-   * @param {list} _source_includes - A list of fields to extract and return from the _source field
    * @param {list} _source_exclude - A list of fields to exclude from the returned _source field
    * @param {list} _source_include - A list of fields to extract and return from the _source field
    * @param {number} version - Explicit version number for concurrency control
@@ -54,8 +52,6 @@ function buildGet (opts) {
     'refresh',
     'routing',
     '_source',
-    '_source_excludes',
-    '_source_includes',
     '_source_exclude',
     '_source_include',
     'version',
@@ -69,8 +65,6 @@ function buildGet (opts) {
 
   const snakeCase = {
     storedFields: 'stored_fields',
-    _sourceExcludes: '_source_excludes',
-    _sourceIncludes: '_source_includes',
     _sourceExclude: '_source_exclude',
     _sourceInclude: '_source_include',
     versionType: 'version_type',
@@ -99,6 +93,10 @@ function buildGet (opts) {
       const err = new ConfigurationError('Missing required parameter: index')
       return handleError(err, callback)
     }
+    if (params['type'] == null) {
+      const err = new ConfigurationError('Missing required parameter: type')
+      return handleError(err, callback)
+    }
     if (params.body != null) {
       const err = new ConfigurationError('This API does not require a body')
       return handleError(err, callback)
@@ -110,26 +108,22 @@ function buildGet (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, id, index, type } = params
+    var { method, body, id, index, type, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'id', 'index', 'type'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
 
-    if ((index) != null && (type) != null && (id) != null) {
+    path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type) + '/' + encodeURIComponent(id)
-      path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type) + '/' + encodeURIComponent(id)
-    } else {
-      path = '/' + encodeURIComponent(index) + '/' + '_doc' + '/' + encodeURIComponent(id)
-    }
 
     // build request object
     const request = {
@@ -139,34 +133,8 @@ function buildGet (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/get_script.js

@@ -24,16 +24,15 @@
 
 function buildGetScript (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [get_script](http://www.elastic.co/guide/en/elasticsearch/reference/master/modules-scripting.html) request
+   * Perform a [get_script](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/modules-scripting.html) request
    *
    * @param {string} id - Script ID
-   * @param {time} master_timeout - Specify timeout for connection to master
+   * @param {string} lang - Script language
    */
 
   const acceptedQuerystring = [
-    'master_timeout',
     'pretty',
     'human',
     'error_trace',
@@ -42,7 +41,6 @@ function buildGetScript (opts) {
   ]
 
   const snakeCase = {
-    masterTimeout: 'master_timeout',
     errorTrace: 'error_trace',
     filterPath: 'filter_path'
   }
@@ -64,33 +62,47 @@ function buildGetScript (opts) {
       const err = new ConfigurationError('Missing required parameter: id')
       return handleError(err, callback)
     }
+    if (params['lang'] == null) {
+      const err = new ConfigurationError('Missing required parameter: lang')
+      return handleError(err, callback)
+    }
     if (params.body != null) {
       const err = new ConfigurationError('This API does not require a body')
       return handleError(err, callback)
     }
 
+    // check required url components
+    if (params['id'] != null && (params['lang'] == null)) {
+      const err = new ConfigurationError('Missing required parameter of the url: lang')
+      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}`)
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, id } = params
+    var { method, body, id, lang, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'id'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
 
-    path = '/' + '_scripts' + '/' + encodeURIComponent(id)
+    if ((lang) != null && (id) != null) {
+      path = '/' + '_scripts' + '/' + encodeURIComponent(lang) + '/' + encodeURIComponent(id)
+    } else {
+      path = '/' + '_scripts' + '/' + encodeURIComponent(lang)
+    }
 
     // build request object
     const request = {
@@ -100,34 +112,8 @@ function buildGetScript (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/get_source.js

@@ -24,21 +24,21 @@
 
 function buildGetSource (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [get_source](http://www.elastic.co/guide/en/elasticsearch/reference/master/docs-get.html) request
+   * Perform a [get_source](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/docs-get.html) request
    *
    * @param {string} id - The document ID
    * @param {string} index - The name of the index
-   * @param {string} type - The type of the document; deprecated and optional starting with 7.0
+   * @param {string} type - The type of the document; use `_all` to fetch the first document matching the ID across all types
    * @param {string} parent - The ID of the parent document
    * @param {string} preference - Specify the node or shard the operation should be performed on (default: random)
    * @param {boolean} realtime - Specify whether to perform the operation in realtime or search mode
    * @param {boolean} refresh - Refresh the shard containing the document before performing the operation
    * @param {string} routing - Specific routing value
    * @param {list} _source - True or false to return the _source field or not, or a list of fields to return
-   * @param {list} _source_excludes - A list of fields to exclude from the returned _source field
+   * @param {list} _source_exclude - A list of fields to exclude from the returned _source field
-   * @param {list} _source_includes - A list of fields to extract and return from the _source field
+   * @param {list} _source_include - A list of fields to extract and return from the _source field
    * @param {number} version - Explicit version number for concurrency control
    * @param {enum} version_type - Specific version type
    */
@@ -50,8 +50,8 @@ function buildGetSource (opts) {
     'refresh',
     'routing',
     '_source',
-    '_source_excludes',
+    '_source_exclude',
-    '_source_includes',
+    '_source_include',
     'version',
     'version_type',
     'pretty',
@@ -62,8 +62,8 @@ function buildGetSource (opts) {
   ]
 
   const snakeCase = {
-    _sourceExcludes: '_source_excludes',
+    _sourceExclude: '_source_exclude',
-    _sourceIncludes: '_source_includes',
+    _sourceInclude: '_source_include',
     versionType: 'version_type',
     errorTrace: 'error_trace',
     filterPath: 'filter_path'
@@ -90,6 +90,10 @@ function buildGetSource (opts) {
       const err = new ConfigurationError('Missing required parameter: index')
       return handleError(err, callback)
     }
+    if (params['type'] == null) {
+      const err = new ConfigurationError('Missing required parameter: type')
+      return handleError(err, callback)
+    }
     if (params.body != null) {
       const err = new ConfigurationError('This API does not require a body')
       return handleError(err, callback)
@@ -101,26 +105,22 @@ function buildGetSource (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, id, index, type } = params
+    var { method, body, id, index, type, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'id', 'index', 'type'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
 
-    if ((index) != null && (type) != null && (id) != null) {
+    path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type) + '/' + encodeURIComponent(id) + '/' + '_source'
-      path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type) + '/' + encodeURIComponent(id) + '/' + '_source'
-    } else {
-      path = '/' + encodeURIComponent(index) + '/' + '_source' + '/' + encodeURIComponent(id)
-    }
 
     // build request object
     const request = {
@@ -130,34 +130,8 @@ function buildGetSource (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/get_template.js

@@ -22,23 +22,29 @@
 /* eslint camelcase: 0 */
 /* eslint no-unused-vars: 0 */
 
-function buildIlmGetStatus (opts) {
+function buildGetTemplate (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [ilm.get_status](https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-get-status.html) request
+   * Perform a [get_template](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/search-template.html) request
    *
+   * @param {string} id - Template ID
    */
 
   const acceptedQuerystring = [
-
+    'pretty',
+    'human',
+    'error_trace',
+    'source',
+    'filter_path'
   ]
 
   const snakeCase = {
-
+    errorTrace: 'error_trace',
+    filterPath: 'filter_path'
   }
 
-  return function ilmGetStatus (params, options, callback) {
+  return function getTemplate (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
       callback = options
@@ -51,6 +57,10 @@ function buildIlmGetStatus (opts) {
     }
 
     // check required parameters
+    if (params['id'] == null) {
+      const err = new ConfigurationError('Missing required parameter: id')
+      return handleError(err, callback)
+    }
     if (params.body != null) {
       const err = new ConfigurationError('This API does not require a body')
       return handleError(err, callback)
@@ -62,22 +72,22 @@ function buildIlmGetStatus (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body } = params
+    var { method, body, id, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
 
-    path = '/' + '_ilm' + '/' + 'status'
+    path = '/' + '_search' + '/' + 'template' + '/' + encodeURIComponent(id)
 
     // build request object
     const request = {
@@ -87,35 +97,9 @@ function buildIlmGetStatus (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 
-module.exports = buildIlmGetStatus
+module.exports = buildGetTemplate

api/api/ilm.delete_lifecycle.js

@@ -1,122 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-'use strict'
-
-/* eslint camelcase: 0 */
-/* eslint no-unused-vars: 0 */
-
-function buildIlmDeleteLifecycle (opts) {
-  // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
-  /**
-   * Perform a [ilm.delete_lifecycle](https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-delete-lifecycle.html) request
-   *
-   * @param {string} policy - The name of the index lifecycle policy
-   */
-
-  const acceptedQuerystring = [
-
-  ]
-
-  const snakeCase = {
-
-  }
-
-  return function ilmDeleteLifecycle (params, options, callback) {
-    options = options || {}
-    if (typeof options === 'function') {
-      callback = options
-      options = {}
-    }
-    if (typeof params === 'function' || params == null) {
-      callback = params
-      params = {}
-      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}`)
-      return handleError(err, callback)
-    }
-
-    var warnings = null
-    var { method, body, policy } = params
-    var querystring = semicopy(params, ['method', 'body', 'policy'])
-
-    if (method == null) {
-      method = 'DELETE'
-    }
-
-    var ignore = options.ignore || null
-    if (typeof ignore === 'number') {
-      ignore = [ignore]
-    }
-
-    var path = ''
-
-    path = '/' + '_ilm' + '/' + 'policy' + '/' + encodeURIComponent(policy)
-
-    // build request object
-    const request = {
-      method,
-      path,
-      body: '',
-      querystring
-    }
-
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
-  }
-}
-
-module.exports = buildIlmDeleteLifecycle

api/api/ilm.explain_lifecycle.js

@@ -1,123 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-'use strict'
-
-/* eslint camelcase: 0 */
-/* eslint no-unused-vars: 0 */
-
-function buildIlmExplainLifecycle (opts) {
-  // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
-  /**
-   * Perform a [ilm.explain_lifecycle](https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-explain-lifecycle.html) request
-   *
-   * @param {string} index - The name of the index to explain
-   * @param {boolean} human - Return data such as dates in a human readable format
-   */
-
-  const acceptedQuerystring = [
-    'human'
-  ]
-
-  const snakeCase = {
-
-  }
-
-  return function ilmExplainLifecycle (params, options, callback) {
-    options = options || {}
-    if (typeof options === 'function') {
-      callback = options
-      options = {}
-    }
-    if (typeof params === 'function' || params == null) {
-      callback = params
-      params = {}
-      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}`)
-      return handleError(err, callback)
-    }
-
-    var warnings = null
-    var { method, body, index } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
-
-    if (method == null) {
-      method = 'GET'
-    }
-
-    var ignore = options.ignore || null
-    if (typeof ignore === 'number') {
-      ignore = [ignore]
-    }
-
-    var path = ''
-
-    path = '/' + encodeURIComponent(index) + '/' + '_ilm' + '/' + 'explain'
-
-    // build request object
-    const request = {
-      method,
-      path,
-      body: null,
-      querystring
-    }
-
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
-  }
-}
-
-module.exports = buildIlmExplainLifecycle

api/api/ilm.get_lifecycle.js

@@ -1,126 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-'use strict'
-
-/* eslint camelcase: 0 */
-/* eslint no-unused-vars: 0 */
-
-function buildIlmGetLifecycle (opts) {
-  // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
-  /**
-   * Perform a [ilm.get_lifecycle](https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-get-lifecycle.html) request
-   *
-   * @param {string} policy - The name of the index lifecycle policy
-   */
-
-  const acceptedQuerystring = [
-
-  ]
-
-  const snakeCase = {
-
-  }
-
-  return function ilmGetLifecycle (params, options, callback) {
-    options = options || {}
-    if (typeof options === 'function') {
-      callback = options
-      options = {}
-    }
-    if (typeof params === 'function' || params == null) {
-      callback = params
-      params = {}
-      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}`)
-      return handleError(err, callback)
-    }
-
-    var warnings = null
-    var { method, body, policy } = params
-    var querystring = semicopy(params, ['method', 'body', 'policy'])
-
-    if (method == null) {
-      method = 'GET'
-    }
-
-    var ignore = options.ignore || null
-    if (typeof ignore === 'number') {
-      ignore = [ignore]
-    }
-
-    var path = ''
-
-    if ((policy) != null) {
-      path = '/' + '_ilm' + '/' + 'policy' + '/' + encodeURIComponent(policy)
-    } else {
-      path = '/' + '_ilm' + '/' + 'policy'
-    }
-
-    // build request object
-    const request = {
-      method,
-      path,
-      body: null,
-      querystring
-    }
-
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
-  }
-}
-
-module.exports = buildIlmGetLifecycle

api/api/ilm.move_to_step.js

@@ -1,117 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-'use strict'
-
-/* eslint camelcase: 0 */
-/* eslint no-unused-vars: 0 */
-
-function buildIlmMoveToStep (opts) {
-  // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
-  /**
-   * Perform a [ilm.move_to_step](https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-move-to-step.html) request
-   *
-   * @param {string} index - The name of the index whose lifecycle step is to change
-   * @param {object} body - The new lifecycle step to move to
-   */
-
-  const acceptedQuerystring = [
-
-  ]
-
-  const snakeCase = {
-
-  }
-
-  return function ilmMoveToStep (params, options, callback) {
-    options = options || {}
-    if (typeof options === 'function') {
-      callback = options
-      options = {}
-    }
-    if (typeof params === 'function' || params == null) {
-      callback = params
-      params = {}
-      options = {}
-    }
-
-    // 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}`)
-      return handleError(err, callback)
-    }
-
-    var warnings = null
-    var { method, body, index } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
-
-    if (method == null) {
-      method = 'POST'
-    }
-
-    var ignore = options.ignore || null
-    if (typeof ignore === 'number') {
-      ignore = [ignore]
-    }
-
-    var path = ''
-
-    path = '/' + '_ilm' + '/' + 'move' + '/' + encodeURIComponent(index)
-
-    // build request object
-    const request = {
-      method,
-      path,
-      body: body || '',
-      querystring
-    }
-
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
-  }
-}
-
-module.exports = buildIlmMoveToStep

api/api/ilm.put_lifecycle.js

@@ -1,117 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-'use strict'
-
-/* eslint camelcase: 0 */
-/* eslint no-unused-vars: 0 */
-
-function buildIlmPutLifecycle (opts) {
-  // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
-  /**
-   * Perform a [ilm.put_lifecycle](https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-put-lifecycle.html) request
-   *
-   * @param {string} policy - The name of the index lifecycle policy
-   * @param {object} body - The lifecycle policy definition to register
-   */
-
-  const acceptedQuerystring = [
-
-  ]
-
-  const snakeCase = {
-
-  }
-
-  return function ilmPutLifecycle (params, options, callback) {
-    options = options || {}
-    if (typeof options === 'function') {
-      callback = options
-      options = {}
-    }
-    if (typeof params === 'function' || params == null) {
-      callback = params
-      params = {}
-      options = {}
-    }
-
-    // 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}`)
-      return handleError(err, callback)
-    }
-
-    var warnings = null
-    var { method, body, policy } = params
-    var querystring = semicopy(params, ['method', 'body', 'policy'])
-
-    if (method == null) {
-      method = 'PUT'
-    }
-
-    var ignore = options.ignore || null
-    if (typeof ignore === 'number') {
-      ignore = [ignore]
-    }
-
-    var path = ''
-
-    path = '/' + '_ilm' + '/' + 'policy' + '/' + encodeURIComponent(policy)
-
-    // build request object
-    const request = {
-      method,
-      path,
-      body: body || '',
-      querystring
-    }
-
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
-  }
-}
-
-module.exports = buildIlmPutLifecycle

api/api/ilm.remove_policy.js

@@ -1,122 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-'use strict'
-
-/* eslint camelcase: 0 */
-/* eslint no-unused-vars: 0 */
-
-function buildIlmRemovePolicy (opts) {
-  // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
-  /**
-   * Perform a [ilm.remove_policy](https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-remove-policy.html) request
-   *
-   * @param {string} index - The name of the index to remove policy on
-   */
-
-  const acceptedQuerystring = [
-
-  ]
-
-  const snakeCase = {
-
-  }
-
-  return function ilmRemovePolicy (params, options, callback) {
-    options = options || {}
-    if (typeof options === 'function') {
-      callback = options
-      options = {}
-    }
-    if (typeof params === 'function' || params == null) {
-      callback = params
-      params = {}
-      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}`)
-      return handleError(err, callback)
-    }
-
-    var warnings = null
-    var { method, body, index } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
-
-    if (method == null) {
-      method = 'POST'
-    }
-
-    var ignore = options.ignore || null
-    if (typeof ignore === 'number') {
-      ignore = [ignore]
-    }
-
-    var path = ''
-
-    path = '/' + encodeURIComponent(index) + '/' + '_ilm' + '/' + 'remove'
-
-    // build request object
-    const request = {
-      method,
-      path,
-      body: '',
-      querystring
-    }
-
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
-  }
-}
-
-module.exports = buildIlmRemovePolicy

api/api/ilm.retry.js

@@ -1,122 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-'use strict'
-
-/* eslint camelcase: 0 */
-/* eslint no-unused-vars: 0 */
-
-function buildIlmRetry (opts) {
-  // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
-  /**
-   * Perform a [ilm.retry](https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-retry-policy.html) request
-   *
-   * @param {string} index - The name of the indices (comma-separated) whose failed lifecycle step is to be retry
-   */
-
-  const acceptedQuerystring = [
-
-  ]
-
-  const snakeCase = {
-
-  }
-
-  return function ilmRetry (params, options, callback) {
-    options = options || {}
-    if (typeof options === 'function') {
-      callback = options
-      options = {}
-    }
-    if (typeof params === 'function' || params == null) {
-      callback = params
-      params = {}
-      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}`)
-      return handleError(err, callback)
-    }
-
-    var warnings = null
-    var { method, body, index } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
-
-    if (method == null) {
-      method = 'POST'
-    }
-
-    var ignore = options.ignore || null
-    if (typeof ignore === 'number') {
-      ignore = [ignore]
-    }
-
-    var path = ''
-
-    path = '/' + encodeURIComponent(index) + '/' + '_ilm' + '/' + 'retry'
-
-    // build request object
-    const request = {
-      method,
-      path,
-      body: '',
-      querystring
-    }
-
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
-  }
-}
-
-module.exports = buildIlmRetry

api/api/ilm.start.js

@@ -1,121 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-'use strict'
-
-/* eslint camelcase: 0 */
-/* eslint no-unused-vars: 0 */
-
-function buildIlmStart (opts) {
-  // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
-  /**
-   * Perform a [ilm.start](https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-start.html) request
-   *
-   */
-
-  const acceptedQuerystring = [
-
-  ]
-
-  const snakeCase = {
-
-  }
-
-  return function ilmStart (params, options, callback) {
-    options = options || {}
-    if (typeof options === 'function') {
-      callback = options
-      options = {}
-    }
-    if (typeof params === 'function' || params == null) {
-      callback = params
-      params = {}
-      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}`)
-      return handleError(err, callback)
-    }
-
-    var warnings = null
-    var { method, body } = params
-    var querystring = semicopy(params, ['method', 'body'])
-
-    if (method == null) {
-      method = 'POST'
-    }
-
-    var ignore = options.ignore || null
-    if (typeof ignore === 'number') {
-      ignore = [ignore]
-    }
-
-    var path = ''
-
-    path = '/' + '_ilm' + '/' + 'start'
-
-    // build request object
-    const request = {
-      method,
-      path,
-      body: '',
-      querystring
-    }
-
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
-  }
-}
-
-module.exports = buildIlmStart

api/api/ilm.stop.js

@@ -1,121 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-'use strict'
-
-/* eslint camelcase: 0 */
-/* eslint no-unused-vars: 0 */
-
-function buildIlmStop (opts) {
-  // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
-  /**
-   * Perform a [ilm.stop](https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-stop.html) request
-   *
-   */
-
-  const acceptedQuerystring = [
-
-  ]
-
-  const snakeCase = {
-
-  }
-
-  return function ilmStop (params, options, callback) {
-    options = options || {}
-    if (typeof options === 'function') {
-      callback = options
-      options = {}
-    }
-    if (typeof params === 'function' || params == null) {
-      callback = params
-      params = {}
-      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}`)
-      return handleError(err, callback)
-    }
-
-    var warnings = null
-    var { method, body } = params
-    var querystring = semicopy(params, ['method', 'body'])
-
-    if (method == null) {
-      method = 'POST'
-    }
-
-    var ignore = options.ignore || null
-    if (typeof ignore === 'number') {
-      ignore = [ignore]
-    }
-
-    var path = ''
-
-    path = '/' + '_ilm' + '/' + 'stop'
-
-    // build request object
-    const request = {
-      method,
-      path,
-      body: '',
-      querystring
-    }
-
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
-  }
-}
-
-module.exports = buildIlmStop

api/api/index.js

@@ -24,9 +24,9 @@
 
 function buildIndex (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [index](http://www.elastic.co/guide/en/elasticsearch/reference/master/docs-index_.html) request
+   * Perform a [index](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/docs-index_.html) request
    *
    * @param {string} id - Document ID
    * @param {string} index - The name of the index
@@ -37,10 +37,10 @@ function buildIndex (opts) {
    * @param {enum} refresh - If `true` then refresh the affected shards to make this operation visible to search, if `wait_for` then wait for a refresh to make this operation visible to search, if `false` (the default) then do nothing with refreshes.
    * @param {string} routing - Specific routing value
    * @param {time} timeout - Explicit operation timeout
+   * @param {time} timestamp - Explicit timestamp for the document
+   * @param {time} ttl - Expiration time for the document
    * @param {number} version - Explicit version number for concurrency control
    * @param {enum} version_type - Specific version type
-   * @param {number} if_seq_no - only perform the index operation if the last operation that has changed the document has the specified sequence number
-   * @param {number} if_primary_term - only perform the index operation if the last operation that has changed the document has the specified primary term
    * @param {string} pipeline - The pipeline id to preprocess incoming documents with
    * @param {object} body - The document
    */
@@ -52,10 +52,10 @@ function buildIndex (opts) {
     'refresh',
     'routing',
     'timeout',
+    'timestamp',
+    'ttl',
     'version',
     'version_type',
-    'if_seq_no',
-    'if_primary_term',
     'pipeline',
     'pretty',
     'human',
@@ -68,8 +68,6 @@ function buildIndex (opts) {
     waitForActiveShards: 'wait_for_active_shards',
     opType: 'op_type',
     versionType: 'version_type',
-    ifSeqNo: 'if_seq_no',
-    ifPrimaryTerm: 'if_primary_term',
     errorTrace: 'error_trace',
     filterPath: 'filter_path'
   }
@@ -91,13 +89,20 @@ function buildIndex (opts) {
       const err = new ConfigurationError('Missing required parameter: index')
       return handleError(err, callback)
     }
+    if (params['type'] == null) {
+      const err = new ConfigurationError('Missing required parameter: type')
+      return handleError(err, callback)
+    }
     if (params['body'] == null) {
       const err = new ConfigurationError('Missing required parameter: body')
       return handleError(err, callback)
     }
 
     // check required url components
-    if (params['id'] != null && (params['index'] == null)) {
+    if (params['id'] != null && (params['type'] == null || params['index'] == null)) {
+      const err = new ConfigurationError('Missing required parameter of the url: type, index')
+      return handleError(err, callback)
+    } else if (params['type'] != null && (params['index'] == null)) {
       const err = new ConfigurationError('Missing required parameter of the url: index')
       return handleError(err, callback)
     }
@@ -108,29 +113,25 @@ function buildIndex (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, id, index, type } = params
+    var { method, body, id, index, type, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'id', 'index', 'type'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'POST'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
 
     if ((index) != null && (type) != null && (id) != null) {
       path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type) + '/' + encodeURIComponent(id)
-    } else if ((index) != null && (id) != null) {
-      path = '/' + encodeURIComponent(index) + '/' + '_doc' + '/' + encodeURIComponent(id)
-    } else if ((index) != null && (type) != null) {
-      path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type)
     } else {
-      path = '/' + encodeURIComponent(index) + '/' + '_doc'
+      path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type)
     }
 
     // build request object
@@ -141,34 +142,8 @@ function buildIndex (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/indices.analyze.js

@@ -24,17 +24,37 @@
 
 function buildIndicesAnalyze (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [indices.analyze](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-analyze.html) request
+   * Perform a [indices.analyze](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-analyze.html) request
    *
    * @param {string} index - The name of the index to scope the operation
+   * @param {string} analyzer - The name of the analyzer to use
+   * @param {list} char_filter - A comma-separated list of character filters to use for the analysis
+   * @param {string} field - Use the analyzer configured for this field (instead of passing the analyzer name)
+   * @param {list} filter - A comma-separated list of filters to use for the analysis
    * @param {string} index - The name of the index to scope the operation
-   * @param {object} body - Define analyzer/tokenizer parameters and the text on which the analysis should be performed
+   * @param {boolean} prefer_local - With `true`, specify that a local shard should be used if available, with `false`, use a random shard (default: true)
+   * @param {list} text - The text on which the analysis should be performed (when request body is not used)
+   * @param {string} tokenizer - The name of the tokenizer to use for the analysis
+   * @param {boolean} explain - With `true`, outputs more advanced details. (default: false)
+   * @param {list} attributes - A comma-separated list of token attributes to output, this parameter works only with `explain=true`
+   * @param {enum} format - Format of the output
+   * @param {object} body - The text on which the analysis should be performed
    */
 
   const acceptedQuerystring = [
+    'analyzer',
+    'char_filter',
+    'field',
+    'filter',
     'index',
+    'prefer_local',
+    'text',
+    'tokenizer',
+    'explain',
+    'attributes',
+    'format',
     'pretty',
     'human',
     'error_trace',
@@ -43,6 +63,8 @@ function buildIndicesAnalyze (opts) {
   ]
 
   const snakeCase = {
+    charFilter: 'char_filter',
+    preferLocal: 'prefer_local',
     errorTrace: 'error_trace',
     filterPath: 'filter_path'
   }
@@ -65,17 +87,17 @@ function buildIndicesAnalyze (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index } = params
+    var { method, body, index, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = body == null ? 'GET' : 'POST'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -94,34 +116,8 @@ function buildIndicesAnalyze (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/indices.clear_cache.js

@@ -24,22 +24,26 @@
 
 function buildIndicesClearCache (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [indices.clear_cache](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-clearcache.html) request
+   * Perform a [indices.clear_cache](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-clearcache.html) request
    *
    * @param {list} index - A comma-separated list of index name to limit the operation
+   * @param {boolean} field_data - Clear field data
    * @param {boolean} fielddata - Clear field data
-   * @param {list} fields - A comma-separated list of fields to clear when using the `fielddata` parameter (default: all)
+   * @param {list} fields - A comma-separated list of fields to clear when using the `field_data` parameter (default: all)
    * @param {boolean} query - Clear query caches
    * @param {boolean} ignore_unavailable - Whether specified concrete indices should be ignored when unavailable (missing or closed)
    * @param {boolean} allow_no_indices - Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)
    * @param {enum} expand_wildcards - Whether to expand wildcard expression to concrete indices that are open, closed or both.
    * @param {list} index - A comma-separated list of index name to limit the operation
+   * @param {boolean} recycler - Clear the recycler cache
+   * @param {boolean} request_cache - Clear request cache
    * @param {boolean} request - Clear request cache
    */
 
   const acceptedQuerystring = [
+    'field_data',
     'fielddata',
     'fields',
     'query',
@@ -47,6 +51,8 @@ function buildIndicesClearCache (opts) {
     'allow_no_indices',
     'expand_wildcards',
     'index',
+    'recycler',
+    'request_cache',
     'request',
     'pretty',
     'human',
@@ -56,9 +62,11 @@ function buildIndicesClearCache (opts) {
   ]
 
   const snakeCase = {
+    fieldData: 'field_data',
     ignoreUnavailable: 'ignore_unavailable',
     allowNoIndices: 'allow_no_indices',
     expandWildcards: 'expand_wildcards',
+    requestCache: 'request_cache',
     errorTrace: 'error_trace',
     filterPath: 'filter_path'
   }
@@ -87,17 +95,17 @@ function buildIndicesClearCache (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index } = params
+    var { method, body, index, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
-      method = 'POST'
+      method = body == null ? 'GET' : 'POST'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -116,34 +124,8 @@ function buildIndicesClearCache (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/indices.close.js

@@ -24,9 +24,9 @@
 
 function buildIndicesClose (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [indices.close](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-open-close.html) request
+   * Perform a [indices.close](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-open-close.html) request
    *
    * @param {list} index - A comma separated list of indices to close
    * @param {time} timeout - Explicit operation timeout
@@ -86,17 +86,17 @@ function buildIndicesClose (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index } = params
+    var { method, body, index, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'POST'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -111,34 +111,8 @@ function buildIndicesClose (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/indices.create.js

@@ -24,23 +24,23 @@
 
 function buildIndicesCreate (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [indices.create](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-create-index.html) request
+   * Perform a [indices.create](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-create-index.html) request
    *
    * @param {string} index - The name of the index
-   * @param {boolean} include_type_name - Whether a type should be expected in the body of the mappings.
    * @param {string} wait_for_active_shards - Set the number of active shards to wait for before the operation returns.
    * @param {time} timeout - Explicit operation timeout
    * @param {time} master_timeout - Specify timeout for connection to master
+   * @param {boolean} update_all_types - Whether to update the mapping for all fields with the same name across all types or not
    * @param {object} body - The configuration for the index (`settings` and `mappings`)
    */
 
   const acceptedQuerystring = [
-    'include_type_name',
     'wait_for_active_shards',
     'timeout',
     'master_timeout',
+    'update_all_types',
     'pretty',
     'human',
     'error_trace',
@@ -49,9 +49,9 @@ function buildIndicesCreate (opts) {
   ]
 
   const snakeCase = {
-    includeTypeName: 'include_type_name',
     waitForActiveShards: 'wait_for_active_shards',
     masterTimeout: 'master_timeout',
+    updateAllTypes: 'update_all_types',
     errorTrace: 'error_trace',
     filterPath: 'filter_path'
   }
@@ -80,17 +80,17 @@ function buildIndicesCreate (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index } = params
+    var { method, body, index, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'PUT'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -105,34 +105,8 @@ function buildIndicesCreate (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/indices.delete.js

@@ -24,24 +24,18 @@
 
 function buildIndicesDelete (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [indices.delete](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-delete-index.html) request
+   * Perform a [indices.delete](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-delete-index.html) request
    *
    * @param {list} index - A comma-separated list of indices to delete; use `_all` or `*` string to delete all indices
    * @param {time} timeout - Explicit operation timeout
    * @param {time} master_timeout - Specify timeout for connection to master
-   * @param {boolean} ignore_unavailable - Ignore unavailable indexes (default: false)
-   * @param {boolean} allow_no_indices - Ignore if a wildcard expression resolves to no concrete indices (default: false)
-   * @param {enum} expand_wildcards - Whether wildcard expressions should get expanded to open or closed indices (default: open)
    */
 
   const acceptedQuerystring = [
     'timeout',
     'master_timeout',
-    'ignore_unavailable',
-    'allow_no_indices',
-    'expand_wildcards',
     'pretty',
     'human',
     'error_trace',
@@ -51,9 +45,6 @@ function buildIndicesDelete (opts) {
 
   const snakeCase = {
     masterTimeout: 'master_timeout',
-    ignoreUnavailable: 'ignore_unavailable',
-    allowNoIndices: 'allow_no_indices',
-    expandWildcards: 'expand_wildcards',
     errorTrace: 'error_trace',
     filterPath: 'filter_path'
   }
@@ -86,17 +77,17 @@ function buildIndicesDelete (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index } = params
+    var { method, body, index, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'DELETE'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -111,34 +102,8 @@ function buildIndicesDelete (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/indices.delete_alias.js

@@ -24,9 +24,9 @@
 
 function buildIndicesDeleteAlias (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [indices.delete_alias](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-aliases.html) request
+   * Perform a [indices.delete_alias](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-aliases.html) request
    *
    * @param {list} index - A comma-separated list of index names (supports wildcards); use `_all` for all indices
    * @param {list} name - A comma-separated list of aliases to delete (supports wildcards); use `_all` to delete all aliases for the specified indices.
@@ -88,17 +88,17 @@ function buildIndicesDeleteAlias (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index, name } = params
+    var { method, body, index, name, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index', 'name'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'DELETE'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -117,34 +117,8 @@ function buildIndicesDeleteAlias (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/indices.delete_template.js

@@ -24,9 +24,9 @@
 
 function buildIndicesDeleteTemplate (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [indices.delete_template](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-templates.html) request
+   * Perform a [indices.delete_template](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-templates.html) request
    *
    * @param {string} name - The name of the template
    * @param {time} timeout - Explicit operation timeout
@@ -77,17 +77,17 @@ function buildIndicesDeleteTemplate (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, name } = params
+    var { method, body, name, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'name'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'DELETE'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -102,34 +102,8 @@ function buildIndicesDeleteTemplate (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/indices.exists.js

@@ -24,9 +24,9 @@
 
 function buildIndicesExists (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [indices.exists](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-exists.html) request
+   * Perform a [indices.exists](http://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-exists.html) request
    *
    * @param {list} index - A comma-separated list of index names
    * @param {boolean} local - Return local information, do not retrieve the state from master node (default: false)
@@ -89,17 +89,17 @@ function buildIndicesExists (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index } = params
+    var { method, body, index, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'HEAD'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -114,34 +114,8 @@ function buildIndicesExists (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/indices.exists_alias.js

@@ -24,9 +24,9 @@
 
 function buildIndicesExistsAlias (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [indices.exists_alias](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-aliases.html) request
+   * Perform a [indices.exists_alias](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-aliases.html) request
    *
    * @param {list} index - A comma-separated list of index names to filter aliases
    * @param {list} name - A comma-separated list of alias names to return
@@ -69,10 +69,6 @@ function buildIndicesExistsAlias (opts) {
     }
 
     // check required parameters
-    if (params['name'] == null) {
-      const err = new ConfigurationError('Missing required parameter: name')
-      return handleError(err, callback)
-    }
     if (params.body != null) {
       const err = new ConfigurationError('This API does not require a body')
       return handleError(err, callback)
@@ -84,17 +80,17 @@ function buildIndicesExistsAlias (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index, name } = params
+    var { method, body, index, name, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index', 'name'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'HEAD'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -113,34 +109,8 @@ function buildIndicesExistsAlias (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/indices.exists_template.js

@@ -24,9 +24,9 @@
 
 function buildIndicesExistsTemplate (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [indices.exists_template](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-templates.html) request
+   * Perform a [indices.exists_template](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-templates.html) request
    *
    * @param {list} name - The comma separated names of the index templates
    * @param {boolean} flat_settings - Return settings in flat format (default: false)
@@ -80,17 +80,17 @@ function buildIndicesExistsTemplate (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, name } = params
+    var { method, body, name, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'name'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'HEAD'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -105,34 +105,8 @@ function buildIndicesExistsTemplate (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/indices.exists_type.js

@@ -24,9 +24,9 @@
 
 function buildIndicesExistsType (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [indices.exists_type](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-types-exists.html) request
+   * Perform a [indices.exists_type](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-types-exists.html) request
    *
    * @param {list} index - A comma-separated list of index names; use `_all` to check the types across all indices
    * @param {list} type - A comma-separated list of document types to check
@@ -94,17 +94,17 @@ function buildIndicesExistsType (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index, type } = params
+    var { method, body, index, type, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index', 'type'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'HEAD'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -119,34 +119,8 @@ function buildIndicesExistsType (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/indices.flush.js

@@ -24,9 +24,9 @@
 
 function buildIndicesFlush (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [indices.flush](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-flush.html) request
+   * Perform a [indices.flush](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-flush.html) request
    *
    * @param {list} index - A comma-separated list of index names; use `_all` or empty string for all indices
    * @param {boolean} force - Whether a flush should be forced even if it is not necessarily needed ie. if no changes will be committed to the index. This is useful if transaction log IDs should be incremented even if no uncommitted changes are present. (This setting can be considered as internal)
@@ -82,17 +82,17 @@ function buildIndicesFlush (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index } = params
+    var { method, body, index, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = body == null ? 'GET' : 'POST'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -111,34 +111,8 @@ function buildIndicesFlush (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/indices.flush_synced.js

@@ -24,9 +24,9 @@
 
 function buildIndicesFlushSynced (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [indices.flush_synced](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-synced-flush.html) request
+   * Perform a [indices.flush_synced](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-synced-flush.html) request
    *
    * @param {list} index - A comma-separated list of index names; use `_all` or empty string for all indices
    * @param {boolean} ignore_unavailable - Whether specified concrete indices should be ignored when unavailable (missing or closed)
@@ -77,17 +77,17 @@ function buildIndicesFlushSynced (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index } = params
+    var { method, body, index, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = body == null ? 'GET' : 'POST'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -106,34 +106,8 @@ function buildIndicesFlushSynced (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/indices.forcemerge.js

@@ -24,9 +24,9 @@
 
 function buildIndicesForcemerge (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [indices.forcemerge](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-forcemerge.html) request
+   * Perform a [indices.forcemerge](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-forcemerge.html) request
    *
    * @param {list} index - A comma-separated list of index names; use `_all` or empty string to perform the operation on all indices
    * @param {boolean} flush - Specify whether the index should be flushed after performing the operation (default: true)
@@ -35,6 +35,8 @@ function buildIndicesForcemerge (opts) {
    * @param {enum} expand_wildcards - Whether to expand wildcard expression to concrete indices that are open, closed or both.
    * @param {number} max_num_segments - The number of segments the index should be merged into (default: dynamic)
    * @param {boolean} only_expunge_deletes - Specify whether the operation should only expunge deleted documents
+   * @param {undefined} operation_threading - TODO: ?
+   * @param {boolean} wait_for_merge - Specify whether the request should block until the merge process is finished (default: true)
    */
 
   const acceptedQuerystring = [
@@ -44,6 +46,8 @@ function buildIndicesForcemerge (opts) {
     'expand_wildcards',
     'max_num_segments',
     'only_expunge_deletes',
+    'operation_threading',
+    'wait_for_merge',
     'pretty',
     'human',
     'error_trace',
@@ -57,6 +61,8 @@ function buildIndicesForcemerge (opts) {
     expandWildcards: 'expand_wildcards',
     maxNumSegments: 'max_num_segments',
     onlyExpungeDeletes: 'only_expunge_deletes',
+    operationThreading: 'operation_threading',
+    waitForMerge: 'wait_for_merge',
     errorTrace: 'error_trace',
     filterPath: 'filter_path'
   }
@@ -85,17 +91,17 @@ function buildIndicesForcemerge (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index } = params
+    var { method, body, index, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'POST'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -114,34 +120,8 @@ function buildIndicesForcemerge (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/indices.get.js

@@ -24,30 +24,27 @@
 
 function buildIndicesGet (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [indices.get](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-get-index.html) request
+   * Perform a [indices.get](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-get-index.html) request
    *
    * @param {list} index - A comma-separated list of index names
-   * @param {boolean} include_type_name - Whether to add the type name to the response (default: false)
+   * @param {list} feature - A comma-separated list of features
    * @param {boolean} local - Return local information, do not retrieve the state from master node (default: false)
    * @param {boolean} ignore_unavailable - Ignore unavailable indexes (default: false)
    * @param {boolean} allow_no_indices - Ignore if a wildcard expression resolves to no concrete indices (default: false)
    * @param {enum} expand_wildcards - Whether wildcard expressions should get expanded to open or closed indices (default: open)
    * @param {boolean} flat_settings - Return settings in flat format (default: false)
    * @param {boolean} include_defaults - Whether to return all default setting for each of the indices.
-   * @param {time} master_timeout - Specify timeout for connection to master
    */
 
   const acceptedQuerystring = [
-    'include_type_name',
     'local',
     'ignore_unavailable',
     'allow_no_indices',
     'expand_wildcards',
     'flat_settings',
     'include_defaults',
-    'master_timeout',
     'pretty',
     'human',
     'error_trace',
@@ -56,13 +53,11 @@ function buildIndicesGet (opts) {
   ]
 
   const snakeCase = {
-    includeTypeName: 'include_type_name',
     ignoreUnavailable: 'ignore_unavailable',
     allowNoIndices: 'allow_no_indices',
     expandWildcards: 'expand_wildcards',
     flatSettings: 'flat_settings',
     includeDefaults: 'include_defaults',
-    masterTimeout: 'master_timeout',
     errorTrace: 'error_trace',
     filterPath: 'filter_path'
   }
@@ -89,28 +84,38 @@ function buildIndicesGet (opts) {
       return handleError(err, callback)
     }
 
+    // check required url components
+    if (params['feature'] != null && (params['index'] == null)) {
+      const err = new ConfigurationError('Missing required parameter of the url: index')
+      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}`)
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index } = params
+    var { method, body, index, feature, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
 
-    path = '/' + encodeURIComponent(index)
+    if ((index) != null && (feature) != null) {
+      path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(feature)
+    } else {
+      path = '/' + encodeURIComponent(index)
+    }
 
     // build request object
     const request = {
@@ -120,34 +125,8 @@ function buildIndicesGet (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/indices.get_alias.js

@@ -24,9 +24,9 @@
 
 function buildIndicesGetAlias (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [indices.get_alias](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-aliases.html) request
+   * Perform a [indices.get_alias](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-aliases.html) request
    *
    * @param {list} index - A comma-separated list of index names to filter aliases
    * @param {list} name - A comma-separated list of alias names to return
@@ -80,17 +80,17 @@ function buildIndicesGetAlias (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index, name } = params
+    var { method, body, index, name, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index', 'name'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -113,34 +113,8 @@ function buildIndicesGetAlias (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/indices.get_field_mapping.js

@@ -24,14 +24,13 @@
 
 function buildIndicesGetFieldMapping (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [indices.get_field_mapping](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-get-field-mapping.html) request
+   * Perform a [indices.get_field_mapping](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-get-field-mapping.html) request
    *
    * @param {list} index - A comma-separated list of index names
    * @param {list} type - A comma-separated list of document types
    * @param {list} fields - A comma-separated list of fields
-   * @param {boolean} include_type_name - Whether a type should be returned in the body of the mappings.
    * @param {boolean} include_defaults - Whether the default mapping values should be returned as well
    * @param {boolean} ignore_unavailable - Whether specified concrete indices should be ignored when unavailable (missing or closed)
    * @param {boolean} allow_no_indices - Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)
@@ -40,7 +39,6 @@ function buildIndicesGetFieldMapping (opts) {
    */
 
   const acceptedQuerystring = [
-    'include_type_name',
     'include_defaults',
     'ignore_unavailable',
     'allow_no_indices',
@@ -54,7 +52,6 @@ function buildIndicesGetFieldMapping (opts) {
   ]
 
   const snakeCase = {
-    includeTypeName: 'include_type_name',
     includeDefaults: 'include_defaults',
     ignoreUnavailable: 'ignore_unavailable',
     allowNoIndices: 'allow_no_indices',
@@ -91,17 +88,17 @@ function buildIndicesGetFieldMapping (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index, type, fields } = params
+    var { method, body, index, type, fields, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index', 'type', 'fields'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -124,34 +121,8 @@ function buildIndicesGetFieldMapping (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/indices.get_mapping.js

@@ -24,26 +24,22 @@
 
 function buildIndicesGetMapping (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [indices.get_mapping](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-get-mapping.html) request
+   * Perform a [indices.get_mapping](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-get-mapping.html) request
    *
    * @param {list} index - A comma-separated list of index names
    * @param {list} type - A comma-separated list of document types
-   * @param {boolean} include_type_name - Whether to add the type name to the response (default: false)
    * @param {boolean} ignore_unavailable - Whether specified concrete indices should be ignored when unavailable (missing or closed)
    * @param {boolean} allow_no_indices - Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)
    * @param {enum} expand_wildcards - Whether to expand wildcard expression to concrete indices that are open, closed or both.
-   * @param {time} master_timeout - Specify timeout for connection to master
    * @param {boolean} local - Return local information, do not retrieve the state from master node (default: false)
    */
 
   const acceptedQuerystring = [
-    'include_type_name',
     'ignore_unavailable',
     'allow_no_indices',
     'expand_wildcards',
-    'master_timeout',
     'local',
     'pretty',
     'human',
@@ -53,11 +49,9 @@ function buildIndicesGetMapping (opts) {
   ]
 
   const snakeCase = {
-    includeTypeName: 'include_type_name',
     ignoreUnavailable: 'ignore_unavailable',
     allowNoIndices: 'allow_no_indices',
     expandWildcards: 'expand_wildcards',
-    masterTimeout: 'master_timeout',
     errorTrace: 'error_trace',
     filterPath: 'filter_path'
   }
@@ -86,17 +80,17 @@ function buildIndicesGetMapping (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index, type } = params
+    var { method, body, index, type, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index', 'type'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -119,34 +113,8 @@ function buildIndicesGetMapping (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/indices.get_settings.js

@@ -24,13 +24,12 @@
 
 function buildIndicesGetSettings (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [indices.get_settings](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-get-settings.html) request
+   * Perform a [indices.get_settings](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-get-settings.html) request
    *
    * @param {list} index - A comma-separated list of index names; use `_all` or empty string to perform the operation on all indices
    * @param {list} name - The name of the settings that should be included
-   * @param {time} master_timeout - Specify timeout for connection to master
    * @param {boolean} ignore_unavailable - Whether specified concrete indices should be ignored when unavailable (missing or closed)
    * @param {boolean} allow_no_indices - Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)
    * @param {enum} expand_wildcards - Whether to expand wildcard expression to concrete indices that are open, closed or both.
@@ -40,7 +39,6 @@ function buildIndicesGetSettings (opts) {
    */
 
   const acceptedQuerystring = [
-    'master_timeout',
     'ignore_unavailable',
     'allow_no_indices',
     'expand_wildcards',
@@ -55,7 +53,6 @@ function buildIndicesGetSettings (opts) {
   ]
 
   const snakeCase = {
-    masterTimeout: 'master_timeout',
     ignoreUnavailable: 'ignore_unavailable',
     allowNoIndices: 'allow_no_indices',
     expandWildcards: 'expand_wildcards',
@@ -89,17 +86,17 @@ function buildIndicesGetSettings (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index, name } = params
+    var { method, body, index, name, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index', 'name'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -122,34 +119,8 @@ function buildIndicesGetSettings (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/indices.get_template.js

@@ -24,19 +24,17 @@
 
 function buildIndicesGetTemplate (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [indices.get_template](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-templates.html) request
+   * Perform a [indices.get_template](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-templates.html) request
    *
    * @param {list} name - The comma separated names of the index templates
-   * @param {boolean} include_type_name - Whether a type should be returned in the body of the mappings.
    * @param {boolean} flat_settings - Return settings in flat format (default: false)
    * @param {time} master_timeout - Explicit operation timeout for connection to master node
    * @param {boolean} local - Return local information, do not retrieve the state from master node (default: false)
    */
 
   const acceptedQuerystring = [
-    'include_type_name',
     'flat_settings',
     'master_timeout',
     'local',
@@ -48,7 +46,6 @@ function buildIndicesGetTemplate (opts) {
   ]
 
   const snakeCase = {
-    includeTypeName: 'include_type_name',
     flatSettings: 'flat_settings',
     masterTimeout: 'master_timeout',
     errorTrace: 'error_trace',
@@ -79,17 +76,17 @@ function buildIndicesGetTemplate (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, name } = params
+    var { method, body, name, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'name'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -108,34 +105,8 @@ function buildIndicesGetTemplate (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/indices.get_upgrade.js

@@ -24,9 +24,9 @@
 
 function buildIndicesGetUpgrade (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [indices.get_upgrade](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-upgrade.html) request
+   * Perform a [indices.get_upgrade](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-upgrade.html) request
    *
    * @param {list} index - A comma-separated list of index names; use `_all` or empty string to perform the operation on all indices
    * @param {boolean} ignore_unavailable - Whether specified concrete indices should be ignored when unavailable (missing or closed)
@@ -77,17 +77,17 @@ function buildIndicesGetUpgrade (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index } = params
+    var { method, body, index, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -106,34 +106,8 @@ function buildIndicesGetUpgrade (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/indices.open.js

@@ -24,9 +24,9 @@
 
 function buildIndicesOpen (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [indices.open](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-open-close.html) request
+   * Perform a [indices.open](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-open-close.html) request
    *
    * @param {list} index - A comma separated list of indices to open
    * @param {time} timeout - Explicit operation timeout
@@ -34,7 +34,6 @@ function buildIndicesOpen (opts) {
    * @param {boolean} ignore_unavailable - Whether specified concrete indices should be ignored when unavailable (missing or closed)
    * @param {boolean} allow_no_indices - Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)
    * @param {enum} expand_wildcards - Whether to expand wildcard expression to concrete indices that are open, closed or both.
-   * @param {string} wait_for_active_shards - Sets the number of active shards to wait for before the operation returns.
    */
 
   const acceptedQuerystring = [
@@ -43,7 +42,6 @@ function buildIndicesOpen (opts) {
     'ignore_unavailable',
     'allow_no_indices',
     'expand_wildcards',
-    'wait_for_active_shards',
     'pretty',
     'human',
     'error_trace',
@@ -56,7 +54,6 @@ function buildIndicesOpen (opts) {
     ignoreUnavailable: 'ignore_unavailable',
     allowNoIndices: 'allow_no_indices',
     expandWildcards: 'expand_wildcards',
-    waitForActiveShards: 'wait_for_active_shards',
     errorTrace: 'error_trace',
     filterPath: 'filter_path'
   }
@@ -89,17 +86,17 @@ function buildIndicesOpen (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index } = params
+    var { method, body, index, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'POST'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -114,34 +111,8 @@ function buildIndicesOpen (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/indices.put_alias.js

@@ -24,9 +24,9 @@
 
 function buildIndicesPutAlias (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [indices.put_alias](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-aliases.html) request
+   * Perform a [indices.put_alias](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-aliases.html) request
    *
    * @param {list} index - A comma-separated list of index names the alias should point to (supports wildcards); use `_all` to perform the operation on all indices.
    * @param {string} name - The name of the alias to be created or updated
@@ -85,17 +85,17 @@ function buildIndicesPutAlias (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index, name } = params
+    var { method, body, index, name, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index', 'name'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'PUT'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -114,34 +114,8 @@ function buildIndicesPutAlias (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }
 

api/api/indices.put_mapping.js

@@ -24,28 +24,28 @@
 
 function buildIndicesPutMapping (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
-   * Perform a [indices.put_mapping](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-put-mapping.html) request
+   * Perform a [indices.put_mapping](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-put-mapping.html) request
    *
    * @param {list} index - A comma-separated list of index names the mapping should be added to (supports wildcards); use `_all` or omit to add the mapping on all indices.
    * @param {string} type - The name of the document type
-   * @param {boolean} include_type_name - Whether a type should be expected in the body of the mappings.
    * @param {time} timeout - Explicit operation timeout
    * @param {time} master_timeout - Specify timeout for connection to master
    * @param {boolean} ignore_unavailable - Whether specified concrete indices should be ignored when unavailable (missing or closed)
    * @param {boolean} allow_no_indices - Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)
    * @param {enum} expand_wildcards - Whether to expand wildcard expression to concrete indices that are open, closed or both.
+   * @param {boolean} update_all_types - Whether to update the mapping for all fields with the same name across all types or not
    * @param {object} body - The mapping definition
    */
 
   const acceptedQuerystring = [
-    'include_type_name',
     'timeout',
     'master_timeout',
     'ignore_unavailable',
     'allow_no_indices',
     'expand_wildcards',
+    'update_all_types',
     'pretty',
     'human',
     'error_trace',
@@ -54,11 +54,11 @@ function buildIndicesPutMapping (opts) {
   ]
 
   const snakeCase = {
-    includeTypeName: 'include_type_name',
     masterTimeout: 'master_timeout',
     ignoreUnavailable: 'ignore_unavailable',
     allowNoIndices: 'allow_no_indices',
     expandWildcards: 'expand_wildcards',
+    updateAllTypes: 'update_all_types',
     errorTrace: 'error_trace',
     filterPath: 'filter_path'
   }
@@ -76,6 +76,10 @@ function buildIndicesPutMapping (opts) {
     }
 
     // check required parameters
+    if (params['type'] == null) {
+      const err = new ConfigurationError('Missing required parameter: type')
+      return handleError(err, callback)
+    }
     if (params['body'] == null) {
       const err = new ConfigurationError('Missing required parameter: body')
       return handleError(err, callback)
@@ -87,17 +91,17 @@ function buildIndicesPutMapping (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index, type } = params
+    var { method, body, index, type, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index', 'type'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'PUT'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -112,12 +116,8 @@ function buildIndicesPutMapping (opts) {
       path = '/' + encodeURIComponent(index) + '/' + '_mappings' + '/' + encodeURIComponent(type)
     } else if ((type) != null) {
       path = '/' + '_mapping' + '/' + encodeURIComponent(type)
-    } else if ((type) != null) {
-      path = '/' + '_mappings' + '/' + encodeURIComponent(type)
-    } else if ((index) != null) {
-      path = '/' + encodeURIComponent(index) + '/' + '_mappings'
     } else {
-      path = '/' + encodeURIComponent(index) + '/' + '_mapping'
+      path = '/' + '_mappings' + '/' + encodeURIComponent(type)
     }
 
     // build request object
@@ -128,34 +128,8 @@ function buildIndicesPutMapping (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
   }
 }