Bumped v5.6.16-rc.2

Node.js v6 will go EOL at the end of April 2019, and already two of the production dependencies of the client have already dropped support for it, and soon others will do *(as well as development dependencies)*.

Furthermore, since Node.js will go in EOL it will never get security patches, plus, also OpenSSL-1.0.2 will go EOL [this year](https://github.com/nodejs/Release#release-schedule); to avoid risks for the client users it is better to drop support for Node.js v6 right away.

.ci/Jenkinsfile

@@ -1,224 +0,0 @@
-#!/usr/bin/env groovy
-
-@Library('apm@current') _
-
-def NODE_JS_VERSIONS = [8,10,12]
-def nodeJsVersion = NODE_JS_VERSIONS[randomNumber(min: 0, max:2)]
-
-pipeline {
-  agent {
-    label 'docker && immutable'
-  }
-
-  environment {
-    REPO = 'elasticsearch-js'
-    BASE_DIR = "src/github.com/elastic/${env.REPO}"
-    NODE_JS_DEFAULT_VERSION = "${nodeJsVersion}"
-    NODE_JS_VERSIONS = "${NODE_JS_VERSIONS.join(',')}"
-    HOME = "${env.WORKSPACE}"
-    npm_config_cache = 'npm-cache'
-  }
-
-  options {
-    timeout(time: 1, unit: 'HOURS')
-    buildDiscarder(logRotator(numToKeepStr: '20', artifactNumToKeepStr: '20', daysToKeepStr: '30'))
-    timestamps()
-    ansiColor('xterm')
-    disableResume()
-    durabilityHint('PERFORMANCE_OPTIMIZED')
-  }
-
-  triggers {
-    issueCommentTrigger('(?i).*(?:jenkins\\W+)?run\\W+(?:the\\W+)?tests(?:\\W+please)?.*')
-    // env.CHANGE_ID as a value in case of a commit or a pr, which means
-    // that we will have a daily cron job only for branches that don't have an active pr
-    cron(env.CHANGE_ID ? '' : '@daily')
-  }
-
-  stages {
-    stage('Checkout') {
-      options { skipDefaultCheckout() }
-      steps {
-        deleteDir()
-        gitCheckout(basedir: "${BASE_DIR}", githubNotifyFirstTimeContributor: false)
-        stash allowEmpty: true, name: 'source', useDefaultExcludes: false
-      }
-    }
-
-    stage('Install dependencies') {
-      options { skipDefaultCheckout() }
-      steps {
-        deleteDir()
-        unstash 'source'
-        script {
-          buildDockerImage(image: "node:${env.NODE_JS_DEFAULT_VERSION}-alpine").inside(){
-            dir("${BASE_DIR}"){
-              sh(label: 'System info', script: 'node --version; npm --version')
-              sh(label: 'Install dependencies', script: 'npm install')
-            }
-          }
-        }
-        stash allowEmpty: true, name: 'source-dependencies', useDefaultExcludes: false
-      }
-    }
-
-    stage('License check') {
-      options { skipDefaultCheckout() }
-      steps {
-        withGithubNotify(context: 'License check') {
-          deleteDir()
-          unstash 'source-dependencies'
-          script {
-            buildDockerImage(image: "node:${env.NODE_JS_DEFAULT_VERSION}-alpine").inside(){
-              dir("${BASE_DIR}"){
-                sh(label: 'Check production dependencies licenses', script: 'npm run license-checker')
-              }
-            }
-          }
-        }
-      }
-    }
-
-    stage('Linter') {
-      options { skipDefaultCheckout() }
-      steps {
-        withGithubNotify(context: 'Linter') {
-          deleteDir()
-          unstash 'source-dependencies'
-          script {
-            buildDockerImage(image: "node:${env.NODE_JS_DEFAULT_VERSION}-alpine").inside(){
-              dir("${BASE_DIR}"){
-                sh(label: 'Lint code with standardjs', script: 'npm run lint')
-              }
-            }
-          }
-        }
-      }
-    }
-
-    stage('Unit test') {
-      failFast true
-      options { skipDefaultCheckout() }
-      steps {
-        withGithubNotify(context: 'Unit test') {
-          script {
-            def versions = env.NODE_JS_VERSIONS.split(',')
-            def parallelTasks = [:]
-            versions.each{ version ->
-              parallelTasks["Node.js v${version}"] = buildUnitTest(version: version)
-            }
-            parallel(parallelTasks)
-          }
-        }
-      }
-    }
-
-    stage('Integration test') {
-      failFast true
-      options { skipDefaultCheckout() }
-      parallel {
-        stage('OSS') {
-          agent { label 'docker && immutable' }
-          options { skipDefaultCheckout() }
-          environment {
-            TEST_ES_SERVER = 'http://elasticsearch:9200'
-          }
-          steps {
-            withGithubNotify(context: 'Integration test OSS') {
-              deleteDir()
-              unstash 'source-dependencies'
-              dir("${BASE_DIR}"){
-                // Sometimes the docker registry fails and has random timeouts
-                // this block will retry a doker image 3 times before to fail.
-                retry(3) {
-                  sleep randomNumber(min: 5, max: 10)
-                  sh(label: 'Start Elasticsearch', script: './scripts/es-docker.sh --detach')
-                }
-              }
-              script {
-                buildDockerImage(fromDockerfile: true).inside('--network=elastic'){
-                  dir("${BASE_DIR}"){
-                    sh(label: 'Integration test', script: 'npm run test:integration | tee test-integration.tap')
-                    sh(label: 'Generating test reporting', script: './node_modules/.bin/tap-mocha-reporter xunit < test-integration.tap > junit-integration.xml')
-                  }
-                }
-              }
-              sh(label: 'Stop Elasticsearch', script: 'docker kill $(docker ps -q)')
-              junit(allowEmptyResults: true, keepLongStdio: true, testResults: "${BASE_DIR}/**/junit-*.xml")
-            }
-          }
-        }
-
-        stage('xPack') {
-          agent { label 'docker && immutable' }
-          options { skipDefaultCheckout() }
-          environment {
-            TEST_ES_SERVER = 'https://elastic:changeme@elasticsearch:9200'
-          }
-          steps {
-            withGithubNotify(context: 'Integration test xPack') {
-              deleteDir()
-              unstash 'source-dependencies'
-              dir("${BASE_DIR}"){
-                // Sometimes the docker registry fails and has random timeouts
-                // this block will retry a doker image 3 times before to fail.
-                retry(3) {
-                  sleep randomNumber(min: 5, max: 10)
-                  sh(label: 'Start Elasticsearch', script: './scripts/es-docker-platinum.sh --detach')
-                }
-              }
-              script {
-                buildDockerImage(fromDockerfile: true).inside('--network=elastic'){
-                  dir("${BASE_DIR}"){
-                    sh(label: 'Integration test', script: 'npm run test:integration | tee test-integration.tap')
-                    sh(label: 'Generating test reporting', script: './node_modules/.bin/tap-mocha-reporter xunit < test-integration.tap > junit-integration.xml')
-                  }
-                }
-              }
-              sh(label: 'Stop Elasticsearch', script: 'docker kill $(docker ps -q)')
-              junit(allowEmptyResults: true, keepLongStdio: true, testResults: "${BASE_DIR}/**/junit-*.xml")
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-// Sometimes the docker registry fails and has random timeouts
-// this function will retry a doker image 3 times before to fail.
-def buildDockerImage(args) {
-  def image
-  retry(3) {
-    sleep randomNumber(min: 5, max: 10)
-    if (args.fromDockerfile == true) {
-      image = docker.build('nodejs-image', "--build-arg NODE_JS_VERSION=${env.NODE_JS_DEFAULT_VERSION} ${BASE_DIR}/.ci/docker")
-    } else {
-      image = docker.image(args.image)
-      // make sure we have the latest available from Docker Hub
-      image.pull()
-    }
-  }
-  return image
-}
-
-def buildUnitTest(args) {
-  return {
-    node('docker && immutable') {
-      deleteDir()
-      unstash 'source'
-      script {
-        buildDockerImage(image: "node:${args.version}-alpine").inside(){
-          dir("${BASE_DIR}"){
-            sh(label: 'Install dependencies', script: 'npm install')
-            sh(label: 'Run unit test', script: 'npm run test:unit | tee test-unit.tap')
-            sh(label: 'Run behavior test', script: 'npm run test:behavior | tee test-behavior.tap')
-            sh(label: 'Run types test', script: 'npm run test:types')
-            sh(label: 'Generating test reporting', script: './node_modules/.bin/tap-mocha-reporter xunit < test-unit.tap > junit-unit.xml; ./node_modules/.bin/tap-mocha-reporter xunit < test-behavior.tap > junit-behavior.xml')
-          }
-        }
-      }
-      junit(allowEmptyResults: true, keepLongStdio: true, testResults: "${BASE_DIR}/**/junit-*.xml")
-    }
-  }
-}

.ci/docker-compose.yml

@@ -22,7 +22,7 @@ services:
       - elasticsearch-oss
 
   elasticsearch-oss:
-    image: docker.elastic.co/elasticsearch/elasticsearch:${ELASTICSEARCH_VERSION:-8.0.0-SNAPSHOT}
+    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:-8.0.0-SNAPSHOT}
-    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/docker/Dockerfile

@@ -1,7 +0,0 @@
-ARG NODE_JS_VERSION=10
-FROM node:${NODE_JS_VERSION}-alpine
-
-RUN apk --no-cache add git
-
-# Create app directory
-WORKDIR /usr/src/app

.ci/jobs/defaults.yml

@@ -0,0 +1,67 @@
+---
+
+##### GLOBAL METADATA
+
+- meta:
+    cluster: clients-ci
+
+##### JOB DEFAULTS
+
+- job:
+    project-type: matrix
+    logrotate:
+      daysToKeep: 30
+      numToKeep: 100
+    properties:
+    - github:
+        url: https://github.com/elastic/elasticsearch-js/
+    - inject:
+        properties-content: HOME=$JENKINS_HOME
+    concurrent: true
+    node: flyweight
+    scm:
+    - git:
+        name: origin
+        credentials-id: f6c7695a-671e-4f4f-a331-acdce44ff9ba
+        reference-repo: /var/lib/jenkins/.git-references/elasticsearch-js.git
+        branches:
+        - ${branch_specifier}
+        url: https://github.com/elastic/elasticsearch-js.git
+        wipe-workspace: 'True'
+    triggers:
+    - github
+    vault:
+      # vault read auth/approle/role/clients-ci/role-id
+      role_id: ddbd0d44-0e51-105b-177a-c8fdfd445126
+    axes:
+    - axis:
+        type: slave
+        name: label
+        values:
+        - linux
+    - axis:
+        type: yaml
+        filename: .ci/test-matrix.yml
+        name: ELASTICSEARCH_VERSION
+    - axis:
+        type: yaml
+        filename: .ci/test-matrix.yml
+        name: NODE_JS_VERSION
+    yaml-strategy:
+      exclude-key: exclude
+      filename: .ci/test-matrix.yml
+    wrappers:
+    - ansicolor
+    - timeout:
+        type: absolute
+        timeout: 120
+        fail: true
+    - timestamps
+    - workspace-cleanup
+    builders:
+    - shell: |-
+        #!/usr/local/bin/runbld
+        .ci/run-tests
+    publishers:
+    - email:
+        recipients: infra-root+build@elastic.co

.ci/jobs/elastic+elasticsearch-js+5.x.yml

@@ -1,12 +1,12 @@
 ---
 - job:
-    name: elastic+elasticsearch-js+7.3
-    display-name: 'elastic / elasticsearch-js # 7.3'
-    description: Testing the elasticsearch-js 7.3 branch.
+    name: elastic+elasticsearch-js+5.x
+    display-name: 'elastic / elasticsearch-js # 5.x'
+    description: Testing the elasticsearch-js 5.x branch.
     parameters:
     - string:
         name: branch_specifier
-        default: refs/heads/7.3
+        default: refs/heads/5.x
         description: the Git branch specifier to build (<branchName>, <tagName>,
           <commitId>, etc.)
     triggers:

.ci/jobs/elastic+elasticsearch-js+6.x.yml

@@ -0,0 +1,14 @@
+---
+- job:
+    name: elastic+elasticsearch-js+6.x
+    display-name: 'elastic / elasticsearch-js # 6.x'
+    description: Testing the elasticsearch-js 6.x branch.
+    parameters:
+    - string:
+        name: branch_specifier
+        default: refs/heads/6.x
+        description: the Git branch specifier to build (<branchName>, <tagName>,
+          <commitId>, etc.)
+    triggers:
+    - github
+    - timed: '@weekly'

.ci/jobs/elastic+elasticsearch-js+7.x.yml

@@ -0,0 +1,14 @@
+---
+- job:
+    name: elastic+elasticsearch-js+7.x
+    display-name: 'elastic / elasticsearch-js # 7.x'
+    description: Testing the elasticsearch-js 7.x branch.
+    parameters:
+    - string:
+        name: branch_specifier
+        default: refs/heads/7.x
+        description: the Git branch specifier to build (<branchName>, <tagName>,
+          <commitId>, etc.)
+    triggers:
+    - github
+    - timed: '@weekly'

.ci/jobs/elastic+elasticsearch-js+master.yml

@@ -0,0 +1,14 @@
+---
+- job:
+    name: elastic+elasticsearch-js+master
+    display-name: 'elastic / elasticsearch-js # master'
+    description: Testing the elasticsearch-js master branch.
+    parameters:
+    - string:
+        name: branch_specifier
+        default: refs/heads/master
+        description: the Git branch specifier to build (<branchName>, <tagName>,
+          <commitId>, etc.)
+    triggers:
+    - github
+    - timed: '@daily'

.ci/jobs/elastic+elasticsearch-js+mbp.yml

@@ -1,54 +0,0 @@
----
-- job:
-    name: elastic+elasticsearch-js+jenkins-pipelines
-    display-name: 'elastic / elasticsearch-js # jenkins-pipelines'
-    description: Testing the elasticsearch-js jenkins-pipelines branch.
-    project-type: multibranch
-    logrotate:
-      daysToKeep: 30
-      numToKeep: 100
-    number-to-keep: '5'
-    days-to-keep: '1'
-    concurrent: true
-    node: linux
-    script-path: Jenkinsfile
-    scm:
-    - github:
-        branch-discovery: all
-        discover-pr-forks-strategy: merge-current
-        discover-pr-forks-trust: permission
-        discover-pr-origin: merge-current
-        discover-tags: true
-        repo: elasticsearch-js
-        repo-owner: elastic
-        credentials-id: 2a9602aa-ab9f-4e52-baf3-b71ca88469c7-UserAndToken
-        ssh-checkout:
-          credentials: f6c7695a-671e-4f4f-a331-acdce44ff9ba
-        build-strategies:
-        - tags:
-            ignore-tags-older-than: -1
-            ignore-tags-newer-than: -1
-        - regular-branches: true
-        - change-request:
-            ignore-target-only-changes: false
-        clean:
-          after: true
-          before: true
-        prune: true
-        shallow-clone: true
-        depth: 3
-        do-not-fetch-tags: true
-        submodule:
-          disable: false
-          recursive: true
-          parent-credentials: true
-          timeout: 100
-        timeout: '15'
-        use-author: true
-        wipe-workspace: 'True'
-    periodic-folder-trigger: 1d
-    prune-dead-branches: true
-    publishers:
-    - email:
-        recipients: infra-root+build@elastic.co
-

.ci/jobs/elastic+elasticsearch-js+pull-request.yml

@@ -0,0 +1,19 @@
+---
+- job:
+    name: elastic+elasticsearch-js+pull-request
+    display-name: 'elastic / elasticsearch-js # pull-request'
+    description: Testing of elasticsearch-js pull requests.
+    scm:
+    - git:
+        branches:
+        - ${ghprbActualCommit}
+        refspec: +refs/pull/*:refs/remotes/origin/pr/*
+    triggers:
+    - github-pull-request:
+        org-list:
+        - elastic
+        allow-whitelist-orgs-as-admins: true
+        github-hooks: true
+        status-context: clients-ci
+        cancel-builds-on-update: true
+    publishers: []

.ci/packer_cache.sh

@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-source /usr/local/bin/bash_standard_lib.sh
-
-DOCKER_IMAGES="node:12-alpine
-node:10-alpine
-node:8-alpine
-"
-
-for di in ${DOCKER_IMAGES}
-do
-(retry 2 docker pull "${di}") || echo "Error pulling ${di} Docker image, we continue"
-done
-

.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,10 +1,10 @@
 ---
 ELASTICSEARCH_VERSION:
-  - 7.3.0
+- 5.6.16
 
 NODE_JS_VERSION:
-  - 12
-  - 10
-  - 8
+- 11
+- 10
+- 8
 
 exclude: ~

.github/ISSUE_TEMPLATE.md

@@ -3,7 +3,7 @@
 #### You have already researched for similar issues?
 It's not uncommon that somebody already opened an issue or in the best case it's already fixed but not merged. That's the reason why you should [search](https://github.com/elastic/elasticsearch-js/issues) at first before submitting a new one.
 
-#### Are you sure this is an issue with `@elastic/elasticsearch` or are you just looking for some help?
+#### Are you sure this is an issue with @elastic/elasticsearch or are you just looking for some help?
 
 Issues should only be posted in this repository after you have been able to reproduce them and confirm that they are a bug or incorrect/missing information in the [docs](https://github.com/elastic/elasticsearch-js/docs).
 

.github/ISSUE_TEMPLATE/bug.md

@@ -23,14 +23,6 @@ Paste your code here:
 
 ```
 
-<!--
-In some cases, it might be challenging to reproduce the bug in a few lines of code.
-You can fork the following repository, which contains all the configuration needed
-to spin up a three nodes Elasticsearch cluster with security enabled.
-The repository also contains a preconfigured client instance that you can use to reproduce the issue.
-https://github.com/delvedor/es-reproduce-issue
---->
-
 ## Expected behavior
 
 A clear and concise description of what you expected to happen.
@@ -44,6 +36,6 @@ Paste the results here:
 ## Your Environment
 
 - *node version*: 6,8,10
-- `@elastic/elasticsearch` *version*: >=7.0.0
+- *@elastic/elasticsearch version*: >=7.0.0
 - *os*: Mac, Windows, Linux
 - *any other relevant information*

.github/ISSUE_TEMPLATE/regression.md

@@ -29,14 +29,6 @@ Paste your code here:
 
 ```
 
-<!--
-In some cases, it might be challenging to reproduce the bug in a few lines of code.
-You can fork the following repository, which contains all the configuration needed
-to spin up a three nodes Elasticsearch cluster with security enabled.
-The repository also contains a preconfigured client instance that you can use to reproduce the issue.
-https://github.com/delvedor/es-reproduce-issue
---->
-
 ## Expected behavior
 
 A clear and concise description of what you expected to happen.
@@ -50,6 +42,6 @@ Paste the results here:
 ## Your Environment
 
 - *node version*: 6,8,10
-- `@elastic/elasticsearch` *version*: >=7.0.0
+- *@elastic/elasticsearch version*: >=7.0.0
 - *os*: Mac, Windows, Linux
 - *any other relevant information*

.github/stale.yml

@@ -9,7 +9,6 @@ exemptLabels:
   - "discussion"
   - "feature request"
   - "bug"
-  - "todo"
 
 # Label to use when marking an issue as stale
 staleLabel: stale

.gitignore

@@ -50,6 +50,8 @@ package-lock.json
 # elasticsearch repo or binary files
 elasticsearch*
 
-test/benchmarks/macro/fixtures/*
+# Generated typings, we don't commit them
+# because we should copy them in the main .d.ts file
+api/generated.d.ts
 
-*-junit.xml
+test/benchmarks/macro/fixtures/*

.travis.yml

@@ -1,25 +1,29 @@
+dist: trusty
+
+sudo: required
+
 language: node_js
 
 node_js:
-  - "12"
+  - "11"
   - "10"
   - "8"
 
-cache:
-  npm: false
+env:
+  global:
+    - ELASTICSEARCH_VERSION=5.6.16
+    - QUIET=true
 
-os:
-  - windows
-  - linux
+before_install:
+  - wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ELASTICSEARCH_VERSION}.tar.gz
+  - tar -xzf elasticsearch-${ELASTICSEARCH_VERSION}.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:
-  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then npm run license-checker; fi
-  - npm run lint
-  - npm run test:coverage
-  - npm run test:types
+  - npm run ci
 
 notifications:
   email:

README.md

@@ -1,24 +1,23 @@
 <img align="right" width="auto" height="auto" src="https://www.elastic.co/static-res/images/elastic-logo-200.png">
 
-# Elasticsearch Node.js client
+# @elastic/elasticsearch
 
 [![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat)](http://standardjs.com/)  [![Build Status](https://clients-ci.elastic.co/job/elastic+elasticsearch-js+master/badge/icon)](https://clients-ci.elastic.co/job/elastic+elasticsearch-js+master/)  [![codecov](https://codecov.io/gh/elastic/elasticsearch-js/branch/master/graph/badge.svg)](https://codecov.io/gh/elastic/elasticsearch-js)  [![NPM downloads](https://img.shields.io/npm/dm/@elastic/elasticsearch.svg?style=flat)](https://www.npmjs.com/package/@elastic/elasticsearch)
 
+---
+
+**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).
+
+---
+
 The official Node.js client for Elasticsearch.
 
----
-
-**Note:** In the past months we have worked on the new Elasticsearch Node.js client and you can use it by following the instructions below. If you're going to use the legacy one or report an issue, however, please check out [elastic/elasticsearch-js-legacy](https://github.com/elastic/elasticsearch-js-legacy).
-
----
-
 ## Features
 - One-to-one mapping with REST API.
 - Generalized, pluggable architecture.
 - Configurable, automatic discovery of cluster nodes.
 - Persistent, Keep-Alive connections.
-- Load balancing across all available nodes.
-- Child client support.
+- Load balancing (with pluggable selection strategy) across all available nodes.
 - TypeScript support out of the box.
 
 ## Install
@@ -30,49 +29,26 @@ npm install @elastic/elasticsearch
 
 The minimum supported version of Node.js is `v8`.
 
-The library is compatible with all Elasticsearch versions since 5.x, and you should use the same major version of the Elasticsearch instance that you are using.
-
-| Elasticsearch Version | Client Version |
-| --------------------- |----------------|
-| `master`              | `master`       |
-| `7.x`                 | `7.x`          |
-| `6.x`                 | `6.x`          |
-| `5.x`                 | `5.x`          |
-
-To install a specific major of the client, run the following command:
+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.
 ```
-npm install @elastic/elasticsearch@<major>
+# Elasticsearch 7.x
+@elastic/elasticsearch@7
+
+# Elasticsearch 6.x
+@elastic/elasticsearch@6
+
+# Elasticsearch 5.x
+@elastic/elasticsearch@5
 ```
 
-#### Browser
+## Usage
 
-WARNING: There is no official support for the browser environment. It exposes your Elasticsearch instance to everyone, which could lead to security issues.
-We recommend that you write a lightweight proxy that uses this client instead.
+You can find the full documentation in our [docs](https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/index.html) website.
 
-## Documentation
-
-- [Introduction](https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/introduction.html)
-- [Usage](https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/client-usage.html)
-- [Client configuration](https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/client-configuration.html)
-- [API reference](https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/api-reference.html)
-- [Breaking changes coming from the old client](https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/breaking-changes.html)
-- [Authentication](https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/auth-reference.html)
-- [Observability](https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/observability.html)
-- [Creating a child client](https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/child-client.html)
-- [Extend the client](https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/extend-client.html)
-- [Typescript support](https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/typescript.html)
-- [Examples](https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/examples.html)
-
-## Quick start
-
-First of all, require the client and initialize it:
 ```js
 const { Client } = require('@elastic/elasticsearch')
 const client = new Client({ node: 'http://localhost:9200' })
-```
 
-You can use both the callback-style API and the promise-style API, both behave the same way.
-```js
 // promise API
 const result = await client.search({
   index: 'my-index',
@@ -97,98 +73,78 @@ The returned value of **every** API call is formed as follows:
   meta: object
 }
 ```
+### Client options
 
-Let's see a complete example!
-```js
-'use strict'
+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.
 
-const { Client } = require('@elastic/elasticsearch')
-const client = new Client({ node: 'http://localhost:9200' })
-
-async function run () {
-  // Let's start by indexing some data
-  await client.index({
-    index: 'game-of-thrones',
-    // type: '_doc', // uncomment this line if you are using Elasticsearch ≤ 6
-    body: {
-      character: 'Ned Stark',
-      quote: 'Winter is coming.'
-    }
-  })
-
-  await client.index({
-    index: 'game-of-thrones',
-    // type: '_doc', // uncomment this line if you are using Elasticsearch ≤ 6
-    body: {
-      character: 'Daenerys Targaryen',
-      quote: 'I am the blood of the dragon.'
-    }
-  })
-
-  await client.index({
-    index: 'game-of-thrones',
-    // type: '_doc', // uncomment this line if you are using Elasticsearch ≤ 6
-    body: {
-      character: 'Tyrion Lannister',
-      quote: 'A mind needs books like a sword needs a whetstone.'
-    }
-  })
-
-  // here we are forcing an index refresh, otherwise we will not
-  // get any result in the consequent search
-  await client.indices.refresh({ index: 'game-of-thrones' })
-
-  // Let's search!
-  const { body } = await client.search({
-    index: 'game-of-thrones',
-    // type: '_doc', // uncomment this line if you are using Elasticsearch ≤ 6
-    body: {
-      query: {
-        match: { quote: 'winter' }
-      }
-    }
-  })
-
-  console.log(body.hits.hits)
-}
-
-run().catch(console.log)
-```
-
-## 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"
+```ts
+{
+  // the Elasticsearch endpoint to use
+  node: string | string[];
+  // alias of above
+  nodes: string | string[];
+  // custom connection class
+  Connection: typeof Connection;
+  // custom connection pool class
+  ConnectionPool: typeof ConnectionPool;
+  // custom transport class
+  Transport: typeof Transport;
+  // custom serializer class
+  Serializer: typeof Serializer;
+  // max number of retries for each request
+  maxRetries: number;
+  // max request timeout for each request
+  requestTimeout: number;
+  // max ping timeout for each request
+  pingTimeout: number;
+  // perform a sniff operation every `n` milliseconds
+  sniffInterval: number;
+  // perform a sniff once the client is started
+  sniffOnStart: boolean;
+  // custom sniff endpoint, defaults `_nodes/_all/http`
+  sniffEndpoint: string;
+  // perform a sniff on connection fault
+  sniffOnConnectionFault: boolean;
+  // configurethe node resurrection strategy, default `ping`
+  resurrectStrategy: 'ping' | 'optimistic' | 'none';
+  // adds `accept-encoding` header to every request
+  suggestCompression: boolean;
+  // enable gzip request body compression
+  compression: 'gzip';
+  // ssl configuraton
+  ssl: http.SecureContextOptions;
+  // http agent options
+  agent: http.AgentOptions;
+  // filters which node not to use for a request
+  nodeFilter: nodeFilterFn;
+  // custom selection strategy, defaults `round-robin`
+  nodeSelector: nodeSelectorFn | string;
 }
 ```
-You will require the packages from your code by using the alias you have defined.
+
+### Request specific options
+If needed you can pass request specific options in a second object:
 ```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)
+// promise API
+const result = await client.search({
+  index: 'my-index',
+  body: { foo: 'bar' }
+}, {
+  ignore: [404],
+  maxRetries: 3
+})
 ```
-
-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
+The supported *request specific options* are:
+```ts
+{
+  ignore: [number], // default `null`
+  requestTimeout: number, // client default
+  maxRetries: number, // default `5`
+  asStream: boolean, // default `false`
+  compression: string, // default `false`
+  headers: object, // default `null`
+  querystring: object // default `null`
+}
 ```
 
 ## License

api/api/bulk.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * 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'
 
@@ -9,7 +24,24 @@
 
 function buildBulk (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  const { makeRequest, ConfigurationError, handleError } = opts
+  /**
+   * 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
+   * @param {string} wait_for_active_shards - Sets the number of shard copies that must be active before proceeding with the bulk 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 {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 {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_exclude - Default list of fields to exclude from the returned _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
+   */
 
   const acceptedQuerystring = [
     'wait_for_active_shards',
@@ -17,10 +49,9 @@ function buildBulk (opts) {
     'routing',
     'timeout',
     'type',
+    'fields',
     '_source',
-    '_source_excludes',
     '_source_exclude',
-    '_source_includes',
     '_source_include',
     'pipeline',
     'pretty',
@@ -32,19 +63,12 @@ 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'
   }
 
-  /**
-   * Perform a bulk request
-   * Allows to perform multiple index/update/delete operations in a single request.
-   * https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-bulk.html
-   */
   return function bulk (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
@@ -75,25 +99,26 @@ function buildBulk (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = []
-    var { method, body, index, type, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
+    var warnings = null
+    var { method, body, index, type } = params
+    var querystring = semicopy(params, ['method', 'body', 'index', 'type'])
 
-    var ignore = options.ignore
+    if (method == null) {
+      method = 'POST'
+    }
+
+    var ignore = options.ignore || null
     if (typeof ignore === 'number') {
-      options.ignore = [ignore]
+      ignore = [ignore]
     }
 
     var path = ''
 
     if ((index) != null && (type) != null) {
-      if (method == null) method = 'POST'
       path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type) + '/' + '_bulk'
     } else if ((index) != null) {
-      if (method == null) method = 'POST'
       path = '/' + encodeURIComponent(index) + '/' + '_bulk'
     } else {
-      if (method == null) method = 'POST'
       path = '/' + '_bulk'
     }
 
@@ -105,8 +130,34 @@ function buildBulk (opts) {
       querystring
     }
 
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
+    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
+    }
   }
 }
 

api/api/cat.aliases.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * 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'
 
@@ -9,7 +24,19 @@
 
 function buildCatAliases (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  const { makeRequest, ConfigurationError, handleError } = opts
+  /**
+   * 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
+   * @param {boolean} local - Return local information, do not retrieve the state from master node (default: false)
+   * @param {time} master_timeout - Explicit operation timeout for connection to master node
+   * @param {list} h - Comma-separated list of column names to display
+   * @param {boolean} help - Return help information
+   * @param {list} s - Comma-separated list of column names or column aliases to sort by
+   * @param {boolean} v - Verbose mode. Display column headers
+   */
 
   const acceptedQuerystring = [
     'format',
@@ -32,11 +59,6 @@ function buildCatAliases (opts) {
     filterPath: 'filter_path'
   }
 
-  /**
-   * Perform a cat.aliases request
-   * Shows information about currently configured aliases to indices including filter and routing infos.
-   * https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-alias.html
-   */
   return function catAliases (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
@@ -49,28 +71,36 @@ function buildCatAliases (opts) {
       options = {}
     }
 
+    // check required parameters
+    if (params.body != null) {
+      const err = new ConfigurationError('This API does not require a body')
+      return handleError(err, callback)
+    }
+
     // validate headers object
     if (options.headers != null && typeof options.headers !== 'object') {
       const err = new ConfigurationError(`Headers should be an object, instead got: ${typeof options.headers}`)
       return handleError(err, callback)
     }
 
-    var warnings = []
-    var { method, body, name, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
+    var warnings = null
+    var { method, body, name } = params
+    var querystring = semicopy(params, ['method', 'body', 'name'])
 
-    var ignore = options.ignore
+    if (method == null) {
+      method = 'GET'
+    }
+
+    var ignore = options.ignore || null
     if (typeof ignore === 'number') {
-      options.ignore = [ignore]
+      ignore = [ignore]
     }
 
     var path = ''
 
     if ((name) != null) {
-      if (method == null) method = 'GET'
       path = '/' + '_cat' + '/' + 'aliases' + '/' + encodeURIComponent(name)
     } else {
-      if (method == null) method = 'GET'
       path = '/' + '_cat' + '/' + 'aliases'
     }
 
@@ -82,8 +112,34 @@ function buildCatAliases (opts) {
       querystring
     }
 
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
+    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
+    }
   }
 }
 

api/api/cat.allocation.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * 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'
 
@@ -9,7 +24,20 @@
 
 function buildCatAllocation (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  const { makeRequest, ConfigurationError, handleError } = opts
+  /**
+   * 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
+   * @param {enum} bytes - The unit in which to display byte values
+   * @param {boolean} local - Return local information, do not retrieve the state from master node (default: false)
+   * @param {time} master_timeout - Explicit operation timeout for connection to master node
+   * @param {list} h - Comma-separated list of column names to display
+   * @param {boolean} help - Return help information
+   * @param {list} s - Comma-separated list of column names or column aliases to sort by
+   * @param {boolean} v - Verbose mode. Display column headers
+   */
 
   const acceptedQuerystring = [
     'format',
@@ -33,11 +61,6 @@ function buildCatAllocation (opts) {
     filterPath: 'filter_path'
   }
 
-  /**
-   * Perform a cat.allocation request
-   * Provides a snapshot of how many shards are allocated to each data node and how much disk space they are using.
-   * https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-allocation.html
-   */
   return function catAllocation (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
@@ -50,28 +73,36 @@ function buildCatAllocation (opts) {
       options = {}
     }
 
+    // check required parameters
+    if (params.body != null) {
+      const err = new ConfigurationError('This API does not require a body')
+      return handleError(err, callback)
+    }
+
     // validate headers object
     if (options.headers != null && typeof options.headers !== 'object') {
       const err = new ConfigurationError(`Headers should be an object, instead got: ${typeof options.headers}`)
       return handleError(err, callback)
     }
 
-    var warnings = []
-    var { method, body, nodeId, node_id, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
+    var warnings = null
+    var { method, body, nodeId, node_id } = params
+    var querystring = semicopy(params, ['method', 'body', 'nodeId', 'node_id'])
 
-    var ignore = options.ignore
+    if (method == null) {
+      method = 'GET'
+    }
+
+    var ignore = options.ignore || null
     if (typeof ignore === 'number') {
-      options.ignore = [ignore]
+      ignore = [ignore]
     }
 
     var path = ''
 
     if ((node_id || nodeId) != null) {
-      if (method == null) method = 'GET'
       path = '/' + '_cat' + '/' + 'allocation' + '/' + encodeURIComponent(node_id || nodeId)
     } else {
-      if (method == null) method = 'GET'
       path = '/' + '_cat' + '/' + 'allocation'
     }
 
@@ -83,8 +114,34 @@ function buildCatAllocation (opts) {
       querystring
     }
 
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
+    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
+    }
   }
 }
 

api/api/cat.count.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * 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'
 
@@ -9,7 +24,19 @@
 
 function buildCatCount (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  const { makeRequest, ConfigurationError, handleError } = opts
+  /**
+   * 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
+   * @param {boolean} local - Return local information, do not retrieve the state from master node (default: false)
+   * @param {time} master_timeout - Explicit operation timeout for connection to master node
+   * @param {list} h - Comma-separated list of column names to display
+   * @param {boolean} help - Return help information
+   * @param {list} s - Comma-separated list of column names or column aliases to sort by
+   * @param {boolean} v - Verbose mode. Display column headers
+   */
 
   const acceptedQuerystring = [
     'format',
@@ -32,11 +59,6 @@ function buildCatCount (opts) {
     filterPath: 'filter_path'
   }
 
-  /**
-   * Perform a cat.count request
-   * Provides quick access to the document count of the entire cluster, or individual indices.
-   * https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-count.html
-   */
   return function catCount (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
@@ -49,28 +71,36 @@ function buildCatCount (opts) {
       options = {}
     }
 
+    // check required parameters
+    if (params.body != null) {
+      const err = new ConfigurationError('This API does not require a body')
+      return handleError(err, callback)
+    }
+
     // validate headers object
     if (options.headers != null && typeof options.headers !== 'object') {
       const err = new ConfigurationError(`Headers should be an object, instead got: ${typeof options.headers}`)
       return handleError(err, callback)
     }
 
-    var warnings = []
-    var { method, body, index, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
+    var warnings = null
+    var { method, body, index } = params
+    var querystring = semicopy(params, ['method', 'body', 'index'])
 
-    var ignore = options.ignore
+    if (method == null) {
+      method = 'GET'
+    }
+
+    var ignore = options.ignore || null
     if (typeof ignore === 'number') {
-      options.ignore = [ignore]
+      ignore = [ignore]
     }
 
     var path = ''
 
     if ((index) != null) {
-      if (method == null) method = 'GET'
       path = '/' + '_cat' + '/' + 'count' + '/' + encodeURIComponent(index)
     } else {
-      if (method == null) method = 'GET'
       path = '/' + '_cat' + '/' + 'count'
     }
 
@@ -82,8 +112,34 @@ function buildCatCount (opts) {
       querystring
     }
 
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
+    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
+    }
   }
 }
 

api/api/cat.fielddata.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * 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'
 
@@ -9,7 +24,21 @@
 
 function buildCatFielddata (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  const { makeRequest, ConfigurationError, handleError } = opts
+  /**
+   * 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
+   * @param {enum} bytes - The unit in which to display byte values
+   * @param {boolean} local - Return local information, do not retrieve the state from master node (default: false)
+   * @param {time} master_timeout - Explicit operation timeout for connection to master node
+   * @param {list} h - Comma-separated list of column names to display
+   * @param {boolean} help - Return help information
+   * @param {list} s - Comma-separated list of column names or column aliases to sort by
+   * @param {boolean} v - Verbose mode. Display column headers
+   * @param {list} fields - A comma-separated list of fields to return in the output
+   */
 
   const acceptedQuerystring = [
     'format',
@@ -34,11 +63,6 @@ function buildCatFielddata (opts) {
     filterPath: 'filter_path'
   }
 
-  /**
-   * Perform a cat.fielddata request
-   * Shows how much heap memory is currently being used by fielddata on every data node in the cluster.
-   * https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-fielddata.html
-   */
   return function catFielddata (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
@@ -51,28 +75,36 @@ function buildCatFielddata (opts) {
       options = {}
     }
 
+    // check required parameters
+    if (params.body != null) {
+      const err = new ConfigurationError('This API does not require a body')
+      return handleError(err, callback)
+    }
+
     // validate headers object
     if (options.headers != null && typeof options.headers !== 'object') {
       const err = new ConfigurationError(`Headers should be an object, instead got: ${typeof options.headers}`)
       return handleError(err, callback)
     }
 
-    var warnings = []
-    var { method, body, fields, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
+    var warnings = null
+    var { method, body, fields } = params
+    var querystring = semicopy(params, ['method', 'body', 'fields'])
 
-    var ignore = options.ignore
+    if (method == null) {
+      method = 'GET'
+    }
+
+    var ignore = options.ignore || null
     if (typeof ignore === 'number') {
-      options.ignore = [ignore]
+      ignore = [ignore]
     }
 
     var path = ''
 
     if ((fields) != null) {
-      if (method == null) method = 'GET'
       path = '/' + '_cat' + '/' + 'fielddata' + '/' + encodeURIComponent(fields)
     } else {
-      if (method == null) method = 'GET'
       path = '/' + '_cat' + '/' + 'fielddata'
     }
 
@@ -84,8 +116,34 @@ function buildCatFielddata (opts) {
       querystring
     }
 
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
+    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
+    }
   }
 }
 

api/api/cat.health.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * 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'
 
@@ -9,7 +24,19 @@
 
 function buildCatHealth (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  const { makeRequest, ConfigurationError, handleError } = opts
+  /**
+   * 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)
+   * @param {time} master_timeout - Explicit operation timeout for connection to master node
+   * @param {list} h - Comma-separated list of column names to display
+   * @param {boolean} help - Return help information
+   * @param {list} s - Comma-separated list of column names or column aliases to sort by
+   * @param {boolean} ts - Set to false to disable timestamping
+   * @param {boolean} v - Verbose mode. Display column headers
+   */
 
   const acceptedQuerystring = [
     'format',
@@ -33,11 +60,6 @@ function buildCatHealth (opts) {
     filterPath: 'filter_path'
   }
 
-  /**
-   * Perform a cat.health request
-   * Returns a concise representation of the cluster health.
-   * https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-health.html
-   */
   return function catHealth (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
@@ -50,24 +72,33 @@ function buildCatHealth (opts) {
       options = {}
     }
 
+    // check required parameters
+    if (params.body != null) {
+      const err = new ConfigurationError('This API does not require a body')
+      return handleError(err, callback)
+    }
+
     // validate headers object
     if (options.headers != null && typeof options.headers !== 'object') {
       const err = new ConfigurationError(`Headers should be an object, instead got: ${typeof options.headers}`)
       return handleError(err, callback)
     }
 
-    var warnings = []
-    var { method, body, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
+    var warnings = null
+    var { method, body } = params
+    var querystring = semicopy(params, ['method', 'body'])
 
-    var ignore = options.ignore
+    if (method == null) {
+      method = 'GET'
+    }
+
+    var ignore = options.ignore || null
     if (typeof ignore === 'number') {
-      options.ignore = [ignore]
+      ignore = [ignore]
     }
 
     var path = ''
 
-    if (method == null) method = 'GET'
     path = '/' + '_cat' + '/' + 'health'
 
     // build request object
@@ -78,8 +109,34 @@ function buildCatHealth (opts) {
       querystring
     }
 
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
+    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
+    }
   }
 }
 

api/api/cat.help.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * 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'
 
@@ -9,7 +24,13 @@
 
 function buildCatHelp (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  const { makeRequest, ConfigurationError, handleError } = opts
+  /**
+   * 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
+   */
 
   const acceptedQuerystring = [
     'help',
@@ -26,11 +47,6 @@ function buildCatHelp (opts) {
     filterPath: 'filter_path'
   }
 
-  /**
-   * Perform a cat.help request
-   * Returns help for the Cat APIs.
-   * https://www.elastic.co/guide/en/elasticsearch/reference/master/cat.html
-   */
   return function catHelp (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
@@ -43,24 +59,33 @@ function buildCatHelp (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 = []
-    var { method, body, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
+    var warnings = null
+    var { method, body } = params
+    var querystring = semicopy(params, ['method', 'body'])
 
-    var ignore = options.ignore
+    if (method == null) {
+      method = 'GET'
+    }
+
+    var ignore = options.ignore || null
     if (typeof ignore === 'number') {
-      options.ignore = [ignore]
+      ignore = [ignore]
     }
 
     var path = ''
 
-    if (method == null) method = 'GET'
     path = '/' + '_cat'
 
     // build request object
@@ -71,8 +96,34 @@ function buildCatHelp (opts) {
       querystring
     }
 
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
+    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
+    }
   }
 }
 

api/api/cat.indices.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * 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'
 
@@ -9,7 +24,22 @@
 
 function buildCatIndices (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  const { makeRequest, ConfigurationError, handleError } = opts
+  /**
+   * 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
+   * @param {enum} bytes - The unit in which to display byte values
+   * @param {boolean} local - Return local information, do not retrieve the state from master node (default: false)
+   * @param {time} master_timeout - Explicit operation timeout for connection to master node
+   * @param {list} h - Comma-separated list of column names to display
+   * @param {enum} health - A health status ("green", "yellow", or "red" to filter only indices matching the specified health status
+   * @param {boolean} help - Return help information
+   * @param {boolean} pri - Set to true to return stats only for primary shards
+   * @param {list} s - Comma-separated list of column names or column aliases to sort by
+   * @param {boolean} v - Verbose mode. Display column headers
+   */
 
   const acceptedQuerystring = [
     'format',
@@ -22,7 +52,6 @@ function buildCatIndices (opts) {
     'pri',
     's',
     'v',
-    'include_unloaded_segments',
     'pretty',
     'human',
     'error_trace',
@@ -32,16 +61,10 @@ function buildCatIndices (opts) {
 
   const snakeCase = {
     masterTimeout: 'master_timeout',
-    includeUnloadedSegments: 'include_unloaded_segments',
     errorTrace: 'error_trace',
     filterPath: 'filter_path'
   }
 
-  /**
-   * Perform a cat.indices request
-   * Returns information about indices: number of primaries and replicas, document counts, disk size, ...
-   * https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-indices.html
-   */
   return function catIndices (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
@@ -54,28 +77,36 @@ function buildCatIndices (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 = []
-    var { method, body, index, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
+    var warnings = null
+    var { method, body, index } = params
+    var querystring = semicopy(params, ['method', 'body', 'index'])
 
-    var ignore = options.ignore
+    if (method == null) {
+      method = 'GET'
+    }
+
+    var ignore = options.ignore || null
     if (typeof ignore === 'number') {
-      options.ignore = [ignore]
+      ignore = [ignore]
     }
 
     var path = ''
 
     if ((index) != null) {
-      if (method == null) method = 'GET'
       path = '/' + '_cat' + '/' + 'indices' + '/' + encodeURIComponent(index)
     } else {
-      if (method == null) method = 'GET'
       path = '/' + '_cat' + '/' + 'indices'
     }
 
@@ -87,8 +118,34 @@ function buildCatIndices (opts) {
       querystring
     }
 
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
+    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
+    }
   }
 }
 

api/api/cat.master.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * 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'
 
@@ -9,7 +24,18 @@
 
 function buildCatMaster (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  const { makeRequest, ConfigurationError, handleError } = opts
+  /**
+   * 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)
+   * @param {time} master_timeout - Explicit operation timeout for connection to master node
+   * @param {list} h - Comma-separated list of column names to display
+   * @param {boolean} help - Return help information
+   * @param {list} s - Comma-separated list of column names or column aliases to sort by
+   * @param {boolean} v - Verbose mode. Display column headers
+   */
 
   const acceptedQuerystring = [
     'format',
@@ -32,11 +58,6 @@ function buildCatMaster (opts) {
     filterPath: 'filter_path'
   }
 
-  /**
-   * Perform a cat.master request
-   * Returns information about the master node.
-   * https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-master.html
-   */
   return function catMaster (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
@@ -49,24 +70,33 @@ function buildCatMaster (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 = []
-    var { method, body, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
+    var warnings = null
+    var { method, body } = params
+    var querystring = semicopy(params, ['method', 'body'])
 
-    var ignore = options.ignore
+    if (method == null) {
+      method = 'GET'
+    }
+
+    var ignore = options.ignore || null
     if (typeof ignore === 'number') {
-      options.ignore = [ignore]
+      ignore = [ignore]
     }
 
     var path = ''
 
-    if (method == null) method = 'GET'
     path = '/' + '_cat' + '/' + 'master'
 
     // build request object
@@ -77,8 +107,34 @@ function buildCatMaster (opts) {
       querystring
     }
 
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
+    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
+    }
   }
 }
 

api/api/cat.nodeattrs.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * 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'
 
@@ -9,7 +24,18 @@
 
 function buildCatNodeattrs (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  const { makeRequest, ConfigurationError, handleError } = opts
+  /**
+   * 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)
+   * @param {time} master_timeout - Explicit operation timeout for connection to master node
+   * @param {list} h - Comma-separated list of column names to display
+   * @param {boolean} help - Return help information
+   * @param {list} s - Comma-separated list of column names or column aliases to sort by
+   * @param {boolean} v - Verbose mode. Display column headers
+   */
 
   const acceptedQuerystring = [
     'format',
@@ -32,11 +58,6 @@ function buildCatNodeattrs (opts) {
     filterPath: 'filter_path'
   }
 
-  /**
-   * Perform a cat.nodeattrs request
-   * Returns information about custom node attributes.
-   * https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-nodeattrs.html
-   */
   return function catNodeattrs (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
@@ -49,24 +70,33 @@ function buildCatNodeattrs (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 = []
-    var { method, body, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
+    var warnings = null
+    var { method, body } = params
+    var querystring = semicopy(params, ['method', 'body'])
 
-    var ignore = options.ignore
+    if (method == null) {
+      method = 'GET'
+    }
+
+    var ignore = options.ignore || null
     if (typeof ignore === 'number') {
-      options.ignore = [ignore]
+      ignore = [ignore]
     }
 
     var path = ''
 
-    if (method == null) method = 'GET'
     path = '/' + '_cat' + '/' + 'nodeattrs'
 
     // build request object
@@ -77,8 +107,34 @@ function buildCatNodeattrs (opts) {
       querystring
     }
 
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
+    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
+    }
   }
 }
 

api/api/cat.nodes.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * 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'
 
@@ -9,7 +24,19 @@
 
 function buildCatNodes (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  const { makeRequest, ConfigurationError, handleError } = opts
+  /**
+   * 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)
+   * @param {boolean} local - Return local information, do not retrieve the state from master node (default: false)
+   * @param {time} master_timeout - Explicit operation timeout for connection to master node
+   * @param {list} h - Comma-separated list of column names to display
+   * @param {boolean} help - Return help information
+   * @param {list} s - Comma-separated list of column names or column aliases to sort by
+   * @param {boolean} v - Verbose mode. Display column headers
+   */
 
   const acceptedQuerystring = [
     'format',
@@ -34,11 +61,6 @@ function buildCatNodes (opts) {
     filterPath: 'filter_path'
   }
 
-  /**
-   * Perform a cat.nodes request
-   * Returns basic statistics about performance of cluster nodes.
-   * https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-nodes.html
-   */
   return function catNodes (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
@@ -51,24 +73,33 @@ function buildCatNodes (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 = []
-    var { method, body, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
+    var warnings = null
+    var { method, body } = params
+    var querystring = semicopy(params, ['method', 'body'])
 
-    var ignore = options.ignore
+    if (method == null) {
+      method = 'GET'
+    }
+
+    var ignore = options.ignore || null
     if (typeof ignore === 'number') {
-      options.ignore = [ignore]
+      ignore = [ignore]
     }
 
     var path = ''
 
-    if (method == null) method = 'GET'
     path = '/' + '_cat' + '/' + 'nodes'
 
     // build request object
@@ -79,8 +110,34 @@ function buildCatNodes (opts) {
       querystring
     }
 
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
+    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
+    }
   }
 }
 

api/api/cat.pending_tasks.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * 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'
 
@@ -9,7 +24,18 @@
 
 function buildCatPendingTasks (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  const { makeRequest, ConfigurationError, handleError } = opts
+  /**
+   * 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)
+   * @param {time} master_timeout - Explicit operation timeout for connection to master node
+   * @param {list} h - Comma-separated list of column names to display
+   * @param {boolean} help - Return help information
+   * @param {list} s - Comma-separated list of column names or column aliases to sort by
+   * @param {boolean} v - Verbose mode. Display column headers
+   */
 
   const acceptedQuerystring = [
     'format',
@@ -32,11 +58,6 @@ function buildCatPendingTasks (opts) {
     filterPath: 'filter_path'
   }
 
-  /**
-   * Perform a cat.pending_tasks request
-   * Returns a concise representation of the cluster pending tasks.
-   * https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-pending-tasks.html
-   */
   return function catPendingTasks (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
@@ -49,24 +70,33 @@ function buildCatPendingTasks (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 = []
-    var { method, body, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
+    var warnings = null
+    var { method, body } = params
+    var querystring = semicopy(params, ['method', 'body'])
 
-    var ignore = options.ignore
+    if (method == null) {
+      method = 'GET'
+    }
+
+    var ignore = options.ignore || null
     if (typeof ignore === 'number') {
-      options.ignore = [ignore]
+      ignore = [ignore]
     }
 
     var path = ''
 
-    if (method == null) method = 'GET'
     path = '/' + '_cat' + '/' + 'pending_tasks'
 
     // build request object
@@ -77,8 +107,34 @@ function buildCatPendingTasks (opts) {
       querystring
     }
 
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
+    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
+    }
   }
 }
 

api/api/cat.plugins.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * 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'
 
@@ -9,7 +24,18 @@
 
 function buildCatPlugins (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  const { makeRequest, ConfigurationError, handleError } = opts
+  /**
+   * 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)
+   * @param {time} master_timeout - Explicit operation timeout for connection to master node
+   * @param {list} h - Comma-separated list of column names to display
+   * @param {boolean} help - Return help information
+   * @param {list} s - Comma-separated list of column names or column aliases to sort by
+   * @param {boolean} v - Verbose mode. Display column headers
+   */
 
   const acceptedQuerystring = [
     'format',
@@ -32,11 +58,6 @@ function buildCatPlugins (opts) {
     filterPath: 'filter_path'
   }
 
-  /**
-   * Perform a cat.plugins request
-   * Returns information about installed plugins across nodes node.
-   * https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-plugins.html
-   */
   return function catPlugins (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
@@ -49,24 +70,33 @@ function buildCatPlugins (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 = []
-    var { method, body, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
+    var warnings = null
+    var { method, body } = params
+    var querystring = semicopy(params, ['method', 'body'])
 
-    var ignore = options.ignore
+    if (method == null) {
+      method = 'GET'
+    }
+
+    var ignore = options.ignore || null
     if (typeof ignore === 'number') {
-      options.ignore = [ignore]
+      ignore = [ignore]
     }
 
     var path = ''
 
-    if (method == null) method = 'GET'
     path = '/' + '_cat' + '/' + 'plugins'
 
     // build request object
@@ -77,8 +107,34 @@ function buildCatPlugins (opts) {
       querystring
     }
 
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
+    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
+    }
   }
 }
 

api/api/cat.recovery.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * 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'
 
@@ -9,7 +24,19 @@
 
 function buildCatRecovery (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  const { makeRequest, ConfigurationError, handleError } = opts
+  /**
+   * 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
+   * @param {enum} bytes - The unit in which to display byte values
+   * @param {time} master_timeout - Explicit operation timeout for connection to master node
+   * @param {list} h - Comma-separated list of column names to display
+   * @param {boolean} help - Return help information
+   * @param {list} s - Comma-separated list of column names or column aliases to sort by
+   * @param {boolean} v - Verbose mode. Display column headers
+   */
 
   const acceptedQuerystring = [
     'format',
@@ -32,11 +59,6 @@ function buildCatRecovery (opts) {
     filterPath: 'filter_path'
   }
 
-  /**
-   * Perform a cat.recovery request
-   * Returns information about index shard recoveries, both on-going completed.
-   * https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-recovery.html
-   */
   return function catRecovery (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
@@ -49,28 +71,36 @@ function buildCatRecovery (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 = []
-    var { method, body, index, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
+    var warnings = null
+    var { method, body, index } = params
+    var querystring = semicopy(params, ['method', 'body', 'index'])
 
-    var ignore = options.ignore
+    if (method == null) {
+      method = 'GET'
+    }
+
+    var ignore = options.ignore || null
     if (typeof ignore === 'number') {
-      options.ignore = [ignore]
+      ignore = [ignore]
     }
 
     var path = ''
 
     if ((index) != null) {
-      if (method == null) method = 'GET'
       path = '/' + '_cat' + '/' + 'recovery' + '/' + encodeURIComponent(index)
     } else {
-      if (method == null) method = 'GET'
       path = '/' + '_cat' + '/' + 'recovery'
     }
 
@@ -82,8 +112,34 @@ function buildCatRecovery (opts) {
       querystring
     }
 
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
+    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
+    }
   }
 }
 

api/api/cat.repositories.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * 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'
 
@@ -9,7 +24,18 @@
 
 function buildCatRepositories (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  const { makeRequest, ConfigurationError, handleError } = opts
+  /**
+   * 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
+   * @param {time} master_timeout - Explicit operation timeout for connection to master node
+   * @param {list} h - Comma-separated list of column names to display
+   * @param {boolean} help - Return help information
+   * @param {list} s - Comma-separated list of column names or column aliases to sort by
+   * @param {boolean} v - Verbose mode. Display column headers
+   */
 
   const acceptedQuerystring = [
     'format',
@@ -32,11 +58,6 @@ function buildCatRepositories (opts) {
     filterPath: 'filter_path'
   }
 
-  /**
-   * Perform a cat.repositories request
-   * Returns information about snapshot repositories registered in the cluster.
-   * https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-repositories.html
-   */
   return function catRepositories (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
@@ -49,24 +70,33 @@ function buildCatRepositories (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 = []
-    var { method, body, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
+    var warnings = null
+    var { method, body } = params
+    var querystring = semicopy(params, ['method', 'body'])
 
-    var ignore = options.ignore
+    if (method == null) {
+      method = 'GET'
+    }
+
+    var ignore = options.ignore || null
     if (typeof ignore === 'number') {
-      options.ignore = [ignore]
+      ignore = [ignore]
     }
 
     var path = ''
 
-    if (method == null) method = 'GET'
     path = '/' + '_cat' + '/' + 'repositories'
 
     // build request object
@@ -77,8 +107,34 @@ function buildCatRepositories (opts) {
       querystring
     }
 
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
+    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
+    }
   }
 }
 

api/api/cat.segments.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * 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'
 
@@ -9,7 +24,18 @@
 
 function buildCatSegments (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  const { makeRequest, ConfigurationError, handleError } = opts
+  /**
+   * 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
+   * @param {enum} bytes - The unit in which to display byte values
+   * @param {list} h - Comma-separated list of column names to display
+   * @param {boolean} help - Return help information
+   * @param {list} s - Comma-separated list of column names or column aliases to sort by
+   * @param {boolean} v - Verbose mode. Display column headers
+   */
 
   const acceptedQuerystring = [
     'format',
@@ -30,11 +56,6 @@ function buildCatSegments (opts) {
     filterPath: 'filter_path'
   }
 
-  /**
-   * Perform a cat.segments request
-   * Provides low-level information about the segments in the shards of an index.
-   * https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-segments.html
-   */
   return function catSegments (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
@@ -47,28 +68,36 @@ function buildCatSegments (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 = []
-    var { method, body, index, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
+    var warnings = null
+    var { method, body, index } = params
+    var querystring = semicopy(params, ['method', 'body', 'index'])
 
-    var ignore = options.ignore
+    if (method == null) {
+      method = 'GET'
+    }
+
+    var ignore = options.ignore || null
     if (typeof ignore === 'number') {
-      options.ignore = [ignore]
+      ignore = [ignore]
     }
 
     var path = ''
 
     if ((index) != null) {
-      if (method == null) method = 'GET'
       path = '/' + '_cat' + '/' + 'segments' + '/' + encodeURIComponent(index)
     } else {
-      if (method == null) method = 'GET'
       path = '/' + '_cat' + '/' + 'segments'
     }
 
@@ -80,8 +109,34 @@ function buildCatSegments (opts) {
       querystring
     }
 
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
+    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
+    }
   }
 }
 

api/api/cat.shards.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * 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'
 
@@ -9,7 +24,20 @@
 
 function buildCatShards (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  const { makeRequest, ConfigurationError, handleError } = opts
+  /**
+   * 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
+   * @param {enum} bytes - The unit in which to display byte values
+   * @param {boolean} local - Return local information, do not retrieve the state from master node (default: false)
+   * @param {time} master_timeout - Explicit operation timeout for connection to master node
+   * @param {list} h - Comma-separated list of column names to display
+   * @param {boolean} help - Return help information
+   * @param {list} s - Comma-separated list of column names or column aliases to sort by
+   * @param {boolean} v - Verbose mode. Display column headers
+   */
 
   const acceptedQuerystring = [
     'format',
@@ -33,11 +61,6 @@ function buildCatShards (opts) {
     filterPath: 'filter_path'
   }
 
-  /**
-   * Perform a cat.shards request
-   * Provides a detailed view of shard allocation on nodes.
-   * https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-shards.html
-   */
   return function catShards (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
@@ -50,28 +73,36 @@ function buildCatShards (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 = []
-    var { method, body, index, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
+    var warnings = null
+    var { method, body, index } = params
+    var querystring = semicopy(params, ['method', 'body', 'index'])
 
-    var ignore = options.ignore
+    if (method == null) {
+      method = 'GET'
+    }
+
+    var ignore = options.ignore || null
     if (typeof ignore === 'number') {
-      options.ignore = [ignore]
+      ignore = [ignore]
     }
 
     var path = ''
 
     if ((index) != null) {
-      if (method == null) method = 'GET'
       path = '/' + '_cat' + '/' + 'shards' + '/' + encodeURIComponent(index)
     } else {
-      if (method == null) method = 'GET'
       path = '/' + '_cat' + '/' + 'shards'
     }
 
@@ -83,8 +114,34 @@ function buildCatShards (opts) {
       querystring
     }
 
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
+    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
+    }
   }
 }
 

api/api/cat.snapshots.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * 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'
 
@@ -9,7 +24,19 @@
 
 function buildCatSnapshots (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  const { makeRequest, ConfigurationError, handleError } = opts
+  /**
+   * 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
+   * @param {boolean} ignore_unavailable - Set to true to ignore unavailable snapshots
+   * @param {time} master_timeout - Explicit operation timeout for connection to master node
+   * @param {list} h - Comma-separated list of column names to display
+   * @param {boolean} help - Return help information
+   * @param {list} s - Comma-separated list of column names or column aliases to sort by
+   * @param {boolean} v - Verbose mode. Display column headers
+   */
 
   const acceptedQuerystring = [
     'format',
@@ -33,11 +60,6 @@ function buildCatSnapshots (opts) {
     filterPath: 'filter_path'
   }
 
-  /**
-   * Perform a cat.snapshots request
-   * Returns all snapshots in a specific repository.
-   * https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-snapshots.html
-   */
   return function catSnapshots (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
@@ -50,28 +72,40 @@ function buildCatSnapshots (opts) {
       options = {}
     }
 
+    // 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)
+    }
+
     // 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, repository, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
+    var warnings = null
+    var { method, body, repository } = params
+    var querystring = semicopy(params, ['method', 'body', 'repository'])
 
-    var ignore = options.ignore
+    if (method == null) {
+      method = 'GET'
+    }
+
+    var ignore = options.ignore || null
     if (typeof ignore === 'number') {
-      options.ignore = [ignore]
+      ignore = [ignore]
     }
 
     var path = ''
 
     if ((repository) != null) {
-      if (method == null) method = 'GET'
       path = '/' + '_cat' + '/' + 'snapshots' + '/' + encodeURIComponent(repository)
     } else {
-      if (method == null) method = 'GET'
       path = '/' + '_cat' + '/' + 'snapshots'
     }
 
@@ -83,8 +117,34 @@ function buildCatSnapshots (opts) {
       querystring
     }
 
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
+    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
+    }
   }
 }
 

api/api/cat.tasks.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * 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'
 
@@ -9,13 +24,28 @@
 
 function buildCatTasks (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  const { makeRequest, ConfigurationError, handleError } = opts
+  /**
+   * 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
+   * @param {list} s - Comma-separated list of column names or column aliases to sort by
+   * @param {boolean} v - Verbose mode. Display column headers
+   */
 
   const acceptedQuerystring = [
     'format',
     'node_id',
     'actions',
     'detailed',
+    'parent_node',
     'parent_task',
     'h',
     'help',
@@ -30,16 +60,12 @@ function buildCatTasks (opts) {
 
   const snakeCase = {
     nodeId: 'node_id',
+    parentNode: 'parent_node',
     parentTask: 'parent_task',
     errorTrace: 'error_trace',
     filterPath: 'filter_path'
   }
 
-  /**
-   * Perform a cat.tasks request
-   * Returns information about the tasks currently executing on one or more nodes in the cluster.
-   * https://www.elastic.co/guide/en/elasticsearch/reference/master/tasks.html
-   */
   return function catTasks (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
@@ -52,24 +78,33 @@ function buildCatTasks (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 = []
-    var { method, body, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
+    var warnings = null
+    var { method, body } = params
+    var querystring = semicopy(params, ['method', 'body'])
 
-    var ignore = options.ignore
+    if (method == null) {
+      method = 'GET'
+    }
+
+    var ignore = options.ignore || null
     if (typeof ignore === 'number') {
-      options.ignore = [ignore]
+      ignore = [ignore]
     }
 
     var path = ''
 
-    if (method == null) method = 'GET'
     path = '/' + '_cat' + '/' + 'tasks'
 
     // build request object
@@ -80,8 +115,34 @@ function buildCatTasks (opts) {
       querystring
     }
 
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
+    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
+    }
   }
 }
 

api/api/cat.templates.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * 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'
 
@@ -9,7 +24,19 @@
 
 function buildCatTemplates (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  const { makeRequest, ConfigurationError, handleError } = opts
+  /**
+   * 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
+   * @param {boolean} local - Return local information, do not retrieve the state from master node (default: false)
+   * @param {time} master_timeout - Explicit operation timeout for connection to master node
+   * @param {list} h - Comma-separated list of column names to display
+   * @param {boolean} help - Return help information
+   * @param {list} s - Comma-separated list of column names or column aliases to sort by
+   * @param {boolean} v - Verbose mode. Display column headers
+   */
 
   const acceptedQuerystring = [
     'format',
@@ -32,11 +59,6 @@ function buildCatTemplates (opts) {
     filterPath: 'filter_path'
   }
 
-  /**
-   * Perform a cat.templates request
-   * Returns information about existing templates.
-   * https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-templates.html
-   */
   return function catTemplates (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
@@ -49,28 +71,36 @@ function buildCatTemplates (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 = []
-    var { method, body, name, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
+    var warnings = null
+    var { method, body, name } = params
+    var querystring = semicopy(params, ['method', 'body', 'name'])
 
-    var ignore = options.ignore
+    if (method == null) {
+      method = 'GET'
+    }
+
+    var ignore = options.ignore || null
     if (typeof ignore === 'number') {
-      options.ignore = [ignore]
+      ignore = [ignore]
     }
 
     var path = ''
 
     if ((name) != null) {
-      if (method == null) method = 'GET'
       path = '/' + '_cat' + '/' + 'templates' + '/' + encodeURIComponent(name)
     } else {
-      if (method == null) method = 'GET'
       path = '/' + '_cat' + '/' + 'templates'
     }
 
@@ -82,8 +112,34 @@ function buildCatTemplates (opts) {
       querystring
     }
 
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
+    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
+    }
   }
 }
 

api/api/cat.thread_pool.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * 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'
 
@@ -9,7 +24,20 @@
 
 function buildCatThreadPool (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  const { makeRequest, ConfigurationError, handleError } = opts
+  /**
+   * 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
+   * @param {enum} size - The multiplier in which to display values
+   * @param {boolean} local - Return local information, do not retrieve the state from master node (default: false)
+   * @param {time} master_timeout - Explicit operation timeout for connection to master node
+   * @param {list} h - Comma-separated list of column names to display
+   * @param {boolean} help - Return help information
+   * @param {list} s - Comma-separated list of column names or column aliases to sort by
+   * @param {boolean} v - Verbose mode. Display column headers
+   */
 
   const acceptedQuerystring = [
     'format',
@@ -33,12 +61,6 @@ function buildCatThreadPool (opts) {
     filterPath: 'filter_path'
   }
 
-  /**
-   * Perform a cat.thread_pool request
-   * Returns cluster-wide thread pool statistics per node.
-By default the active, queue and rejected statistics are returned for all thread pools.
-   * https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-thread-pool.html
-   */
   return function catThreadPool (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
@@ -51,28 +73,36 @@ By default the active, queue and rejected statistics are returned for all thread
       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 = []
-    var { method, body, threadPoolPatterns, thread_pool_patterns, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
+    var warnings = null
+    var { method, body, threadPoolPatterns, thread_pool_patterns } = params
+    var querystring = semicopy(params, ['method', 'body', 'threadPoolPatterns', 'thread_pool_patterns'])
 
-    var ignore = options.ignore
+    if (method == null) {
+      method = 'GET'
+    }
+
+    var ignore = options.ignore || null
     if (typeof ignore === 'number') {
-      options.ignore = [ignore]
+      ignore = [ignore]
     }
 
     var path = ''
 
     if ((thread_pool_patterns || threadPoolPatterns) != null) {
-      if (method == null) method = 'GET'
       path = '/' + '_cat' + '/' + 'thread_pool' + '/' + encodeURIComponent(thread_pool_patterns || threadPoolPatterns)
     } else {
-      if (method == null) method = 'GET'
       path = '/' + '_cat' + '/' + 'thread_pool'
     }
 
@@ -84,8 +114,34 @@ By default the active, queue and rejected statistics are returned for all thread
       querystring
     }
 
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
+    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
+    }
   }
 }
 

api/api/ccr.delete_auto_follow_pattern.js

@@ -1,77 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
-
-'use strict'
-
-/* eslint camelcase: 0 */
-/* eslint no-unused-vars: 0 */
-
-function buildCcrDeleteAutoFollowPattern (opts) {
-  // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
-
-  const acceptedQuerystring = [
-
-  ]
-
-  const snakeCase = {
-
-  }
-
-  /**
-   * Perform a ccr.delete_auto_follow_pattern request
-   * https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-delete-auto-follow-pattern.html
-   */
-  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 = []
-    var { method, body, name, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
-
-    var ignore = options.ignore
-    if (typeof ignore === 'number') {
-      options.ignore = [ignore]
-    }
-
-    var path = ''
-
-    if (method == null) method = 'DELETE'
-    path = '/' + '_ccr' + '/' + 'auto_follow' + '/' + encodeURIComponent(name)
-
-    // build request object
-    const request = {
-      method,
-      path,
-      body: body || '',
-      querystring
-    }
-
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
-  }
-}
-
-module.exports = buildCcrDeleteAutoFollowPattern

api/api/ccr.follow.js

@@ -1,81 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
-
-'use strict'
-
-/* eslint camelcase: 0 */
-/* eslint no-unused-vars: 0 */
-
-function buildCcrFollow (opts) {
-  // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
-
-  const acceptedQuerystring = [
-    'wait_for_active_shards'
-  ]
-
-  const snakeCase = {
-    waitForActiveShards: 'wait_for_active_shards'
-  }
-
-  /**
-   * Perform a ccr.follow request
-   * https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-put-follow.html
-   */
-  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 = []
-    var { method, body, index, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
-
-    var ignore = options.ignore
-    if (typeof ignore === 'number') {
-      options.ignore = [ignore]
-    }
-
-    var path = ''
-
-    if (method == null) method = 'PUT'
-    path = '/' + encodeURIComponent(index) + '/' + '_ccr' + '/' + 'follow'
-
-    // build request object
-    const request = {
-      method,
-      path,
-      body: body || '',
-      querystring
-    }
-
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
-  }
-}
-
-module.exports = buildCcrFollow

api/api/ccr.follow_info.js

@@ -1,77 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
-
-'use strict'
-
-/* eslint camelcase: 0 */
-/* eslint no-unused-vars: 0 */
-
-function buildCcrFollowInfo (opts) {
-  // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
-
-  const acceptedQuerystring = [
-
-  ]
-
-  const snakeCase = {
-
-  }
-
-  /**
-   * Perform a ccr.follow_info request
-   * https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-get-follow-info.html
-   */
-  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 = {}
-    }
-
-    // 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 = []
-    var { method, body, index, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
-
-    var ignore = options.ignore
-    if (typeof ignore === 'number') {
-      options.ignore = [ignore]
-    }
-
-    var path = ''
-
-    if (method == null) method = 'GET'
-    path = '/' + encodeURIComponent(index) + '/' + '_ccr' + '/' + 'info'
-
-    // build request object
-    const request = {
-      method,
-      path,
-      body: null,
-      querystring
-    }
-
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
-  }
-}
-
-module.exports = buildCcrFollowInfo

api/api/ccr.follow_stats.js

@@ -1,77 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
-
-'use strict'
-
-/* eslint camelcase: 0 */
-/* eslint no-unused-vars: 0 */
-
-function buildCcrFollowStats (opts) {
-  // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
-
-  const acceptedQuerystring = [
-
-  ]
-
-  const snakeCase = {
-
-  }
-
-  /**
-   * Perform a ccr.follow_stats request
-   * https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-get-follow-stats.html
-   */
-  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 = {}
-    }
-
-    // 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 = []
-    var { method, body, index, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
-
-    var ignore = options.ignore
-    if (typeof ignore === 'number') {
-      options.ignore = [ignore]
-    }
-
-    var path = ''
-
-    if (method == null) method = 'GET'
-    path = '/' + encodeURIComponent(index) + '/' + '_ccr' + '/' + 'stats'
-
-    // build request object
-    const request = {
-      method,
-      path,
-      body: null,
-      querystring
-    }
-
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
-  }
-}
-
-module.exports = buildCcrFollowStats

api/api/ccr.forget_follower.js

@@ -1,81 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
-
-'use strict'
-
-/* eslint camelcase: 0 */
-/* eslint no-unused-vars: 0 */
-
-function buildCcrForgetFollower (opts) {
-  // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
-
-  const acceptedQuerystring = [
-
-  ]
-
-  const snakeCase = {
-
-  }
-
-  /**
-   * Perform a ccr.forget_follower request
-   * http://www.elastic.co/guide/en/elasticsearch/reference/current
-   */
-  return function ccrForgetFollower (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 = []
-    var { method, body, index, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
-
-    var ignore = options.ignore
-    if (typeof ignore === 'number') {
-      options.ignore = [ignore]
-    }
-
-    var path = ''
-
-    if (method == null) method = 'POST'
-    path = '/' + encodeURIComponent(index) + '/' + '_ccr' + '/' + 'forget_follower'
-
-    // build request object
-    const request = {
-      method,
-      path,
-      body: body || '',
-      querystring
-    }
-
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
-  }
-}
-
-module.exports = buildCcrForgetFollower

api/api/ccr.get_auto_follow_pattern.js

@@ -1,76 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
-
-'use strict'
-
-/* eslint camelcase: 0 */
-/* eslint no-unused-vars: 0 */
-
-function buildCcrGetAutoFollowPattern (opts) {
-  // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
-
-  const acceptedQuerystring = [
-
-  ]
-
-  const snakeCase = {
-
-  }
-
-  /**
-   * Perform a ccr.get_auto_follow_pattern request
-   * https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-get-auto-follow-pattern.html
-   */
-  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 = []
-    var { method, body, name, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
-
-    var ignore = options.ignore
-    if (typeof ignore === 'number') {
-      options.ignore = [ignore]
-    }
-
-    var path = ''
-
-    if ((name) != null) {
-      if (method == null) method = 'GET'
-      path = '/' + '_ccr' + '/' + 'auto_follow' + '/' + encodeURIComponent(name)
-    } else {
-      if (method == null) method = 'GET'
-      path = '/' + '_ccr' + '/' + 'auto_follow'
-    }
-
-    // build request object
-    const request = {
-      method,
-      path,
-      body: null,
-      querystring
-    }
-
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
-  }
-}
-
-module.exports = buildCcrGetAutoFollowPattern

api/api/ccr.pause_follow.js

@@ -1,77 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
-
-'use strict'
-
-/* eslint camelcase: 0 */
-/* eslint no-unused-vars: 0 */
-
-function buildCcrPauseFollow (opts) {
-  // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
-
-  const acceptedQuerystring = [
-
-  ]
-
-  const snakeCase = {
-
-  }
-
-  /**
-   * Perform a ccr.pause_follow request
-   * https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-post-pause-follow.html
-   */
-  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 = []
-    var { method, body, index, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
-
-    var ignore = options.ignore
-    if (typeof ignore === 'number') {
-      options.ignore = [ignore]
-    }
-
-    var path = ''
-
-    if (method == null) method = 'POST'
-    path = '/' + encodeURIComponent(index) + '/' + '_ccr' + '/' + 'pause_follow'
-
-    // build request object
-    const request = {
-      method,
-      path,
-      body: body || '',
-      querystring
-    }
-
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
-  }
-}
-
-module.exports = buildCcrPauseFollow

api/api/ccr.put_auto_follow_pattern.js

@@ -1,81 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
-
-'use strict'
-
-/* eslint camelcase: 0 */
-/* eslint no-unused-vars: 0 */
-
-function buildCcrPutAutoFollowPattern (opts) {
-  // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
-
-  const acceptedQuerystring = [
-
-  ]
-
-  const snakeCase = {
-
-  }
-
-  /**
-   * Perform a ccr.put_auto_follow_pattern request
-   * https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-put-auto-follow-pattern.html
-   */
-  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 = []
-    var { method, body, name, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
-
-    var ignore = options.ignore
-    if (typeof ignore === 'number') {
-      options.ignore = [ignore]
-    }
-
-    var path = ''
-
-    if (method == null) method = 'PUT'
-    path = '/' + '_ccr' + '/' + 'auto_follow' + '/' + encodeURIComponent(name)
-
-    // build request object
-    const request = {
-      method,
-      path,
-      body: body || '',
-      querystring
-    }
-
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
-  }
-}
-
-module.exports = buildCcrPutAutoFollowPattern

api/api/ccr.resume_follow.js

@@ -1,77 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
-
-'use strict'
-
-/* eslint camelcase: 0 */
-/* eslint no-unused-vars: 0 */
-
-function buildCcrResumeFollow (opts) {
-  // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
-
-  const acceptedQuerystring = [
-
-  ]
-
-  const snakeCase = {
-
-  }
-
-  /**
-   * Perform a ccr.resume_follow request
-   * https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-post-resume-follow.html
-   */
-  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 = []
-    var { method, body, index, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
-
-    var ignore = options.ignore
-    if (typeof ignore === 'number') {
-      options.ignore = [ignore]
-    }
-
-    var path = ''
-
-    if (method == null) method = 'POST'
-    path = '/' + encodeURIComponent(index) + '/' + '_ccr' + '/' + 'resume_follow'
-
-    // build request object
-    const request = {
-      method,
-      path,
-      body: body || '',
-      querystring
-    }
-
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
-  }
-}
-
-module.exports = buildCcrResumeFollow

api/api/ccr.stats.js

@@ -1,71 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
-
-'use strict'
-
-/* eslint camelcase: 0 */
-/* eslint no-unused-vars: 0 */
-
-function buildCcrStats (opts) {
-  // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
-
-  const acceptedQuerystring = [
-
-  ]
-
-  const snakeCase = {
-
-  }
-
-  /**
-   * Perform a ccr.stats request
-   * https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-get-stats.html
-   */
-  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 = []
-    var { method, body, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
-
-    var ignore = options.ignore
-    if (typeof ignore === 'number') {
-      options.ignore = [ignore]
-    }
-
-    var path = ''
-
-    if (method == null) method = 'GET'
-    path = '/' + '_ccr' + '/' + 'stats'
-
-    // build request object
-    const request = {
-      method,
-      path,
-      body: null,
-      querystring
-    }
-
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
-  }
-}
-
-module.exports = buildCcrStats

api/api/ccr.unfollow.js

@@ -1,77 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
-
-'use strict'
-
-/* eslint camelcase: 0 */
-/* eslint no-unused-vars: 0 */
-
-function buildCcrUnfollow (opts) {
-  // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
-
-  const acceptedQuerystring = [
-
-  ]
-
-  const snakeCase = {
-
-  }
-
-  /**
-   * Perform a ccr.unfollow request
-   * http://www.elastic.co/guide/en/elasticsearch/reference/current
-   */
-  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 = []
-    var { method, body, index, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
-
-    var ignore = options.ignore
-    if (typeof ignore === 'number') {
-      options.ignore = [ignore]
-    }
-
-    var path = ''
-
-    if (method == null) method = 'POST'
-    path = '/' + encodeURIComponent(index) + '/' + '_ccr' + '/' + 'unfollow'
-
-    // build request object
-    const request = {
-      method,
-      path,
-      body: body || '',
-      querystring
-    }
-
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
-  }
-}
-
-module.exports = buildCcrUnfollow

api/api/clear_scroll.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * 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'
 
@@ -9,7 +24,13 @@
 
 function buildClearScroll (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  const { makeRequest, ConfigurationError, handleError } = opts
+  /**
+   * 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
+   */
 
   const acceptedQuerystring = [
     'pretty',
@@ -24,11 +45,6 @@ function buildClearScroll (opts) {
     filterPath: 'filter_path'
   }
 
-  /**
-   * Perform a clear_scroll request
-   * Explicitly clears the search context for a scroll.
-   * https://www.elastic.co/guide/en/elasticsearch/reference/master/search-request-body.html#_clear_scroll_api
-   */
   return function clearScroll (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
@@ -47,22 +63,24 @@ function buildClearScroll (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = []
-    var { method, body, scrollId, scroll_id, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
+    var warnings = null
+    var { method, body, scrollId, scroll_id } = params
+    var querystring = semicopy(params, ['method', 'body', 'scrollId', 'scroll_id'])
 
-    var ignore = options.ignore
+    if (method == null) {
+      method = 'DELETE'
+    }
+
+    var ignore = options.ignore || null
     if (typeof ignore === 'number') {
-      options.ignore = [ignore]
+      ignore = [ignore]
     }
 
     var path = ''
 
     if ((scroll_id || scrollId) != null) {
-      if (method == null) method = 'DELETE'
       path = '/' + '_search' + '/' + 'scroll' + '/' + encodeURIComponent(scroll_id || scrollId)
     } else {
-      if (method == null) method = 'DELETE'
       path = '/' + '_search' + '/' + 'scroll'
     }
 
@@ -74,8 +92,34 @@ function buildClearScroll (opts) {
       querystring
     }
 
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
+    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
+    }
   }
 }
 

api/api/cluster.allocation_explain.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * 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'
 
@@ -9,7 +24,14 @@
 
 function buildClusterAllocationExplain (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  const { makeRequest, ConfigurationError, handleError } = opts
+  /**
+   * 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)
+   * @param {object} body - The index, shard, and primary flag to explain. Empty means 'explain the first unassigned shard'
+   */
 
   const acceptedQuerystring = [
     'include_yes_decisions',
@@ -28,11 +50,6 @@ function buildClusterAllocationExplain (opts) {
     filterPath: 'filter_path'
   }
 
-  /**
-   * Perform a cluster.allocation_explain request
-   * Provides explanations for shard allocations in the cluster.
-   * https://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-allocation-explain.html
-   */
   return function clusterAllocationExplain (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
@@ -51,18 +68,21 @@ function buildClusterAllocationExplain (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = []
-    var { method, body, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
+    var warnings = null
+    var { method, body } = params
+    var querystring = semicopy(params, ['method', 'body'])
 
-    var ignore = options.ignore
+    if (method == null) {
+      method = body == null ? 'GET' : 'POST'
+    }
+
+    var ignore = options.ignore || null
     if (typeof ignore === 'number') {
-      options.ignore = [ignore]
+      ignore = [ignore]
     }
 
     var path = ''
 
-    if (method == null) method = body == null ? 'GET' : 'POST'
     path = '/' + '_cluster' + '/' + 'allocation' + '/' + 'explain'
 
     // build request object
@@ -73,8 +93,34 @@ function buildClusterAllocationExplain (opts) {
       querystring
     }
 
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
+    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
+    }
   }
 }
 

api/api/cluster.get_settings.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * 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'
 
@@ -9,7 +24,15 @@
 
 function buildClusterGetSettings (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  const { makeRequest, ConfigurationError, handleError } = opts
+  /**
+   * 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
+   * @param {time} timeout - Explicit operation timeout
+   * @param {boolean} include_defaults - Whether to return all default clusters setting.
+   */
 
   const acceptedQuerystring = [
     'flat_settings',
@@ -31,11 +54,6 @@ function buildClusterGetSettings (opts) {
     filterPath: 'filter_path'
   }
 
-  /**
-   * Perform a cluster.get_settings request
-   * Returns cluster settings.
-   * https://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-update-settings.html
-   */
   return function clusterGetSettings (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
@@ -48,24 +66,33 @@ function buildClusterGetSettings (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 = []
-    var { method, body, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
+    var warnings = null
+    var { method, body } = params
+    var querystring = semicopy(params, ['method', 'body'])
 
-    var ignore = options.ignore
+    if (method == null) {
+      method = 'GET'
+    }
+
+    var ignore = options.ignore || null
     if (typeof ignore === 'number') {
-      options.ignore = [ignore]
+      ignore = [ignore]
     }
 
     var path = ''
 
-    if (method == null) method = 'GET'
     path = '/' + '_cluster' + '/' + 'settings'
 
     // build request object
@@ -76,8 +103,34 @@ function buildClusterGetSettings (opts) {
       querystring
     }
 
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
+    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
+    }
   }
 }
 

api/api/cluster.health.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * 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'
 
@@ -9,10 +24,23 @@
 
 function buildClusterHealth (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  const { makeRequest, ConfigurationError, handleError } = opts
+  /**
+   * 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
+   * @param {boolean} local - Return local information, do not retrieve the state from master node (default: false)
+   * @param {time} master_timeout - Explicit operation timeout for connection to master node
+   * @param {time} timeout - Explicit operation timeout
+   * @param {string} wait_for_active_shards - Wait until the specified number of shards is active
+   * @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 {enum} wait_for_status - Wait until cluster is in a specific state
+   */
 
   const acceptedQuerystring = [
-    'expand_wildcards',
     'level',
     'local',
     'master_timeout',
@@ -21,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',
@@ -31,23 +58,16 @@ function buildClusterHealth (opts) {
   ]
 
   const snakeCase = {
-    expandWildcards: 'expand_wildcards',
     masterTimeout: 'master_timeout',
     waitForActiveShards: 'wait_for_active_shards',
     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'
   }
 
-  /**
-   * Perform a cluster.health request
-   * Returns basic information about the health of the cluster.
-   * https://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-health.html
-   */
   return function clusterHealth (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
@@ -60,28 +80,36 @@ function buildClusterHealth (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 = []
-    var { method, body, index, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
+    var warnings = null
+    var { method, body, index } = params
+    var querystring = semicopy(params, ['method', 'body', 'index'])
 
-    var ignore = options.ignore
+    if (method == null) {
+      method = 'GET'
+    }
+
+    var ignore = options.ignore || null
     if (typeof ignore === 'number') {
-      options.ignore = [ignore]
+      ignore = [ignore]
     }
 
     var path = ''
 
     if ((index) != null) {
-      if (method == null) method = 'GET'
       path = '/' + '_cluster' + '/' + 'health' + '/' + encodeURIComponent(index)
     } else {
-      if (method == null) method = 'GET'
       path = '/' + '_cluster' + '/' + 'health'
     }
 
@@ -93,8 +121,34 @@ function buildClusterHealth (opts) {
       querystring
     }
 
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
+    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
+    }
   }
 }
 

api/api/cluster.pending_tasks.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * 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'
 
@@ -9,7 +24,13 @@
 
 function buildClusterPendingTasks (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  const { makeRequest, ConfigurationError, handleError } = opts
+  /**
+   * 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
+   */
 
   const acceptedQuerystring = [
     'local',
@@ -27,12 +48,6 @@ function buildClusterPendingTasks (opts) {
     filterPath: 'filter_path'
   }
 
-  /**
-   * Perform a cluster.pending_tasks request
-   * Returns a list of any cluster-level changes (e.g. create index, update mapping,
-allocate or fail shard) which have not yet been executed.
-   * https://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-pending.html
-   */
   return function clusterPendingTasks (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
@@ -45,24 +60,33 @@ allocate or fail shard) which have not yet been executed.
       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 = []
-    var { method, body, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
+    var warnings = null
+    var { method, body } = params
+    var querystring = semicopy(params, ['method', 'body'])
 
-    var ignore = options.ignore
+    if (method == null) {
+      method = 'GET'
+    }
+
+    var ignore = options.ignore || null
     if (typeof ignore === 'number') {
-      options.ignore = [ignore]
+      ignore = [ignore]
     }
 
     var path = ''
 
-    if (method == null) method = 'GET'
     path = '/' + '_cluster' + '/' + 'pending_tasks'
 
     // build request object
@@ -73,8 +97,34 @@ allocate or fail shard) which have not yet been executed.
       querystring
     }
 
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
+    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
+    }
   }
 }
 

api/api/cluster.put_settings.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * 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'
 
@@ -9,7 +24,15 @@
 
 function buildClusterPutSettings (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  const { makeRequest, ConfigurationError, handleError } = opts
+  /**
+   * 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
+   * @param {time} timeout - Explicit operation timeout
+   * @param {object} body - The settings to be updated. Can be either `transient` or `persistent` (survives cluster restart).
+   */
 
   const acceptedQuerystring = [
     'flat_settings',
@@ -29,11 +52,6 @@ function buildClusterPutSettings (opts) {
     filterPath: 'filter_path'
   }
 
-  /**
-   * Perform a cluster.put_settings request
-   * Updates the cluster settings.
-   * https://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-update-settings.html
-   */
   return function clusterPutSettings (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
@@ -46,30 +64,27 @@ 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 = []
-    var { method, body, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
+    var warnings = null
+    var { method, body } = params
+    var querystring = semicopy(params, ['method', 'body'])
 
-    var ignore = options.ignore
+    if (method == null) {
+      method = 'PUT'
+    }
+
+    var ignore = options.ignore || null
     if (typeof ignore === 'number') {
-      options.ignore = [ignore]
+      ignore = [ignore]
     }
 
     var path = ''
 
-    if (method == null) method = 'PUT'
     path = '/' + '_cluster' + '/' + 'settings'
 
     // build request object
@@ -80,8 +95,34 @@ function buildClusterPutSettings (opts) {
       querystring
     }
 
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
+    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
+    }
   }
 }
 

api/api/cluster.remote_info.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * 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'
 
@@ -9,7 +24,11 @@
 
 function buildClusterRemoteInfo (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  const { makeRequest, ConfigurationError, handleError } = opts
+  /**
+   * Perform a [cluster.remote_info](http://www.elastic.co/guide/en/elasticsearch/reference/5.x/cluster-remote-info.html) request
+   *
+   */
 
   const acceptedQuerystring = [
     'pretty',
@@ -24,11 +43,6 @@ function buildClusterRemoteInfo (opts) {
     filterPath: 'filter_path'
   }
 
-  /**
-   * Perform a cluster.remote_info request
-   * Returns the information about configured remote clusters.
-   * https://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-remote-info.html
-   */
   return function clusterRemoteInfo (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
@@ -41,24 +55,33 @@ function buildClusterRemoteInfo (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 = []
-    var { method, body, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
+    var warnings = null
+    var { method, body } = params
+    var querystring = semicopy(params, ['method', 'body'])
 
-    var ignore = options.ignore
+    if (method == null) {
+      method = 'GET'
+    }
+
+    var ignore = options.ignore || null
     if (typeof ignore === 'number') {
-      options.ignore = [ignore]
+      ignore = [ignore]
     }
 
     var path = ''
 
-    if (method == null) method = 'GET'
     path = '/' + '_remote' + '/' + 'info'
 
     // build request object
@@ -69,8 +92,34 @@ function buildClusterRemoteInfo (opts) {
       querystring
     }
 
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
+    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
+    }
   }
 }
 

api/api/cluster.reroute.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * 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'
 
@@ -9,7 +24,18 @@
 
 function buildClusterReroute (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  const { makeRequest, ConfigurationError, handleError } = opts
+  /**
+   * 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
+   * @param {boolean} retry_failed - Retries allocation of shards that are blocked due to too many subsequent allocation failures
+   * @param {list} metric - Limit the information returned to the specified metrics. Defaults to all but metadata
+   * @param {time} master_timeout - Explicit operation timeout for connection to master node
+   * @param {time} timeout - Explicit operation timeout
+   * @param {object} body - The definition of `commands` to perform (`move`, `cancel`, `allocate`)
+   */
 
   const acceptedQuerystring = [
     'dry_run',
@@ -33,11 +59,6 @@ function buildClusterReroute (opts) {
     filterPath: 'filter_path'
   }
 
-  /**
-   * Perform a cluster.reroute request
-   * Allows to manually change the allocation of individual shards in the cluster.
-   * https://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-reroute.html
-   */
   return function clusterReroute (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
@@ -56,18 +77,21 @@ function buildClusterReroute (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = []
-    var { method, body, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
+    var warnings = null
+    var { method, body } = params
+    var querystring = semicopy(params, ['method', 'body'])
 
-    var ignore = options.ignore
+    if (method == null) {
+      method = 'POST'
+    }
+
+    var ignore = options.ignore || null
     if (typeof ignore === 'number') {
-      options.ignore = [ignore]
+      ignore = [ignore]
     }
 
     var path = ''
 
-    if (method == null) method = 'POST'
     path = '/' + '_cluster' + '/' + 'reroute'
 
     // build request object
@@ -78,8 +102,34 @@ function buildClusterReroute (opts) {
       querystring
     }
 
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
+    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
+    }
   }
 }
 

api/api/cluster.state.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * 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'
 
@@ -9,14 +24,24 @@
 
 function buildClusterState (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  const { makeRequest, ConfigurationError, handleError } = opts
+  /**
+   * 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 {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.
+   */
 
   const acceptedQuerystring = [
     'local',
     'master_timeout',
     'flat_settings',
-    'wait_for_metadata_version',
-    'wait_for_timeout',
     'ignore_unavailable',
     'allow_no_indices',
     'expand_wildcards',
@@ -30,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',
@@ -39,11 +62,6 @@ function buildClusterState (opts) {
     filterPath: 'filter_path'
   }
 
-  /**
-   * Perform a cluster.state request
-   * Returns a comprehensive information about the state of the cluster.
-   * https://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-state.html
-   */
   return function clusterState (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
@@ -56,6 +74,12 @@ function buildClusterState (opts) {
       options = {}
     }
 
+    // check required parameters
+    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['index'] != null && (params['metric'] == null)) {
       const err = new ConfigurationError('Missing required parameter of the url: metric')
@@ -68,25 +92,26 @@ function buildClusterState (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = []
-    var { method, body, metric, index, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
+    var warnings = null
+    var { method, body, index, metric } = params
+    var querystring = semicopy(params, ['method', 'body', 'index', 'metric'])
 
-    var ignore = options.ignore
+    if (method == null) {
+      method = 'GET'
+    }
+
+    var ignore = options.ignore || null
     if (typeof ignore === 'number') {
-      options.ignore = [ignore]
+      ignore = [ignore]
     }
 
     var path = ''
 
     if ((metric) != null && (index) != null) {
-      if (method == null) method = 'GET'
       path = '/' + '_cluster' + '/' + 'state' + '/' + encodeURIComponent(metric) + '/' + encodeURIComponent(index)
     } else if ((metric) != null) {
-      if (method == null) method = 'GET'
       path = '/' + '_cluster' + '/' + 'state' + '/' + encodeURIComponent(metric)
     } else {
-      if (method == null) method = 'GET'
       path = '/' + '_cluster' + '/' + 'state'
     }
 
@@ -98,8 +123,34 @@ function buildClusterState (opts) {
       querystring
     }
 
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
+    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
+    }
   }
 }
 

api/api/cluster.stats.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * 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'
 
@@ -9,7 +24,14 @@
 
 function buildClusterStats (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  const { makeRequest, ConfigurationError, handleError } = opts
+  /**
+   * 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)
+   * @param {time} timeout - Explicit operation timeout
+   */
 
   const acceptedQuerystring = [
     'flat_settings',
@@ -27,11 +49,6 @@ function buildClusterStats (opts) {
     filterPath: 'filter_path'
   }
 
-  /**
-   * Perform a cluster.stats request
-   * Returns high-level overview of cluster statistics.
-   * https://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-stats.html
-   */
   return function clusterStats (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
@@ -44,28 +61,36 @@ function buildClusterStats (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 = []
-    var { method, body, nodeId, node_id, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
+    var warnings = null
+    var { method, body, nodeId, node_id } = params
+    var querystring = semicopy(params, ['method', 'body', 'nodeId', 'node_id'])
 
-    var ignore = options.ignore
+    if (method == null) {
+      method = 'GET'
+    }
+
+    var ignore = options.ignore || null
     if (typeof ignore === 'number') {
-      options.ignore = [ignore]
+      ignore = [ignore]
     }
 
     var path = ''
 
     if ((node_id || nodeId) != null) {
-      if (method == null) method = 'GET'
       path = '/' + '_cluster' + '/' + 'stats' + '/' + 'nodes' + '/' + encodeURIComponent(node_id || nodeId)
     } else {
-      if (method == null) method = 'GET'
       path = '/' + '_cluster' + '/' + 'stats'
     }
 
@@ -77,8 +102,34 @@ function buildClusterStats (opts) {
       querystring
     }
 
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
+    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
+    }
   }
 }
 

api/api/count.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * 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'
 
@@ -9,11 +24,30 @@
 
 function buildCount (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  const { makeRequest, ConfigurationError, handleError } = opts
+  /**
+   * 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} 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
+   * @param {string} preference - Specify the node or shard the operation should be performed on (default: random)
+   * @param {list} routing - A comma-separated list of specific routing values
+   * @param {string} q - Query in the Lucene query string syntax
+   * @param {string} analyzer - The analyzer to use for the query string
+   * @param {boolean} analyze_wildcard - Specify whether wildcard and prefix queries should be analyzed (default: false)
+   * @param {enum} default_operator - The default operator for query string query (AND or OR)
+   * @param {string} df - The field to use as default where no field prefix is given in the query string
+   * @param {boolean} lenient - Specify whether format-based query failures (such as providing text to a numeric field) should be ignored
+   * @param {number} terminate_after - The maximum count for each shard, upon reaching which the query execution will terminate early
+   * @param {object} body - A query to restrict the results specified with the Query DSL (optional)
+   */
 
   const acceptedQuerystring = [
     'ignore_unavailable',
-    'ignore_throttled',
     'allow_no_indices',
     'expand_wildcards',
     'min_score',
@@ -35,7 +69,6 @@ function buildCount (opts) {
 
   const snakeCase = {
     ignoreUnavailable: 'ignore_unavailable',
-    ignoreThrottled: 'ignore_throttled',
     allowNoIndices: 'allow_no_indices',
     expandWildcards: 'expand_wildcards',
     minScore: 'min_score',
@@ -46,11 +79,6 @@ function buildCount (opts) {
     filterPath: 'filter_path'
   }
 
-  /**
-   * Perform a count request
-   * Returns number of documents matching a query.
-   * https://www.elastic.co/guide/en/elasticsearch/reference/master/search-count.html
-   */
   return function count (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
@@ -75,25 +103,26 @@ function buildCount (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = []
-    var { method, body, index, type, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
+    var warnings = null
+    var { method, body, index, type } = params
+    var querystring = semicopy(params, ['method', 'body', 'index', 'type'])
 
-    var ignore = options.ignore
+    if (method == null) {
+      method = body == null ? 'GET' : 'POST'
+    }
+
+    var ignore = options.ignore || null
     if (typeof ignore === 'number') {
-      options.ignore = [ignore]
+      ignore = [ignore]
     }
 
     var path = ''
 
     if ((index) != null && (type) != null) {
-      if (method == null) method = body == null ? 'GET' : 'POST'
       path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type) + '/' + '_count'
     } else if ((index) != null) {
-      if (method == null) method = body == null ? 'GET' : 'POST'
       path = '/' + encodeURIComponent(index) + '/' + '_count'
     } else {
-      if (method == null) method = body == null ? 'GET' : 'POST'
       path = '/' + '_count'
     }
 
@@ -105,8 +134,34 @@ function buildCount (opts) {
       querystring
     }
 
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
+    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
+    }
   }
 }
 

api/api/count_percolate.js

@@ -0,0 +1,171 @@
+/*
+ * 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 } = 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 = null
+    var { method, body, index, type, id } = params
+    var querystring = semicopy(params, ['method', 'body', 'index', 'type', 'id'])
+
+    if (method == null) {
+      method = body == null ? 'GET' : 'POST'
+    }
+
+    var ignore = options.ignore || null
+    if (typeof ignore === 'number') {
+      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
+    }
+
+    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 = buildCountPercolate

api/api/create.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * 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'
 
@@ -9,13 +24,34 @@
 
 function buildCreate (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  const { makeRequest, ConfigurationError, handleError } = opts
+  /**
+   * 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
+   * @param {string} type - The type of the document
+   * @param {string} wait_for_active_shards - Sets the number of shard copies that must be active before proceeding with the index 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 {string} parent - ID of the parent document
+   * @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
+   * @param {object} body - The document
+   */
 
   const acceptedQuerystring = [
     'wait_for_active_shards',
+    'parent',
     'refresh',
     'routing',
     'timeout',
+    'timestamp',
+    'ttl',
     'version',
     'version_type',
     'pipeline',
@@ -33,13 +69,6 @@ function buildCreate (opts) {
     filterPath: 'filter_path'
   }
 
-  /**
-   * Perform a create request
-   * Creates a new document in the index.
-
-Returns a 409 response when a document with a same ID already exists in the index.
-   * https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-index_.html
-   */
   return function create (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
@@ -61,6 +90,10 @@ Returns a 409 response when a document with a same ID already exists in the inde
       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)
@@ -72,24 +105,22 @@ Returns a 409 response when a document with a same ID already exists in the inde
       return handleError(err, callback)
     }
 
-    var warnings = []
-    var { method, body, id, index, type, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
+    var warnings = null
+    var { method, body, id, index, type } = params
+    var querystring = semicopy(params, ['method', 'body', 'id', 'index', 'type'])
 
-    var ignore = options.ignore
+    if (method == null) {
+      method = 'PUT'
+    }
+
+    var ignore = options.ignore || null
     if (typeof ignore === 'number') {
-      options.ignore = [ignore]
+      ignore = [ignore]
     }
 
     var path = ''
 
-    if ((index) != null && (type) != null && (id) != null) {
-      if (method == null) method = 'PUT'
-      path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type) + '/' + encodeURIComponent(id) + '/' + '_create'
-    } else {
-      if (method == null) method = 'PUT'
-      path = '/' + encodeURIComponent(index) + '/' + '_create' + '/' + encodeURIComponent(id)
-    }
+    path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type) + '/' + encodeURIComponent(id) + '/' + '_create'
 
     // build request object
     const request = {
@@ -99,8 +130,34 @@ Returns a 409 response when a document with a same ID already exists in the inde
       querystring
     }
 
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
+    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
+    }
   }
 }
 

api/api/data_frame.delete_data_frame_transform.js

@@ -1,77 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
-
-'use strict'
-
-/* eslint camelcase: 0 */
-/* eslint no-unused-vars: 0 */
-
-function buildDataFrameDeleteDataFrameTransform (opts) {
-  // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
-
-  const acceptedQuerystring = [
-    'force'
-  ]
-
-  const snakeCase = {
-
-  }
-
-  /**
-   * Perform a data_frame.delete_data_frame_transform request
-   * https://www.elastic.co/guide/en/elasticsearch/reference/current/delete-transform.html
-   */
-  return function dataFrameDeleteDataFrameTransform (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['transform_id'] == null && params['transformId'] == null) {
-      const err = new ConfigurationError('Missing required parameter: transform_id or transformId')
-      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, transformId, transform_id, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
-
-    var ignore = options.ignore
-    if (typeof ignore === 'number') {
-      options.ignore = [ignore]
-    }
-
-    var path = ''
-
-    if (method == null) method = 'DELETE'
-    path = '/' + '_data_frame' + '/' + 'transforms' + '/' + encodeURIComponent(transform_id || transformId)
-
-    // build request object
-    const request = {
-      method,
-      path,
-      body: body || '',
-      querystring
-    }
-
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
-  }
-}
-
-module.exports = buildDataFrameDeleteDataFrameTransform

api/api/data_frame.get_data_frame_transform.js

@@ -1,78 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
-
-'use strict'
-
-/* eslint camelcase: 0 */
-/* eslint no-unused-vars: 0 */
-
-function buildDataFrameGetDataFrameTransform (opts) {
-  // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
-
-  const acceptedQuerystring = [
-    'from',
-    'size',
-    'allow_no_match'
-  ]
-
-  const snakeCase = {
-    allowNoMatch: 'allow_no_match'
-  }
-
-  /**
-   * Perform a data_frame.get_data_frame_transform request
-   * https://www.elastic.co/guide/en/elasticsearch/reference/current/get-transform.html
-   */
-  return function dataFrameGetDataFrameTransform (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 = []
-    var { method, body, transformId, transform_id, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
-
-    var ignore = options.ignore
-    if (typeof ignore === 'number') {
-      options.ignore = [ignore]
-    }
-
-    var path = ''
-
-    if ((transform_id || transformId) != null) {
-      if (method == null) method = 'GET'
-      path = '/' + '_data_frame' + '/' + 'transforms' + '/' + encodeURIComponent(transform_id || transformId)
-    } else {
-      if (method == null) method = 'GET'
-      path = '/' + '_data_frame' + '/' + 'transforms'
-    }
-
-    // build request object
-    const request = {
-      method,
-      path,
-      body: null,
-      querystring
-    }
-
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
-  }
-}
-
-module.exports = buildDataFrameGetDataFrameTransform

api/api/data_frame.get_data_frame_transform_stats.js

@@ -1,79 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
-
-'use strict'
-
-/* eslint camelcase: 0 */
-/* eslint no-unused-vars: 0 */
-
-function buildDataFrameGetDataFrameTransformStats (opts) {
-  // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
-
-  const acceptedQuerystring = [
-    'from',
-    'size',
-    'allow_no_match'
-  ]
-
-  const snakeCase = {
-    allowNoMatch: 'allow_no_match'
-  }
-
-  /**
-   * Perform a data_frame.get_data_frame_transform_stats request
-   * https://www.elastic.co/guide/en/elasticsearch/reference/current/get-transform-stats.html
-   */
-  return function dataFrameGetDataFrameTransformStats (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['transform_id'] == null && params['transformId'] == null) {
-      const err = new ConfigurationError('Missing required parameter: transform_id or transformId')
-      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, transformId, transform_id, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
-
-    var ignore = options.ignore
-    if (typeof ignore === 'number') {
-      options.ignore = [ignore]
-    }
-
-    var path = ''
-
-    if (method == null) method = 'GET'
-    path = '/' + '_data_frame' + '/' + 'transforms' + '/' + encodeURIComponent(transform_id || transformId) + '/' + '_stats'
-
-    // build request object
-    const request = {
-      method,
-      path,
-      body: null,
-      querystring
-    }
-
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
-  }
-}
-
-module.exports = buildDataFrameGetDataFrameTransformStats

api/api/data_frame.preview_data_frame_transform.js

@@ -1,77 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
-
-'use strict'
-
-/* eslint camelcase: 0 */
-/* eslint no-unused-vars: 0 */
-
-function buildDataFramePreviewDataFrameTransform (opts) {
-  // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
-
-  const acceptedQuerystring = [
-
-  ]
-
-  const snakeCase = {
-
-  }
-
-  /**
-   * Perform a data_frame.preview_data_frame_transform request
-   * https://www.elastic.co/guide/en/elasticsearch/reference/current/preview-transform.html
-   */
-  return function dataFramePreviewDataFrameTransform (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('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 = []
-    var { method, body, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
-
-    var ignore = options.ignore
-    if (typeof ignore === 'number') {
-      options.ignore = [ignore]
-    }
-
-    var path = ''
-
-    if (method == null) method = 'POST'
-    path = '/' + '_data_frame' + '/' + 'transforms' + '/' + '_preview'
-
-    // build request object
-    const request = {
-      method,
-      path,
-      body: body || '',
-      querystring
-    }
-
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
-  }
-}
-
-module.exports = buildDataFramePreviewDataFrameTransform

api/api/data_frame.put_data_frame_transform.js

@@ -1,81 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
-
-'use strict'
-
-/* eslint camelcase: 0 */
-/* eslint no-unused-vars: 0 */
-
-function buildDataFramePutDataFrameTransform (opts) {
-  // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
-
-  const acceptedQuerystring = [
-    'defer_validation'
-  ]
-
-  const snakeCase = {
-    deferValidation: 'defer_validation'
-  }
-
-  /**
-   * Perform a data_frame.put_data_frame_transform request
-   * https://www.elastic.co/guide/en/elasticsearch/reference/current/put-transform.html
-   */
-  return function dataFramePutDataFrameTransform (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['transform_id'] == null && params['transformId'] == null) {
-      const err = new ConfigurationError('Missing required parameter: transform_id or transformId')
-      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 = []
-    var { method, body, transformId, transform_id, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
-
-    var ignore = options.ignore
-    if (typeof ignore === 'number') {
-      options.ignore = [ignore]
-    }
-
-    var path = ''
-
-    if (method == null) method = 'PUT'
-    path = '/' + '_data_frame' + '/' + 'transforms' + '/' + encodeURIComponent(transform_id || transformId)
-
-    // build request object
-    const request = {
-      method,
-      path,
-      body: body || '',
-      querystring
-    }
-
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
-  }
-}
-
-module.exports = buildDataFramePutDataFrameTransform

api/api/data_frame.start_data_frame_transform.js

@@ -1,77 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
-
-'use strict'
-
-/* eslint camelcase: 0 */
-/* eslint no-unused-vars: 0 */
-
-function buildDataFrameStartDataFrameTransform (opts) {
-  // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
-
-  const acceptedQuerystring = [
-    'timeout'
-  ]
-
-  const snakeCase = {
-
-  }
-
-  /**
-   * Perform a data_frame.start_data_frame_transform request
-   * https://www.elastic.co/guide/en/elasticsearch/reference/current/start-transform.html
-   */
-  return function dataFrameStartDataFrameTransform (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['transform_id'] == null && params['transformId'] == null) {
-      const err = new ConfigurationError('Missing required parameter: transform_id or transformId')
-      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, transformId, transform_id, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
-
-    var ignore = options.ignore
-    if (typeof ignore === 'number') {
-      options.ignore = [ignore]
-    }
-
-    var path = ''
-
-    if (method == null) method = 'POST'
-    path = '/' + '_data_frame' + '/' + 'transforms' + '/' + encodeURIComponent(transform_id || transformId) + '/' + '_start'
-
-    // build request object
-    const request = {
-      method,
-      path,
-      body: body || '',
-      querystring
-    }
-
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
-  }
-}
-
-module.exports = buildDataFrameStartDataFrameTransform

api/api/data_frame.stop_data_frame_transform.js

@@ -1,80 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
-
-'use strict'
-
-/* eslint camelcase: 0 */
-/* eslint no-unused-vars: 0 */
-
-function buildDataFrameStopDataFrameTransform (opts) {
-  // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
-
-  const acceptedQuerystring = [
-    'wait_for_completion',
-    'timeout',
-    'allow_no_match'
-  ]
-
-  const snakeCase = {
-    waitForCompletion: 'wait_for_completion',
-    allowNoMatch: 'allow_no_match'
-  }
-
-  /**
-   * Perform a data_frame.stop_data_frame_transform request
-   * https://www.elastic.co/guide/en/elasticsearch/reference/current/stop-transform.html
-   */
-  return function dataFrameStopDataFrameTransform (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['transform_id'] == null && params['transformId'] == null) {
-      const err = new ConfigurationError('Missing required parameter: transform_id or transformId')
-      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, transformId, transform_id, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
-
-    var ignore = options.ignore
-    if (typeof ignore === 'number') {
-      options.ignore = [ignore]
-    }
-
-    var path = ''
-
-    if (method == null) method = 'POST'
-    path = '/' + '_data_frame' + '/' + 'transforms' + '/' + encodeURIComponent(transform_id || transformId) + '/' + '_stop'
-
-    // build request object
-    const request = {
-      method,
-      path,
-      body: body || '',
-      querystring
-    }
-
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
-  }
-}
-
-module.exports = buildDataFrameStopDataFrameTransform

api/api/data_frame.update_data_frame_transform.js

@@ -1,81 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
-
-'use strict'
-
-/* eslint camelcase: 0 */
-/* eslint no-unused-vars: 0 */
-
-function buildDataFrameUpdateDataFrameTransform (opts) {
-  // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
-
-  const acceptedQuerystring = [
-    'defer_validation'
-  ]
-
-  const snakeCase = {
-    deferValidation: 'defer_validation'
-  }
-
-  /**
-   * Perform a data_frame.update_data_frame_transform request
-   * https://www.elastic.co/guide/en/elasticsearch/reference/current/update-transform.html
-   */
-  return function dataFrameUpdateDataFrameTransform (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['transform_id'] == null && params['transformId'] == null) {
-      const err = new ConfigurationError('Missing required parameter: transform_id or transformId')
-      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 = []
-    var { method, body, transformId, transform_id, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
-
-    var ignore = options.ignore
-    if (typeof ignore === 'number') {
-      options.ignore = [ignore]
-    }
-
-    var path = ''
-
-    if (method == null) method = 'POST'
-    path = '/' + '_data_frame' + '/' + 'transforms' + '/' + encodeURIComponent(transform_id || transformId) + '/' + '_update'
-
-    // build request object
-    const request = {
-      method,
-      path,
-      body: body || '',
-      querystring
-    }
-
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
-  }
-}
-
-module.exports = buildDataFrameUpdateDataFrameTransform

api/api/delete.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * 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'
 
@@ -9,15 +24,28 @@
 
 function buildDelete (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  const { makeRequest, ConfigurationError, handleError } = opts
+  /**
+   * 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
+   * @param {string} type - The type of the document
+   * @param {string} wait_for_active_shards - Sets the number of shard copies that must be active before proceeding with the delete 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 {string} parent - ID of parent document
+   * @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} version - Explicit version number for concurrency control
+   * @param {enum} version_type - Specific version type
+   */
 
   const acceptedQuerystring = [
     'wait_for_active_shards',
+    'parent',
     'refresh',
     'routing',
     'timeout',
-    'if_seq_no',
-    'if_primary_term',
     'version',
     'version_type',
     'pretty',
@@ -29,18 +57,11 @@ 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'
   }
 
-  /**
-   * Perform a delete request
-   * Removes a document from the index.
-   * https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-delete.html
-   */
   return function _delete (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
@@ -62,6 +83,23 @@ 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['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') {
@@ -69,35 +107,59 @@ function buildDelete (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = []
-    var { method, body, id, index, type, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
+    var warnings = null
+    var { method, body, id, index, type } = params
+    var querystring = semicopy(params, ['method', 'body', 'id', 'index', 'type'])
 
-    var ignore = options.ignore
+    if (method == null) {
+      method = 'DELETE'
+    }
+
+    var ignore = options.ignore || null
     if (typeof ignore === 'number') {
-      options.ignore = [ignore]
+      ignore = [ignore]
     }
 
     var path = ''
 
-    if ((index) != null && (type) != null && (id) != null) {
-      if (method == null) method = 'DELETE'
-      path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type) + '/' + encodeURIComponent(id)
-    } else {
-      if (method == null) method = 'DELETE'
-      path = '/' + encodeURIComponent(index) + '/' + '_doc' + '/' + encodeURIComponent(id)
-    }
+    path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type) + '/' + encodeURIComponent(id)
 
     // build request object
     const request = {
       method,
       path,
-      body: body || '',
+      body: '',
       querystring
     }
 
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
+    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
+    }
   }
 }
 

api/api/delete_by_query.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * 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'
 
@@ -9,9 +24,49 @@
 
 function buildDeleteByQuery (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  const { makeRequest, ConfigurationError, handleError } = opts
+  /**
+   * 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
+   * @param {string} analyzer - The analyzer to use for the query string
+   * @param {boolean} analyze_wildcard - Specify whether wildcard and prefix queries should be analyzed (default: false)
+   * @param {enum} default_operator - The default operator for query string query (AND or OR)
+   * @param {string} df - The field to use as default where no field prefix is given in the query string
+   * @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} 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)
+   * @param {string} q - Query in the Lucene query string syntax
+   * @param {list} routing - A comma-separated list of specific routing values
+   * @param {time} scroll - Specify how long a consistent view of the index should be maintained for scrolled search
+   * @param {enum} search_type - Search operation type
+   * @param {time} search_timeout - Explicit timeout for each search request. Defaults to no timeout.
+   * @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_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} 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
+   * @param {boolean} request_cache - Specify if request cache should be used for this request or not, defaults to index level setting
+   * @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 update_by_query
+   * @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
+   */
 
   const acceptedQuerystring = [
+    'analyzer',
     'analyze_wildcard',
     'default_operator',
     'df',
@@ -28,12 +83,9 @@ function buildDeleteByQuery (opts) {
     'search_type',
     'search_timeout',
     'size',
-    'max_docs',
     'sort',
     '_source',
-    '_source_excludes',
     '_source_exclude',
-    '_source_includes',
     '_source_include',
     'terminate_after',
     'stats',
@@ -61,10 +113,7 @@ function buildDeleteByQuery (opts) {
     expandWildcards: 'expand_wildcards',
     searchType: 'search_type',
     searchTimeout: 'search_timeout',
-    maxDocs: 'max_docs',
-    _sourceExcludes: '_source_excludes',
     _sourceExclude: '_source_exclude',
-    _sourceIncludes: '_source_includes',
     _sourceInclude: '_source_include',
     terminateAfter: 'terminate_after',
     requestCache: 'request_cache',
@@ -76,11 +125,6 @@ function buildDeleteByQuery (opts) {
     filterPath: 'filter_path'
   }
 
-  /**
-   * Perform a delete_by_query request
-   * Deletes documents matching the provided query.
-   * https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-delete-by-query.html
-   */
   return function deleteByQuery (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
@@ -115,22 +159,24 @@ function buildDeleteByQuery (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = []
-    var { method, body, index, type, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
+    var warnings = null
+    var { method, body, index, type } = params
+    var querystring = semicopy(params, ['method', 'body', 'index', 'type'])
 
-    var ignore = options.ignore
+    if (method == null) {
+      method = 'POST'
+    }
+
+    var ignore = options.ignore || null
     if (typeof ignore === 'number') {
-      options.ignore = [ignore]
+      ignore = [ignore]
     }
 
     var path = ''
 
     if ((index) != null && (type) != null) {
-      if (method == null) method = 'POST'
       path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type) + '/' + '_delete_by_query'
     } else {
-      if (method == null) method = 'POST'
       path = '/' + encodeURIComponent(index) + '/' + '_delete_by_query'
     }
 
@@ -142,8 +188,34 @@ function buildDeleteByQuery (opts) {
       querystring
     }
 
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
+    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
+    }
   }
 }
 

api/api/delete_by_query_rethrottle.js

@@ -1,89 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
-
-'use strict'
-
-/* eslint camelcase: 0 */
-/* eslint no-unused-vars: 0 */
-
-function buildDeleteByQueryRethrottle (opts) {
-  // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
-
-  const acceptedQuerystring = [
-    'requests_per_second',
-    'pretty',
-    'human',
-    'error_trace',
-    'source',
-    'filter_path'
-  ]
-
-  const snakeCase = {
-    requestsPerSecond: 'requests_per_second',
-    errorTrace: 'error_trace',
-    filterPath: 'filter_path'
-  }
-
-  /**
-   * Perform a delete_by_query_rethrottle request
-   * Changes the number of requests per second for a particular Delete By Query operation.
-   * https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-delete-by-query.html
-   */
-  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)
-    }
-
-    // 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, taskId, task_id, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
-
-    var ignore = options.ignore
-    if (typeof ignore === 'number') {
-      options.ignore = [ignore]
-    }
-
-    var path = ''
-
-    if (method == null) method = 'POST'
-    path = '/' + '_delete_by_query' + '/' + encodeURIComponent(task_id || taskId) + '/' + '_rethrottle'
-
-    // build request object
-    const request = {
-      method,
-      path,
-      body: body || '',
-      querystring
-    }
-
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
-  }
-}
-
-module.exports = buildDeleteByQueryRethrottle

api/api/delete_script.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * 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'
 
@@ -9,7 +24,15 @@
 
 function buildDeleteScript (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  const { makeRequest, ConfigurationError, handleError } = opts
+  /**
+   * 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
+   */
 
   const acceptedQuerystring = [
     'timeout',
@@ -27,11 +50,6 @@ function buildDeleteScript (opts) {
     filterPath: 'filter_path'
   }
 
-  /**
-   * Perform a delete_script request
-   * Deletes a script.
-   * https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-scripting.html
-   */
   return function deleteScript (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
@@ -49,6 +67,20 @@ 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') {
@@ -56,30 +88,63 @@ function buildDeleteScript (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = []
-    var { method, body, id, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
+    var warnings = null
+    var { method, body, id, lang } = params
+    var querystring = semicopy(params, ['method', 'body', 'id', 'lang'])
 
-    var ignore = options.ignore
+    if (method == null) {
+      method = 'DELETE'
+    }
+
+    var ignore = options.ignore || null
     if (typeof ignore === 'number') {
-      options.ignore = [ignore]
+      ignore = [ignore]
     }
 
     var path = ''
 
-    if (method == null) method = 'DELETE'
-    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 = {
       method,
       path,
-      body: body || '',
+      body: '',
       querystring
     }
 
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
+    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
+    }
   }
 }
 

api/api/delete_template.js

@@ -0,0 +1,131 @@
+/*
+ * 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 buildDeleteTemplate (opts) {
+  // eslint-disable-next-line no-unused-vars
+  const { makeRequest, ConfigurationError, handleError } = opts
+  /**
+   * 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 deleteTemplate (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['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)
+    }
+
+    // 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, id } = params
+    var querystring = semicopy(params, ['method', 'body', 'id'])
+
+    if (method == null) {
+      method = 'DELETE'
+    }
+
+    var ignore = options.ignore || null
+    if (typeof ignore === 'number') {
+      ignore = [ignore]
+    }
+
+    var path = ''
+
+    path = '/' + '_search' + '/' + 'template' + '/' + encodeURIComponent(id)
+
+    // 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 = buildDeleteTemplate

api/api/exists.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * 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'
 
@@ -9,18 +24,35 @@
 
 function buildExists (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  const { makeRequest, ConfigurationError, handleError } = opts
+  /**
+   * 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
+   * @param {string} type - The type of the document (use `_all` to fetch the first document matching the ID across all types)
+   * @param {list} stored_fields - A comma-separated list of stored fields to return in the response
+   * @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_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
+   * @param {enum} version_type - Specific version type
+   */
 
   const acceptedQuerystring = [
     'stored_fields',
+    'parent',
     'preference',
     'realtime',
     'refresh',
     'routing',
     '_source',
-    '_source_excludes',
     '_source_exclude',
-    '_source_includes',
     '_source_include',
     'version',
     'version_type',
@@ -33,20 +65,13 @@ 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'
   }
 
-  /**
-   * Perform a exists request
-   * Returns information about whether a document exists in an index.
-   * https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-get.html
-   */
   return function exists (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
@@ -68,6 +93,14 @@ 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)
+    }
 
     // validate headers object
     if (options.headers != null && typeof options.headers !== 'object') {
@@ -75,24 +108,22 @@ function buildExists (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = []
-    var { method, body, id, index, type, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
+    var warnings = null
+    var { method, body, id, index, type } = params
+    var querystring = semicopy(params, ['method', 'body', 'id', 'index', 'type'])
 
-    var ignore = options.ignore
+    if (method == null) {
+      method = 'HEAD'
+    }
+
+    var ignore = options.ignore || null
     if (typeof ignore === 'number') {
-      options.ignore = [ignore]
+      ignore = [ignore]
     }
 
     var path = ''
 
-    if ((index) != null && (type) != null && (id) != null) {
-      if (method == null) method = 'HEAD'
-      path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type) + '/' + encodeURIComponent(id)
-    } else {
-      if (method == null) method = 'HEAD'
-      path = '/' + encodeURIComponent(index) + '/' + '_doc' + '/' + encodeURIComponent(id)
-    }
+    path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type) + '/' + encodeURIComponent(id)
 
     // build request object
     const request = {
@@ -102,8 +133,34 @@ function buildExists (opts) {
       querystring
     }
 
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
+    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
+    }
   }
 }
 

api/api/exists_source.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * 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'
 
@@ -9,17 +24,33 @@
 
 function buildExistsSource (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  const { makeRequest, ConfigurationError, handleError } = 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; 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_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
+   * @param {enum} version_type - Specific version type
+   */
 
   const acceptedQuerystring = [
+    'parent',
     'preference',
     'realtime',
     'refresh',
     'routing',
     '_source',
-    '_source_excludes',
     '_source_exclude',
-    '_source_includes',
     '_source_include',
     'version',
     'version_type',
@@ -31,20 +62,13 @@ 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'
   }
 
-  /**
-   * Perform a exists_source request
-   * Returns information about whether a document source exists in an index.
-   * https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-get.html
-   */
   return function existsSource (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
@@ -66,6 +90,14 @@ 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)
+    }
 
     // check required url components
     if (params['id'] != null && (params['type'] == null || params['index'] == null)) {
@@ -82,24 +114,22 @@ function buildExistsSource (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = []
-    var { method, body, id, index, type, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
+    var warnings = null
+    var { method, body, id, index, type } = params
+    var querystring = semicopy(params, ['method', 'body', 'id', 'index', 'type'])
 
-    var ignore = options.ignore
+    if (method == null) {
+      method = 'HEAD'
+    }
+
+    var ignore = options.ignore || null
     if (typeof ignore === 'number') {
-      options.ignore = [ignore]
+      ignore = [ignore]
     }
 
     var path = ''
 
-    if ((index) != null && (type) != null && (id) != null) {
-      if (method == null) method = 'HEAD'
-      path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type) + '/' + encodeURIComponent(id) + '/' + '_source'
-    } else {
-      if (method == null) method = 'HEAD'
-      path = '/' + encodeURIComponent(index) + '/' + '_source' + '/' + encodeURIComponent(id)
-    }
+    path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type) + '/' + encodeURIComponent(id) + '/' + '_source'
 
     // build request object
     const request = {
@@ -109,8 +139,34 @@ function buildExistsSource (opts) {
       querystring
     }
 
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
+    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
+    }
   }
 }
 

api/api/explain.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * 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'
 
@@ -9,7 +24,28 @@
 
 function buildExplain (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  const { makeRequest, ConfigurationError, handleError } = opts
+  /**
+   * 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
+   * @param {string} type - The type of the document
+   * @param {boolean} analyze_wildcard - Specify whether wildcards and prefix queries in the query string query should be analyzed (default: false)
+   * @param {string} analyzer - The analyzer for the query string query
+   * @param {enum} default_operator - The default operator for query string query (AND or OR)
+   * @param {string} df - The default field for query string query (default: _all)
+   * @param {list} stored_fields - A comma-separated list of stored fields to return in the response
+   * @param {boolean} lenient - Specify whether format-based query failures (such as providing text to a numeric field) should be ignored
+   * @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 {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_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 {object} body - The query definition using the Query DSL
+   */
 
   const acceptedQuerystring = [
     'analyze_wildcard',
@@ -18,13 +54,12 @@ function buildExplain (opts) {
     'df',
     'stored_fields',
     'lenient',
+    'parent',
     'preference',
     'q',
     'routing',
     '_source',
-    '_source_excludes',
     '_source_exclude',
-    '_source_includes',
     '_source_include',
     'pretty',
     'human',
@@ -37,19 +72,12 @@ 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'
   }
 
-  /**
-   * Perform a explain request
-   * Returns information about why a specific matches (or doesn't match) a query.
-   * https://www.elastic.co/guide/en/elasticsearch/reference/master/search-explain.html
-   */
   return function explain (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
@@ -71,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') {
@@ -78,24 +110,22 @@ function buildExplain (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = []
-    var { method, body, id, index, type, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
+    var warnings = null
+    var { method, body, id, index, type } = params
+    var querystring = semicopy(params, ['method', 'body', 'id', 'index', 'type'])
 
-    var ignore = options.ignore
+    if (method == null) {
+      method = body == null ? 'GET' : 'POST'
+    }
+
+    var ignore = options.ignore || null
     if (typeof ignore === 'number') {
-      options.ignore = [ignore]
+      ignore = [ignore]
     }
 
     var path = ''
 
-    if ((index) != null && (type) != null && (id) != null) {
-      if (method == null) method = body == null ? 'GET' : 'POST'
-      path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type) + '/' + encodeURIComponent(id) + '/' + '_explain'
-    } else {
-      if (method == null) method = body == null ? 'GET' : 'POST'
-      path = '/' + encodeURIComponent(index) + '/' + '_explain' + '/' + encodeURIComponent(id)
-    }
+    path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type) + '/' + encodeURIComponent(id) + '/' + '_explain'
 
     // build request object
     const request = {
@@ -105,8 +135,34 @@ function buildExplain (opts) {
       querystring
     }
 
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
+    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
+    }
   }
 }
 

api/api/field_caps.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * 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'
 
@@ -9,14 +24,23 @@
 
 function buildFieldCaps (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  const { makeRequest, ConfigurationError, handleError } = opts
+  /**
+   * 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 = [
     'fields',
     'ignore_unavailable',
     'allow_no_indices',
     'expand_wildcards',
-    'include_unmapped',
     'pretty',
     'human',
     'error_trace',
@@ -28,16 +52,10 @@ function buildFieldCaps (opts) {
     ignoreUnavailable: 'ignore_unavailable',
     allowNoIndices: 'allow_no_indices',
     expandWildcards: 'expand_wildcards',
-    includeUnmapped: 'include_unmapped',
     errorTrace: 'error_trace',
     filterPath: 'filter_path'
   }
 
-  /**
-   * Perform a field_caps request
-   * Returns the information about the capabilities of fields among multiple indices.
-   * https://www.elastic.co/guide/en/elasticsearch/reference/master/search-field-caps.html
-   */
   return function fieldCaps (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
@@ -56,22 +74,24 @@ function buildFieldCaps (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = []
-    var { method, body, index, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
+    var warnings = null
+    var { method, body, index } = params
+    var querystring = semicopy(params, ['method', 'body', 'index'])
 
-    var ignore = options.ignore
+    if (method == null) {
+      method = body == null ? 'GET' : 'POST'
+    }
+
+    var ignore = options.ignore || null
     if (typeof ignore === 'number') {
-      options.ignore = [ignore]
+      ignore = [ignore]
     }
 
     var path = ''
 
     if ((index) != null) {
-      if (method == null) method = body == null ? 'GET' : 'POST'
       path = '/' + encodeURIComponent(index) + '/' + '_field_caps'
     } else {
-      if (method == null) method = body == null ? 'GET' : 'POST'
       path = '/' + '_field_caps'
     }
 
@@ -83,8 +103,34 @@ function buildFieldCaps (opts) {
       querystring
     }
 
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
+    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
+    }
   }
 }
 

api/api/field_stats.js

@@ -0,0 +1,139 @@
+/*
+ * 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 buildFieldStats (opts) {
+  // eslint-disable-next-line no-unused-vars
+  const { makeRequest, ConfigurationError, handleError } = opts
+  /**
+   * 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 {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',
+    'pretty',
+    'human',
+    'error_trace',
+    'source',
+    'filter_path'
+  ]
+
+  const snakeCase = {
+    ignoreUnavailable: 'ignore_unavailable',
+    allowNoIndices: 'allow_no_indices',
+    expandWildcards: 'expand_wildcards',
+    errorTrace: 'error_trace',
+    filterPath: 'filter_path'
+  }
+
+  return function fieldStats (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 = body == null ? 'GET' : 'POST'
+    }
+
+    var ignore = options.ignore || null
+    if (typeof ignore === 'number') {
+      ignore = [ignore]
+    }
+
+    var path = ''
+
+    if ((index) != null) {
+      path = '/' + encodeURIComponent(index) + '/' + '_field_stats'
+    } else {
+      path = '/' + '_field_stats'
+    }
+
+    // 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 = buildFieldStats

api/api/get.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * 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'
 
@@ -9,18 +24,35 @@
 
 function buildGet (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  const { makeRequest, ConfigurationError, handleError } = opts
+  /**
+   * 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
+   * @param {string} type - The type of the document (use `_all` to fetch the first document matching the ID across all types)
+   * @param {list} stored_fields - A comma-separated list of stored fields to return in the response
+   * @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_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
+   * @param {enum} version_type - Specific version type
+   */
 
   const acceptedQuerystring = [
     'stored_fields',
+    'parent',
     'preference',
     'realtime',
     'refresh',
     'routing',
     '_source',
-    '_source_excludes',
     '_source_exclude',
-    '_source_includes',
     '_source_include',
     'version',
     'version_type',
@@ -33,20 +65,13 @@ function buildGet (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'
   }
 
-  /**
-   * Perform a get request
-   * Returns a document.
-   * https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-get.html
-   */
   return function get (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
@@ -68,6 +93,14 @@ 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)
+    }
 
     // validate headers object
     if (options.headers != null && typeof options.headers !== 'object') {
@@ -75,24 +108,22 @@ function buildGet (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = []
-    var { method, body, id, index, type, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
+    var warnings = null
+    var { method, body, id, index, type } = params
+    var querystring = semicopy(params, ['method', 'body', 'id', 'index', 'type'])
 
-    var ignore = options.ignore
+    if (method == null) {
+      method = 'GET'
+    }
+
+    var ignore = options.ignore || null
     if (typeof ignore === 'number') {
-      options.ignore = [ignore]
+      ignore = [ignore]
     }
 
     var path = ''
 
-    if ((index) != null && (type) != null && (id) != null) {
-      if (method == null) method = 'GET'
-      path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type) + '/' + encodeURIComponent(id)
-    } else {
-      if (method == null) method = 'GET'
-      path = '/' + encodeURIComponent(index) + '/' + '_doc' + '/' + encodeURIComponent(id)
-    }
+    path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type) + '/' + encodeURIComponent(id)
 
     // build request object
     const request = {
@@ -102,8 +133,34 @@ function buildGet (opts) {
       querystring
     }
 
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
+    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
+    }
   }
 }
 

api/api/get_script.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * 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'
 
@@ -9,10 +24,15 @@
 
 function buildGetScript (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  const { makeRequest, ConfigurationError, handleError } = opts
+  /**
+   * Perform a [get_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
+   */
 
   const acceptedQuerystring = [
-    'master_timeout',
     'pretty',
     'human',
     'error_trace',
@@ -21,16 +41,10 @@ function buildGetScript (opts) {
   ]
 
   const snakeCase = {
-    masterTimeout: 'master_timeout',
     errorTrace: 'error_trace',
     filterPath: 'filter_path'
   }
 
-  /**
-   * Perform a get_script request
-   * Returns a script.
-   * https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-scripting.html
-   */
   return function getScript (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
@@ -48,6 +62,20 @@ 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') {
@@ -55,19 +83,26 @@ function buildGetScript (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = []
-    var { method, body, id, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
+    var warnings = null
+    var { method, body, id, lang } = params
+    var querystring = semicopy(params, ['method', 'body', 'id', 'lang'])
 
-    var ignore = options.ignore
+    if (method == null) {
+      method = 'GET'
+    }
+
+    var ignore = options.ignore || null
     if (typeof ignore === 'number') {
-      options.ignore = [ignore]
+      ignore = [ignore]
     }
 
     var path = ''
 
-    if (method == null) method = 'GET'
-    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 = {
@@ -77,8 +112,34 @@ function buildGetScript (opts) {
       querystring
     }
 
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
+    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
+    }
   }
 }
 

api/api/get_source.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * 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'
 
@@ -9,17 +24,33 @@
 
 function buildGetSource (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  const { makeRequest, ConfigurationError, handleError } = opts
+  /**
+   * 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; 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_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
+   * @param {enum} version_type - Specific version type
+   */
 
   const acceptedQuerystring = [
+    'parent',
     'preference',
     'realtime',
     'refresh',
     'routing',
     '_source',
-    '_source_excludes',
     '_source_exclude',
-    '_source_includes',
     '_source_include',
     'version',
     'version_type',
@@ -31,20 +62,13 @@ 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'
   }
 
-  /**
-   * Perform a get_source request
-   * Returns the source of a document.
-   * https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-get.html
-   */
   return function getSource (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
@@ -66,6 +90,14 @@ 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)
+    }
 
     // validate headers object
     if (options.headers != null && typeof options.headers !== 'object') {
@@ -73,24 +105,22 @@ function buildGetSource (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = []
-    var { method, body, id, index, type, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
+    var warnings = null
+    var { method, body, id, index, type } = params
+    var querystring = semicopy(params, ['method', 'body', 'id', 'index', 'type'])
 
-    var ignore = options.ignore
+    if (method == null) {
+      method = 'GET'
+    }
+
+    var ignore = options.ignore || null
     if (typeof ignore === 'number') {
-      options.ignore = [ignore]
+      ignore = [ignore]
     }
 
     var path = ''
 
-    if ((index) != null && (type) != null && (id) != null) {
-      if (method == null) method = 'GET'
-      path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type) + '/' + encodeURIComponent(id) + '/' + '_source'
-    } else {
-      if (method == null) method = 'GET'
-      path = '/' + encodeURIComponent(index) + '/' + '_source' + '/' + encodeURIComponent(id)
-    }
+    path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type) + '/' + encodeURIComponent(id) + '/' + '_source'
 
     // build request object
     const request = {
@@ -100,8 +130,34 @@ function buildGetSource (opts) {
       querystring
     }
 
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
+    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
+    }
   }
 }
 

api/api/get_template.js

@@ -0,0 +1,131 @@
+/*
+ * 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 buildGetTemplate (opts) {
+  // eslint-disable-next-line no-unused-vars
+  const { makeRequest, ConfigurationError, handleError } = opts
+  /**
+   * 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 getTemplate (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['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)
+    }
+
+    // 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, id } = params
+    var querystring = semicopy(params, ['method', 'body', 'id'])
+
+    if (method == null) {
+      method = 'GET'
+    }
+
+    var ignore = options.ignore || null
+    if (typeof ignore === 'number') {
+      ignore = [ignore]
+    }
+
+    var path = ''
+
+    path = '/' + '_search' + '/' + 'template' + '/' + encodeURIComponent(id)
+
+    // 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 = buildGetTemplate

api/api/graph.explore.js

@@ -1,89 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
-
-'use strict'
-
-/* eslint camelcase: 0 */
-/* eslint no-unused-vars: 0 */
-
-function buildGraphExplore (opts) {
-  // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
-
-  const acceptedQuerystring = [
-    'routing',
-    'timeout'
-  ]
-
-  const snakeCase = {
-
-  }
-
-  /**
-   * Perform a graph.explore request
-   * https://www.elastic.co/guide/en/elasticsearch/reference/current/graph-explore-api.html
-   */
-  return function graphExplore (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)
-    }
-
-    // check required url components
-    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, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
-
-    var ignore = options.ignore
-    if (typeof ignore === 'number') {
-      options.ignore = [ignore]
-    }
-
-    var path = ''
-
-    if ((index) != null && (type) != null) {
-      if (method == null) method = body == null ? 'GET' : 'POST'
-      path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type) + '/' + '_graph' + '/' + 'explore'
-    } else {
-      if (method == null) method = body == null ? 'GET' : 'POST'
-      path = '/' + encodeURIComponent(index) + '/' + '_graph' + '/' + 'explore'
-    }
-
-    // build request object
-    const request = {
-      method,
-      path,
-      body: body || '',
-      querystring
-    }
-
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
-  }
-}
-
-module.exports = buildGraphExplore

api/api/ilm.delete_lifecycle.js

@@ -1,77 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
-
-'use strict'
-
-/* eslint camelcase: 0 */
-/* eslint no-unused-vars: 0 */
-
-function buildIlmDeleteLifecycle (opts) {
-  // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
-
-  const acceptedQuerystring = [
-
-  ]
-
-  const snakeCase = {
-
-  }
-
-  /**
-   * Perform a ilm.delete_lifecycle request
-   * https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-delete-lifecycle.html
-   */
-  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['policy'] == null) {
-      const err = new ConfigurationError('Missing required parameter: policy')
-      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, policy, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
-
-    var ignore = options.ignore
-    if (typeof ignore === 'number') {
-      options.ignore = [ignore]
-    }
-
-    var path = ''
-
-    if (method == null) method = 'DELETE'
-    path = '/' + '_ilm' + '/' + 'policy' + '/' + encodeURIComponent(policy)
-
-    // build request object
-    const request = {
-      method,
-      path,
-      body: body || '',
-      querystring
-    }
-
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
-  }
-}
-
-module.exports = buildIlmDeleteLifecycle

api/api/ilm.explain_lifecycle.js

@@ -1,79 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
-
-'use strict'
-
-/* eslint camelcase: 0 */
-/* eslint no-unused-vars: 0 */
-
-function buildIlmExplainLifecycle (opts) {
-  // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
-
-  const acceptedQuerystring = [
-    'only_managed',
-    'only_errors'
-  ]
-
-  const snakeCase = {
-    onlyManaged: 'only_managed',
-    onlyErrors: 'only_errors'
-  }
-
-  /**
-   * Perform a ilm.explain_lifecycle request
-   * https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-explain-lifecycle.html
-   */
-  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['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 = []
-    var { method, body, index, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
-
-    var ignore = options.ignore
-    if (typeof ignore === 'number') {
-      options.ignore = [ignore]
-    }
-
-    var path = ''
-
-    if (method == null) method = 'GET'
-    path = '/' + encodeURIComponent(index) + '/' + '_ilm' + '/' + 'explain'
-
-    // build request object
-    const request = {
-      method,
-      path,
-      body: null,
-      querystring
-    }
-
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
-  }
-}
-
-module.exports = buildIlmExplainLifecycle

api/api/ilm.get_lifecycle.js

@@ -1,76 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
-
-'use strict'
-
-/* eslint camelcase: 0 */
-/* eslint no-unused-vars: 0 */
-
-function buildIlmGetLifecycle (opts) {
-  // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
-
-  const acceptedQuerystring = [
-
-  ]
-
-  const snakeCase = {
-
-  }
-
-  /**
-   * Perform a ilm.get_lifecycle request
-   * https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-get-lifecycle.html
-   */
-  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 = {}
-    }
-
-    // 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, policy, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
-
-    var ignore = options.ignore
-    if (typeof ignore === 'number') {
-      options.ignore = [ignore]
-    }
-
-    var path = ''
-
-    if ((policy) != null) {
-      if (method == null) method = 'GET'
-      path = '/' + '_ilm' + '/' + 'policy' + '/' + encodeURIComponent(policy)
-    } else {
-      if (method == null) method = 'GET'
-      path = '/' + '_ilm' + '/' + 'policy'
-    }
-
-    // build request object
-    const request = {
-      method,
-      path,
-      body: null,
-      querystring
-    }
-
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
-  }
-}
-
-module.exports = buildIlmGetLifecycle

api/api/ilm.get_status.js

@@ -1,71 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
-
-'use strict'
-
-/* eslint camelcase: 0 */
-/* eslint no-unused-vars: 0 */
-
-function buildIlmGetStatus (opts) {
-  // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
-
-  const acceptedQuerystring = [
-
-  ]
-
-  const snakeCase = {
-
-  }
-
-  /**
-   * Perform a ilm.get_status request
-   * https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-get-status.html
-   */
-  return function ilmGetStatus (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 = []
-    var { method, body, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
-
-    var ignore = options.ignore
-    if (typeof ignore === 'number') {
-      options.ignore = [ignore]
-    }
-
-    var path = ''
-
-    if (method == null) method = 'GET'
-    path = '/' + '_ilm' + '/' + 'status'
-
-    // build request object
-    const request = {
-      method,
-      path,
-      body: null,
-      querystring
-    }
-
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
-  }
-}
-
-module.exports = buildIlmGetStatus

api/api/ilm.move_to_step.js

@@ -1,77 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
-
-'use strict'
-
-/* eslint camelcase: 0 */
-/* eslint no-unused-vars: 0 */
-
-function buildIlmMoveToStep (opts) {
-  // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
-
-  const acceptedQuerystring = [
-
-  ]
-
-  const snakeCase = {
-
-  }
-
-  /**
-   * Perform a ilm.move_to_step request
-   * https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-move-to-step.html
-   */
-  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 = {}
-    }
-
-    // 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 = []
-    var { method, body, index, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
-
-    var ignore = options.ignore
-    if (typeof ignore === 'number') {
-      options.ignore = [ignore]
-    }
-
-    var path = ''
-
-    if (method == null) method = 'POST'
-    path = '/' + '_ilm' + '/' + 'move' + '/' + encodeURIComponent(index)
-
-    // build request object
-    const request = {
-      method,
-      path,
-      body: body || '',
-      querystring
-    }
-
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
-  }
-}
-
-module.exports = buildIlmMoveToStep

api/api/ilm.put_lifecycle.js

@@ -1,77 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
-
-'use strict'
-
-/* eslint camelcase: 0 */
-/* eslint no-unused-vars: 0 */
-
-function buildIlmPutLifecycle (opts) {
-  // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
-
-  const acceptedQuerystring = [
-
-  ]
-
-  const snakeCase = {
-
-  }
-
-  /**
-   * Perform a ilm.put_lifecycle request
-   * https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-put-lifecycle.html
-   */
-  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 = {}
-    }
-
-    // check required parameters
-    if (params['policy'] == null) {
-      const err = new ConfigurationError('Missing required parameter: policy')
-      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, policy, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
-
-    var ignore = options.ignore
-    if (typeof ignore === 'number') {
-      options.ignore = [ignore]
-    }
-
-    var path = ''
-
-    if (method == null) method = 'PUT'
-    path = '/' + '_ilm' + '/' + 'policy' + '/' + encodeURIComponent(policy)
-
-    // build request object
-    const request = {
-      method,
-      path,
-      body: body || '',
-      querystring
-    }
-
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
-  }
-}
-
-module.exports = buildIlmPutLifecycle

api/api/ilm.remove_policy.js

@@ -1,77 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
-
-'use strict'
-
-/* eslint camelcase: 0 */
-/* eslint no-unused-vars: 0 */
-
-function buildIlmRemovePolicy (opts) {
-  // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
-
-  const acceptedQuerystring = [
-
-  ]
-
-  const snakeCase = {
-
-  }
-
-  /**
-   * Perform a ilm.remove_policy request
-   * https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-remove-policy.html
-   */
-  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['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 = []
-    var { method, body, index, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
-
-    var ignore = options.ignore
-    if (typeof ignore === 'number') {
-      options.ignore = [ignore]
-    }
-
-    var path = ''
-
-    if (method == null) method = 'POST'
-    path = '/' + encodeURIComponent(index) + '/' + '_ilm' + '/' + 'remove'
-
-    // build request object
-    const request = {
-      method,
-      path,
-      body: body || '',
-      querystring
-    }
-
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
-  }
-}
-
-module.exports = buildIlmRemovePolicy

api/api/ilm.retry.js

@@ -1,77 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
-
-'use strict'
-
-/* eslint camelcase: 0 */
-/* eslint no-unused-vars: 0 */
-
-function buildIlmRetry (opts) {
-  // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
-
-  const acceptedQuerystring = [
-
-  ]
-
-  const snakeCase = {
-
-  }
-
-  /**
-   * Perform a ilm.retry request
-   * https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-retry-policy.html
-   */
-  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['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 = []
-    var { method, body, index, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
-
-    var ignore = options.ignore
-    if (typeof ignore === 'number') {
-      options.ignore = [ignore]
-    }
-
-    var path = ''
-
-    if (method == null) method = 'POST'
-    path = '/' + encodeURIComponent(index) + '/' + '_ilm' + '/' + 'retry'
-
-    // build request object
-    const request = {
-      method,
-      path,
-      body: body || '',
-      querystring
-    }
-
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
-  }
-}
-
-module.exports = buildIlmRetry

api/api/ilm.start.js

@@ -1,71 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
-
-'use strict'
-
-/* eslint camelcase: 0 */
-/* eslint no-unused-vars: 0 */
-
-function buildIlmStart (opts) {
-  // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
-
-  const acceptedQuerystring = [
-
-  ]
-
-  const snakeCase = {
-
-  }
-
-  /**
-   * Perform a ilm.start request
-   * https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-start.html
-   */
-  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 = {}
-    }
-
-    // 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, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
-
-    var ignore = options.ignore
-    if (typeof ignore === 'number') {
-      options.ignore = [ignore]
-    }
-
-    var path = ''
-
-    if (method == null) method = 'POST'
-    path = '/' + '_ilm' + '/' + 'start'
-
-    // build request object
-    const request = {
-      method,
-      path,
-      body: body || '',
-      querystring
-    }
-
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
-  }
-}
-
-module.exports = buildIlmStart

api/api/ilm.stop.js

@@ -1,71 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
-
-'use strict'
-
-/* eslint camelcase: 0 */
-/* eslint no-unused-vars: 0 */
-
-function buildIlmStop (opts) {
-  // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
-
-  const acceptedQuerystring = [
-
-  ]
-
-  const snakeCase = {
-
-  }
-
-  /**
-   * Perform a ilm.stop request
-   * https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-stop.html
-   */
-  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 = {}
-    }
-
-    // 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, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
-
-    var ignore = options.ignore
-    if (typeof ignore === 'number') {
-      options.ignore = [ignore]
-    }
-
-    var path = ''
-
-    if (method == null) method = 'POST'
-    path = '/' + '_ilm' + '/' + 'stop'
-
-    // build request object
-    const request = {
-      method,
-      path,
-      body: body || '',
-      querystring
-    }
-
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
-  }
-}
-
-module.exports = buildIlmStop

api/api/index.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * 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'
 
@@ -9,18 +24,38 @@
 
 function buildIndex (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  const { makeRequest, ConfigurationError, handleError } = opts
+  /**
+   * 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
+   * @param {string} type - The type of the document
+   * @param {string} wait_for_active_shards - Sets the number of shard copies that must be active before proceeding with the index 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 {enum} op_type - Explicit operation type
+   * @param {string} parent - ID of the parent document
+   * @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
+   * @param {object} body - The document
+   */
 
   const acceptedQuerystring = [
     'wait_for_active_shards',
     'op_type',
+    'parent',
     'refresh',
     'routing',
     'timeout',
+    'timestamp',
+    'ttl',
     'version',
     'version_type',
-    'if_seq_no',
-    'if_primary_term',
     'pipeline',
     'pretty',
     'human',
@@ -33,17 +68,10 @@ 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'
   }
 
-  /**
-   * Perform a index request
-   * Creates or updates a document in an index.
-   * https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-index_.html
-   */
   return function _index (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
@@ -61,40 +89,49 @@ 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['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, id, index, type, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
+    var warnings = null
+    var { method, body, id, index, type } = params
+    var querystring = semicopy(params, ['method', 'body', 'id', 'index', 'type'])
 
-    var ignore = options.ignore
+    if (method == null) {
+      method = 'POST'
+    }
+
+    var ignore = options.ignore || null
     if (typeof ignore === 'number') {
-      options.ignore = [ignore]
+      ignore = [ignore]
     }
 
     var path = ''
 
     if ((index) != null && (type) != null && (id) != null) {
-      if (method == null) method = 'POST'
       path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type) + '/' + encodeURIComponent(id)
-    } else if ((index) != null && (id) != null) {
-      if (method == null) method = 'POST'
-      path = '/' + encodeURIComponent(index) + '/' + '_doc' + '/' + encodeURIComponent(id)
-    } else if ((index) != null && (type) != null) {
-      if (method == null) method = 'POST'
-      path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type)
     } else {
-      if (method == null) method = 'POST'
-      path = '/' + encodeURIComponent(index) + '/' + '_doc'
+      path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type)
     }
 
     // build request object
@@ -105,8 +142,34 @@ function buildIndex (opts) {
       querystring
     }
 
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
+    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
+    }
   }
 }
 

api/api/indices.analyze.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * 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'
 
@@ -9,10 +24,37 @@
 
 function buildIndicesAnalyze (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  const { makeRequest, ConfigurationError, handleError } = opts
+  /**
+   * 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 {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',
@@ -21,15 +63,12 @@ function buildIndicesAnalyze (opts) {
   ]
 
   const snakeCase = {
+    charFilter: 'char_filter',
+    preferLocal: 'prefer_local',
     errorTrace: 'error_trace',
     filterPath: 'filter_path'
   }
 
-  /**
-   * Perform a indices.analyze request
-   * Performs the analysis process on a text and return the tokens breakdown of the text.
-   * https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-analyze.html
-   */
   return function indicesAnalyze (params, options, callback) {
     options = options || {}
     if (typeof options === 'function') {
@@ -48,22 +87,24 @@ function buildIndicesAnalyze (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = []
-    var { method, body, index, ...querystring } = params
-    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
+    var warnings = null
+    var { method, body, index } = params
+    var querystring = semicopy(params, ['method', 'body', 'index'])
 
-    var ignore = options.ignore
+    if (method == null) {
+      method = body == null ? 'GET' : 'POST'
+    }
+
+    var ignore = options.ignore || null
     if (typeof ignore === 'number') {
-      options.ignore = [ignore]
+      ignore = [ignore]
     }
 
     var path = ''
 
     if ((index) != null) {
-      if (method == null) method = body == null ? 'GET' : 'POST'
       path = '/' + encodeURIComponent(index) + '/' + '_analyze'
     } else {
-      if (method == null) method = body == null ? 'GET' : 'POST'
       path = '/' + '_analyze'
     }
 
@@ -75,8 +116,34 @@ function buildIndicesAnalyze (opts) {
       querystring
     }
 
-    options.warnings = warnings.length === 0 ? null : warnings
-    return makeRequest(request, options, callback)
+    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
+    }
   }
 }