Bumped v7.2.0

* Remove auth data from inspect and toJSON in connection class

* Updated test

.ci/test-matrix.yml

@@ -1,5 +1,7 @@
 ---
 ELASTICSEARCH_VERSION:
+  - 7.2.0
+  - 7.1.0
   - 7.0.0
 
 NODE_JS_VERSION:

api/api/bulk.js

@@ -50,7 +50,9 @@ function buildBulk (opts) {
     'type',
     '_source',
     '_source_excludes',
+    '_source_exclude',
     '_source_includes',
+    '_source_include',
     'pipeline',
     'pretty',
     'human',
@@ -62,7 +64,9 @@ 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'
   }

api/api/cat.indices.js

@@ -39,6 +39,7 @@ function buildCatIndices (opts) {
    * @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
+   * @param {boolean} include_unloaded_segments - If set to true segment stats will include stats for segments that are not currently loaded into memory
    */
 
   const acceptedQuerystring = [
@@ -52,6 +53,7 @@ function buildCatIndices (opts) {
     'pri',
     's',
     'v',
+    'include_unloaded_segments',
     'pretty',
     'human',
     'error_trace',
@@ -61,6 +63,7 @@ function buildCatIndices (opts) {
 
   const snakeCase = {
     masterTimeout: 'master_timeout',
+    includeUnloadedSegments: 'include_unloaded_segments',
     errorTrace: 'error_trace',
     filterPath: 'filter_path'
   }

api/api/cluster.health.js

@@ -29,6 +29,7 @@ function buildClusterHealth (opts) {
    * Perform a [cluster.health](http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-health.html) request
    *
    * @param {list} index - Limit the information returned to a specific index
+   * @param {enum} expand_wildcards - Whether to expand wildcard expression to concrete indices that are open, closed or both.
    * @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
@@ -42,6 +43,7 @@ function buildClusterHealth (opts) {
    */
 
   const acceptedQuerystring = [
+    'expand_wildcards',
     'level',
     'local',
     'master_timeout',
@@ -60,6 +62,7 @@ function buildClusterHealth (opts) {
   ]
 
   const snakeCase = {
+    expandWildcards: 'expand_wildcards',
     masterTimeout: 'master_timeout',
     waitForActiveShards: 'wait_for_active_shards',
     waitForNodes: 'wait_for_nodes',

api/api/create.js

@@ -32,7 +32,6 @@ function buildCreate (opts) {
    * @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
@@ -44,7 +43,6 @@ function buildCreate (opts) {
 
   const acceptedQuerystring = [
     'wait_for_active_shards',
-    'parent',
     'refresh',
     'routing',
     'timeout',

api/api/data_frame.delete_data_frame_transform.js

@@ -0,0 +1,100 @@
+/*
+ * 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 buildDataFrameDeleteDataFrameTransform (opts) {
+  // eslint-disable-next-line no-unused-vars
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  /**
+   * Perform a [data_frame.delete_data_frame_transform](https://www.elastic.co/guide/en/elasticsearch/reference/current/delete-data-frame-transform.html) request
+   *
+   * @param {string} transform_id - The id of the transform to delete
+   */
+
+  const acceptedQuerystring = [
+
+  ]
+
+  const snakeCase = {
+
+  }
+
+  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)
+    }
+    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, transformId, transform_id, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
+
+    if (method == null) {
+      method = 'DELETE'
+    }
+
+    var ignore = options.ignore
+    if (typeof ignore === 'number') {
+      options.ignore = [ignore]
+    }
+
+    var path = ''
+
+    path = '/' + '_data_frame' + '/' + 'transforms' + '/' + encodeURIComponent(transform_id || transformId)
+
+    // build request object
+    const request = {
+      method,
+      path,
+      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

@@ -0,0 +1,103 @@
+/*
+ * 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 buildDataFrameGetDataFrameTransform (opts) {
+  // eslint-disable-next-line no-unused-vars
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  /**
+   * Perform a [data_frame.get_data_frame_transform](https://www.elastic.co/guide/en/elasticsearch/reference/current/get-data-frame-transform.html) request
+   *
+   * @param {string} transform_id - The id or comma delimited list of id expressions of the transforms to get, '_all' or '*' implies get all transforms
+   * @param {int} from - skips a number of transform configs, defaults to 0
+   * @param {int} size - specifies a max number of transforms to get, defaults to 100
+   */
+
+  const acceptedQuerystring = [
+    'from',
+    'size'
+  ]
+
+  const snakeCase = {
+
+  }
+
+  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 = {}
+    }
+
+    // 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, transformId, transform_id, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
+
+    if (method == null) {
+      method = 'GET'
+    }
+
+    var ignore = options.ignore
+    if (typeof ignore === 'number') {
+      options.ignore = [ignore]
+    }
+
+    var path = ''
+
+    if ((transform_id || transformId) != null) {
+      path = '/' + '_data_frame' + '/' + 'transforms' + '/' + encodeURIComponent(transform_id || transformId)
+    } else {
+      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

@@ -0,0 +1,99 @@
+/*
+ * 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 buildDataFrameGetDataFrameTransformStats (opts) {
+  // eslint-disable-next-line no-unused-vars
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  /**
+   * Perform a [data_frame.get_data_frame_transform_stats](https://www.elastic.co/guide/en/elasticsearch/reference/current/get-data-frame-transform-stats.html) request
+   *
+   * @param {string} transform_id - The id of the transform for which to get stats. '_all' or '*' implies all transforms
+   * @param {number} from - skips a number of transform stats, defaults to 0
+   * @param {number} size - specifies a max number of transform stats to get, defaults to 100
+   */
+
+  const acceptedQuerystring = [
+    'from',
+    'size'
+  ]
+
+  const snakeCase = {
+
+  }
+
+  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.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, transformId, transform_id, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
+
+    if (method == null) {
+      method = 'GET'
+    }
+
+    var ignore = options.ignore
+    if (typeof ignore === 'number') {
+      options.ignore = [ignore]
+    }
+
+    var path = ''
+
+    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

@@ -0,0 +1,96 @@
+/*
+ * 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 buildDataFramePreviewDataFrameTransform (opts) {
+  // eslint-disable-next-line no-unused-vars
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  /**
+   * Perform a [data_frame.preview_data_frame_transform](https://www.elastic.co/guide/en/elasticsearch/reference/current/preview-data-frame-transform.html) request
+   *
+   * @param {object} body - The definition for the data_frame transform to preview
+   */
+
+  const acceptedQuerystring = [
+
+  ]
+
+  const snakeCase = {
+
+  }
+
+  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)
+
+    if (method == null) {
+      method = 'POST'
+    }
+
+    var ignore = options.ignore
+    if (typeof ignore === 'number') {
+      options.ignore = [ignore]
+    }
+
+    var path = ''
+
+    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

@@ -0,0 +1,101 @@
+/*
+ * 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 buildDataFramePutDataFrameTransform (opts) {
+  // eslint-disable-next-line no-unused-vars
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  /**
+   * Perform a [data_frame.put_data_frame_transform](https://www.elastic.co/guide/en/elasticsearch/reference/current/put-data-frame-transform.html) request
+   *
+   * @param {string} transform_id - The id of the new transform.
+   * @param {object} body - The data frame transform definition
+   */
+
+  const acceptedQuerystring = [
+
+  ]
+
+  const snakeCase = {
+
+  }
+
+  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)
+
+    if (method == null) {
+      method = 'PUT'
+    }
+
+    var ignore = options.ignore
+    if (typeof ignore === 'number') {
+      options.ignore = [ignore]
+    }
+
+    var path = ''
+
+    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

@@ -0,0 +1,101 @@
+/*
+ * 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 buildDataFrameStartDataFrameTransform (opts) {
+  // eslint-disable-next-line no-unused-vars
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  /**
+   * Perform a [data_frame.start_data_frame_transform](https://www.elastic.co/guide/en/elasticsearch/reference/current/start-data-frame-transform.html) request
+   *
+   * @param {string} transform_id - The id of the transform to start
+   * @param {time} timeout - Controls the time to wait for the transform to start
+   */
+
+  const acceptedQuerystring = [
+    'timeout'
+  ]
+
+  const snakeCase = {
+
+  }
+
+  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)
+    }
+    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, transformId, transform_id, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
+
+    if (method == null) {
+      method = 'POST'
+    }
+
+    var ignore = options.ignore
+    if (typeof ignore === 'number') {
+      options.ignore = [ignore]
+    }
+
+    var path = ''
+
+    path = '/' + '_data_frame' + '/' + 'transforms' + '/' + encodeURIComponent(transform_id || transformId) + '/' + '_start'
+
+    // build request object
+    const request = {
+      method,
+      path,
+      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

@@ -0,0 +1,104 @@
+/*
+ * 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 buildDataFrameStopDataFrameTransform (opts) {
+  // eslint-disable-next-line no-unused-vars
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  /**
+   * Perform a [data_frame.stop_data_frame_transform](https://www.elastic.co/guide/en/elasticsearch/reference/current/stop-data-frame-transform.html) request
+   *
+   * @param {string} transform_id - The id of the transform to stop
+   * @param {boolean} wait_for_completion - Whether to wait for the transform to fully stop before returning or not. Default to false
+   * @param {time} timeout - Controls the time to wait until the transform has stopped. Default to 30 seconds
+   */
+
+  const acceptedQuerystring = [
+    'wait_for_completion',
+    'timeout'
+  ]
+
+  const snakeCase = {
+    waitForCompletion: 'wait_for_completion'
+
+  }
+
+  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)
+    }
+    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, transformId, transform_id, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
+
+    if (method == null) {
+      method = 'POST'
+    }
+
+    var ignore = options.ignore
+    if (typeof ignore === 'number') {
+      options.ignore = [ignore]
+    }
+
+    var path = ''
+
+    path = '/' + '_data_frame' + '/' + 'transforms' + '/' + encodeURIComponent(transform_id || transformId) + '/' + '_stop'
+
+    // build request object
+    const request = {
+      method,
+      path,
+      body: '',
+      querystring
+    }
+
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
+  }
+}
+
+module.exports = buildDataFrameStopDataFrameTransform

api/api/delete.js

@@ -32,7 +32,6 @@ function buildDelete (opts) {
    * @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
@@ -44,7 +43,6 @@ function buildDelete (opts) {
 
   const acceptedQuerystring = [
     'wait_for_active_shards',
-    'parent',
     'refresh',
     'routing',
     'timeout',

api/api/delete_by_query.js

@@ -86,7 +86,9 @@ function buildDeleteByQuery (opts) {
     'sort',
     '_source',
     '_source_excludes',
+    '_source_exclude',
     '_source_includes',
+    '_source_include',
     'terminate_after',
     'stats',
     'version',
@@ -114,7 +116,9 @@ function buildDeleteByQuery (opts) {
     searchType: 'search_type',
     searchTimeout: 'search_timeout',
     _sourceExcludes: '_source_excludes',
+    _sourceExclude: '_source_exclude',
     _sourceIncludes: '_source_includes',
+    _sourceInclude: '_source_include',
     terminateAfter: 'terminate_after',
     requestCache: 'request_cache',
     waitForActiveShards: 'wait_for_active_shards',

api/api/exists.js

@@ -32,7 +32,6 @@ function buildExists (opts) {
    * @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
@@ -46,14 +45,15 @@ function buildExists (opts) {
 
   const acceptedQuerystring = [
     'stored_fields',
-    'parent',
     'preference',
     'realtime',
     'refresh',
     'routing',
     '_source',
     '_source_excludes',
+    '_source_exclude',
     '_source_includes',
+    '_source_include',
     'version',
     'version_type',
     'pretty',
@@ -66,7 +66,9 @@ 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'

api/api/exists_source.js

@@ -31,7 +31,6 @@ function buildExistsSource (opts) {
    * @param {string} id - The document ID
    * @param {string} index - The name of the index
    * @param {string} type - The type of the document; deprecated and optional starting with 7.0
-   * @param {string} 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
@@ -44,14 +43,15 @@ function buildExistsSource (opts) {
    */
 
   const acceptedQuerystring = [
-    'parent',
     'preference',
     'realtime',
     'refresh',
     'routing',
     '_source',
     '_source_excludes',
+    '_source_exclude',
     '_source_includes',
+    '_source_include',
     'version',
     'version_type',
     'pretty',
@@ -63,7 +63,9 @@ 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'

api/api/explain.js

@@ -37,7 +37,6 @@ function buildExplain (opts) {
    * @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
@@ -54,13 +53,14 @@ function buildExplain (opts) {
     'df',
     'stored_fields',
     'lenient',
-    'parent',
     'preference',
     'q',
     'routing',
     '_source',
     '_source_excludes',
+    '_source_exclude',
     '_source_includes',
+    '_source_include',
     'pretty',
     'human',
     'error_trace',
@@ -73,7 +73,9 @@ function buildExplain (opts) {
     defaultOperator: 'default_operator',
     storedFields: 'stored_fields',
     _sourceExcludes: '_source_excludes',
+    _sourceExclude: '_source_exclude',
     _sourceIncludes: '_source_includes',
+    _sourceInclude: '_source_include',
     errorTrace: 'error_trace',
     filterPath: 'filter_path'
   }

api/api/field_caps.js

@@ -33,6 +33,7 @@ function buildFieldCaps (opts) {
    * @param {boolean} ignore_unavailable - Whether specified concrete indices should be ignored when unavailable (missing or closed)
    * @param {boolean} allow_no_indices - Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)
    * @param {enum} expand_wildcards - Whether to expand wildcard expression to concrete indices that are open, closed or both.
+   * @param {boolean} include_unmapped - Indicates whether unmapped fields should be included in the response.
    */
 
   const acceptedQuerystring = [
@@ -40,6 +41,7 @@ function buildFieldCaps (opts) {
     'ignore_unavailable',
     'allow_no_indices',
     'expand_wildcards',
+    'include_unmapped',
     'pretty',
     'human',
     'error_trace',
@@ -51,6 +53,7 @@ function buildFieldCaps (opts) {
     ignoreUnavailable: 'ignore_unavailable',
     allowNoIndices: 'allow_no_indices',
     expandWildcards: 'expand_wildcards',
+    includeUnmapped: 'include_unmapped',
     errorTrace: 'error_trace',
     filterPath: 'filter_path'
   }

api/api/get.js

@@ -32,7 +32,6 @@ function buildGet (opts) {
    * @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
@@ -40,23 +39,20 @@ function buildGet (opts) {
    * @param {list} _source - True or false to return the _source field or not, or a list of fields to return
    * @param {list} _source_excludes - A list of fields to exclude from the returned _source field
    * @param {list} _source_includes - A list of fields to extract and return from the _source field
-   * @param {list} _source_exclude - A list of fields to exclude from the returned _source field
-   * @param {list} _source_include - A list of fields to extract and return from the _source field
    * @param {number} version - Explicit version number for concurrency control
    * @param {enum} version_type - Specific version type
    */
 
   const acceptedQuerystring = [
     'stored_fields',
-    'parent',
     'preference',
     'realtime',
     'refresh',
     'routing',
     '_source',
     '_source_excludes',
-    '_source_includes',
     '_source_exclude',
+    '_source_includes',
     '_source_include',
     'version',
     'version_type',
@@ -70,8 +66,8 @@ function buildGet (opts) {
   const snakeCase = {
     storedFields: 'stored_fields',
     _sourceExcludes: '_source_excludes',
-    _sourceIncludes: '_source_includes',
     _sourceExclude: '_source_exclude',
+    _sourceIncludes: '_source_includes',
     _sourceInclude: '_source_include',
     versionType: 'version_type',
     errorTrace: 'error_trace',

api/api/get_source.js

@@ -31,7 +31,6 @@ function buildGetSource (opts) {
    * @param {string} id - The document ID
    * @param {string} index - The name of the index
    * @param {string} type - The type of the document; deprecated and optional starting with 7.0
-   * @param {string} 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
@@ -44,14 +43,15 @@ function buildGetSource (opts) {
    */
 
   const acceptedQuerystring = [
-    'parent',
     'preference',
     'realtime',
     'refresh',
     'routing',
     '_source',
     '_source_excludes',
+    '_source_exclude',
     '_source_includes',
+    '_source_include',
     'version',
     'version_type',
     'pretty',
@@ -63,7 +63,9 @@ 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'

api/api/index.js

@@ -33,7 +33,6 @@ function buildIndex (opts) {
    * @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
@@ -48,7 +47,6 @@ function buildIndex (opts) {
   const acceptedQuerystring = [
     'wait_for_active_shards',
     'op_type',
-    'parent',
     'refresh',
     'routing',
     'timeout',

api/api/indices.close.js

@@ -34,6 +34,7 @@ function buildIndicesClose (opts) {
    * @param {boolean} ignore_unavailable - Whether specified concrete indices should be ignored when unavailable (missing or closed)
    * @param {boolean} allow_no_indices - Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)
    * @param {enum} expand_wildcards - Whether to expand wildcard expression to concrete indices that are open, closed or both.
+   * @param {string} wait_for_active_shards - Sets the number of active shards to wait for before the operation returns.
    */
 
   const acceptedQuerystring = [
@@ -42,6 +43,7 @@ function buildIndicesClose (opts) {
     'ignore_unavailable',
     'allow_no_indices',
     'expand_wildcards',
+    'wait_for_active_shards',
     'pretty',
     'human',
     'error_trace',
@@ -54,6 +56,7 @@ function buildIndicesClose (opts) {
     ignoreUnavailable: 'ignore_unavailable',
     allowNoIndices: 'allow_no_indices',
     expandWildcards: 'expand_wildcards',
+    waitForActiveShards: 'wait_for_active_shards',
     errorTrace: 'error_trace',
     filterPath: 'filter_path'
   }

api/api/indices.put_mapping.js

@@ -110,14 +110,14 @@ function buildIndicesPutMapping (opts) {
       path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type) + '/' + '_mappings'
     } else if ((index) != null && (type) != null) {
       path = '/' + encodeURIComponent(index) + '/' + '_mappings' + '/' + encodeURIComponent(type)
-    } else if ((type) != null) {
-      path = '/' + '_mapping' + '/' + encodeURIComponent(type)
     } else if ((type) != null) {
       path = '/' + '_mappings' + '/' + encodeURIComponent(type)
+    } else if ((type) != null) {
+      path = '/' + '_mapping' + '/' + encodeURIComponent(type)
     } else if ((index) != null) {
-      path = '/' + encodeURIComponent(index) + '/' + '_mappings'
-    } else {
       path = '/' + encodeURIComponent(index) + '/' + '_mapping'
+    } else {
+      path = '/' + encodeURIComponent(index) + '/' + '_mappings'
     }
 
     // build request object

api/api/indices.stats.js

@@ -37,6 +37,9 @@ function buildIndicesStats (opts) {
    * @param {enum} level - Return stats aggregated at cluster, index or shard level
    * @param {list} types - A comma-separated list of document types for the `indexing` index metric
    * @param {boolean} include_segment_file_sizes - Whether to report the aggregated disk usage of each one of the Lucene index files (only applies if segment stats are requested)
+   * @param {boolean} include_unloaded_segments - If set to true segment stats will include stats for segments that are not currently loaded into memory
+   * @param {enum} expand_wildcards - Whether to expand wildcard expression to concrete indices that are open, closed or both.
+   * @param {boolean} forbid_closed_indices - If set to false stats will also collected from closed indices if explicitly specified or if expand_wildcards expands to closed indices
    */
 
   const acceptedQuerystring = [
@@ -47,6 +50,9 @@ function buildIndicesStats (opts) {
     'level',
     'types',
     'include_segment_file_sizes',
+    'include_unloaded_segments',
+    'expand_wildcards',
+    'forbid_closed_indices',
     'pretty',
     'human',
     'error_trace',
@@ -58,6 +64,9 @@ function buildIndicesStats (opts) {
     completionFields: 'completion_fields',
     fielddataFields: 'fielddata_fields',
     includeSegmentFileSizes: 'include_segment_file_sizes',
+    includeUnloadedSegments: 'include_unloaded_segments',
+    expandWildcards: 'expand_wildcards',
+    forbidClosedIndices: 'forbid_closed_indices',
     errorTrace: 'error_trace',
     filterPath: 'filter_path'
   }

api/api/mget.js

@@ -49,7 +49,9 @@ function buildMget (opts) {
     'routing',
     '_source',
     '_source_excludes',
+    '_source_exclude',
     '_source_includes',
+    '_source_include',
     'pretty',
     'human',
     'error_trace',
@@ -60,7 +62,9 @@ function buildMget (opts) {
   const snakeCase = {
     storedFields: 'stored_fields',
     _sourceExcludes: '_source_excludes',
+    _sourceExclude: '_source_exclude',
     _sourceIncludes: '_source_includes',
+    _sourceInclude: '_source_include',
     errorTrace: 'error_trace',
     filterPath: 'filter_path'
   }

api/api/msearch.js

@@ -34,7 +34,7 @@ function buildMsearch (opts) {
    * @param {number} max_concurrent_searches - Controls the maximum number of concurrent searches the multi search api will execute
    * @param {boolean} typed_keys - Specify whether aggregation and suggester names should be prefixed by their respective types in the response
    * @param {number} pre_filter_shard_size - A threshold that enforces a pre-filter roundtrip to prefilter search shards based on query rewriting if the number of shards the search request expands to exceeds the threshold. This filter roundtrip can limit the number of shards significantly if for instance a shard can not match any documents based on it's rewrite method ie. if date filters are mandatory to match but the shard bounds and the query are disjoint.
-   * @param {number} max_concurrent_shard_requests - The number of concurrent shard requests each sub search executes concurrently. This value should be used to limit the impact of the search on the cluster in order to limit the number of concurrent shard requests
+   * @param {number} max_concurrent_shard_requests - The number of concurrent shard requests each sub search executes concurrently per node. This value should be used to limit the impact of the search on the cluster in order to limit the number of concurrent shard requests
    * @param {boolean} rest_total_hits_as_int - Indicates whether hits.total should be rendered as an integer or an object in the rest search response
    * @param {boolean} ccs_minimize_roundtrips - Indicates whether network round-trips should be minimized as part of cross-cluster search requests execution
    * @param {object} body - The request definitions (metadata-search request definition pairs), separated by newlines

api/api/mtermvectors.js

@@ -39,7 +39,6 @@ function buildMtermvectors (opts) {
    * @param {boolean} payloads - Specifies if term payloads should be returned. Applies to all returned documents unless otherwise specified in body "params" or "docs".
    * @param {string} preference - Specify the node or shard the operation should be performed on (default: random) .Applies to all returned documents unless otherwise specified in body "params" or "docs".
    * @param {string} routing - Specific routing value. Applies to all returned documents unless otherwise specified in body "params" or "docs".
-   * @param {string} parent - Parent id of documents. Applies to all returned documents unless otherwise specified in body "params" or "docs".
    * @param {boolean} realtime - Specifies if requests are real-time as opposed to near-real-time (default: true).
    * @param {number} version - Explicit version number for concurrency control
    * @param {enum} version_type - Specific version type
@@ -56,7 +55,6 @@ function buildMtermvectors (opts) {
     'payloads',
     'preference',
     'routing',
-    'parent',
     'realtime',
     'version',
     'version_type',

api/api/nodes.hot_threads.js

@@ -100,12 +100,12 @@ function buildNodesHotThreads (opts) {
       path = '/' + '_cluster' + '/' + 'nodes' + '/' + encodeURIComponent(node_id || nodeId) + '/' + 'hotthreads'
     } else if ((node_id || nodeId) != null) {
       path = '/' + '_cluster' + '/' + 'nodes' + '/' + encodeURIComponent(node_id || nodeId) + '/' + 'hot_threads'
-    } else if ((node_id || nodeId) != null) {
-      path = '/' + '_nodes' + '/' + encodeURIComponent(node_id || nodeId) + '/' + 'hotthreads'
     } else if ((node_id || nodeId) != null) {
       path = '/' + '_nodes' + '/' + encodeURIComponent(node_id || nodeId) + '/' + 'hot_threads'
+    } else if ((node_id || nodeId) != null) {
+      path = '/' + '_nodes' + '/' + encodeURIComponent(node_id || nodeId) + '/' + 'hotthreads'
     } else {
-      path = '/' + '_cluster' + '/' + 'nodes' + '/' + 'hotthreads'
+      path = '/' + '_nodes' + '/' + 'hot_threads'
     }
 
     // build request object

api/api/scripts_painless_context.js

@@ -0,0 +1,96 @@
+/*
+ * 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 buildScriptsPainlessContext (opts) {
+  // eslint-disable-next-line no-unused-vars
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  /**
+   * Perform a [scripts_painless_context](undefined) request
+   *
+   * @param {string} context - Select a specific context to retrieve API information about
+   */
+
+  const acceptedQuerystring = [
+    'context',
+    'pretty',
+    'human',
+    'error_trace',
+    'source',
+    'filter_path'
+  ]
+
+  const snakeCase = {
+    errorTrace: 'error_trace',
+    filterPath: 'filter_path'
+  }
+
+  return function scriptsPainlessContext (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)
+
+    if (method == null) {
+      method = 'GET'
+    }
+
+    var ignore = options.ignore
+    if (typeof ignore === 'number') {
+      options.ignore = [ignore]
+    }
+
+    var path = ''
+
+    path = '/' + '_scripts' + '/' + 'painless' + '/' + '_context'
+
+    // build request object
+    const request = {
+      method,
+      path,
+      body: null,
+      querystring
+    }
+
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
+  }
+}
+
+module.exports = buildScriptsPainlessContext

api/api/search.js

@@ -99,7 +99,9 @@ function buildSearch (opts) {
     'sort',
     '_source',
     '_source_excludes',
+    '_source_exclude',
     '_source_includes',
+    '_source_include',
     'terminate_after',
     'stats',
     'suggest_field',
@@ -137,7 +139,9 @@ function buildSearch (opts) {
     expandWildcards: 'expand_wildcards',
     searchType: 'search_type',
     _sourceExcludes: '_source_excludes',
+    _sourceExclude: '_source_exclude',
     _sourceIncludes: '_source_includes',
+    _sourceInclude: '_source_include',
     terminateAfter: 'terminate_after',
     suggestField: 'suggest_field',
     suggestMode: 'suggest_mode',

api/api/security.put_role_mapping.js

@@ -30,7 +30,7 @@ function buildSecurityPutRoleMapping (opts) {
    *
    * @param {string} name - Role-mapping name
    * @param {enum} refresh - If `true` (the default) 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` then do nothing with refreshes.
-   * @param {object} body - The role to add
+   * @param {object} body - The role mapping to add
    */
 
   const acceptedQuerystring = [

api/api/termvectors.js

@@ -39,7 +39,6 @@ function buildTermvectors (opts) {
    * @param {boolean} payloads - Specifies if term payloads should be returned.
    * @param {string} preference - Specify the node or shard the operation should be performed on (default: random).
    * @param {string} routing - Specific routing value.
-   * @param {string} parent - Parent id of documents.
    * @param {boolean} realtime - Specifies if request is real-time as opposed to near-real-time (default: true).
    * @param {number} version - Explicit version number for concurrency control
    * @param {enum} version_type - Specific version type
@@ -55,7 +54,6 @@ function buildTermvectors (opts) {
     'payloads',
     'preference',
     'routing',
-    'parent',
     'realtime',
     'version',
     'version_type',

api/api/update.js

@@ -36,7 +36,6 @@ function buildUpdate (opts) {
    * @param {list} _source_excludes - A list of fields to exclude from the returned _source field
    * @param {list} _source_includes - A list of fields to extract and return from the _source field
    * @param {string} lang - The script language (default: painless)
-   * @param {string} parent - ID of the parent document. Is is only used for routing and when for the upsert request
    * @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 {number} retry_on_conflict - Specify how many times should the operation be retried when a conflict occurs (default: 0)
    * @param {string} routing - Specific routing value
@@ -50,9 +49,10 @@ function buildUpdate (opts) {
     'wait_for_active_shards',
     '_source',
     '_source_excludes',
+    '_source_exclude',
     '_source_includes',
+    '_source_include',
     'lang',
-    'parent',
     'refresh',
     'retry_on_conflict',
     'routing',
@@ -69,7 +69,9 @@ function buildUpdate (opts) {
   const snakeCase = {
     waitForActiveShards: 'wait_for_active_shards',
     _sourceExcludes: '_source_excludes',
+    _sourceExclude: '_source_exclude',
     _sourceIncludes: '_source_includes',
+    _sourceInclude: '_source_include',
     retryOnConflict: 'retry_on_conflict',
     ifSeqNo: 'if_seq_no',
     ifPrimaryTerm: 'if_primary_term',

api/api/update_by_query.js

@@ -89,7 +89,9 @@ function buildUpdateByQuery (opts) {
     'sort',
     '_source',
     '_source_excludes',
+    '_source_exclude',
     '_source_includes',
+    '_source_include',
     'terminate_after',
     'stats',
     'version',
@@ -118,7 +120,9 @@ function buildUpdateByQuery (opts) {
     searchType: 'search_type',
     searchTimeout: 'search_timeout',
     _sourceExcludes: '_source_excludes',
+    _sourceExclude: '_source_exclude',
     _sourceIncludes: '_source_includes',
+    _sourceInclude: '_source_include',
     terminateAfter: 'terminate_after',
     versionType: 'version_type',
     requestCache: 'request_cache',

api/index.js

@@ -97,6 +97,38 @@ function ESAPI (opts) {
     },
     count: lazyLoad('count', opts),
     create: lazyLoad('create', opts),
+    data_frame: {
+      delete_data_frame_transform: lazyLoad('data_frame.delete_data_frame_transform', opts),
+      deleteDataFrameTransform: lazyLoad('data_frame.delete_data_frame_transform', opts),
+      get_data_frame_transform: lazyLoad('data_frame.get_data_frame_transform', opts),
+      getDataFrameTransform: lazyLoad('data_frame.get_data_frame_transform', opts),
+      get_data_frame_transform_stats: lazyLoad('data_frame.get_data_frame_transform_stats', opts),
+      getDataFrameTransformStats: lazyLoad('data_frame.get_data_frame_transform_stats', opts),
+      preview_data_frame_transform: lazyLoad('data_frame.preview_data_frame_transform', opts),
+      previewDataFrameTransform: lazyLoad('data_frame.preview_data_frame_transform', opts),
+      put_data_frame_transform: lazyLoad('data_frame.put_data_frame_transform', opts),
+      putDataFrameTransform: lazyLoad('data_frame.put_data_frame_transform', opts),
+      start_data_frame_transform: lazyLoad('data_frame.start_data_frame_transform', opts),
+      startDataFrameTransform: lazyLoad('data_frame.start_data_frame_transform', opts),
+      stop_data_frame_transform: lazyLoad('data_frame.stop_data_frame_transform', opts),
+      stopDataFrameTransform: lazyLoad('data_frame.stop_data_frame_transform', opts)
+    },
+    dataFrame: {
+      delete_data_frame_transform: lazyLoad('data_frame.delete_data_frame_transform', opts),
+      deleteDataFrameTransform: lazyLoad('data_frame.delete_data_frame_transform', opts),
+      get_data_frame_transform: lazyLoad('data_frame.get_data_frame_transform', opts),
+      getDataFrameTransform: lazyLoad('data_frame.get_data_frame_transform', opts),
+      get_data_frame_transform_stats: lazyLoad('data_frame.get_data_frame_transform_stats', opts),
+      getDataFrameTransformStats: lazyLoad('data_frame.get_data_frame_transform_stats', opts),
+      preview_data_frame_transform: lazyLoad('data_frame.preview_data_frame_transform', opts),
+      previewDataFrameTransform: lazyLoad('data_frame.preview_data_frame_transform', opts),
+      put_data_frame_transform: lazyLoad('data_frame.put_data_frame_transform', opts),
+      putDataFrameTransform: lazyLoad('data_frame.put_data_frame_transform', opts),
+      start_data_frame_transform: lazyLoad('data_frame.start_data_frame_transform', opts),
+      startDataFrameTransform: lazyLoad('data_frame.start_data_frame_transform', opts),
+      stop_data_frame_transform: lazyLoad('data_frame.stop_data_frame_transform', opts),
+      stopDataFrameTransform: lazyLoad('data_frame.stop_data_frame_transform', opts)
+    },
     delete: lazyLoad('delete', opts),
     delete_by_query: lazyLoad('delete_by_query', opts),
     deleteByQuery: lazyLoad('delete_by_query', opts),
@@ -363,6 +395,8 @@ function ESAPI (opts) {
       stop_job: lazyLoad('rollup.stop_job', opts),
       stopJob: lazyLoad('rollup.stop_job', opts)
     },
+    scripts_painless_context: lazyLoad('scripts_painless_context', opts),
+    scriptsPainlessContext: lazyLoad('scripts_painless_context', opts),
     scripts_painless_execute: lazyLoad('scripts_painless_execute', opts),
     scriptsPainlessExecute: lazyLoad('scripts_painless_execute', opts),
     scroll: lazyLoad('scroll', opts),

api/requestParams.d.ts

@@ -30,6 +30,8 @@ export interface Generic {
 export interface Bulk<T = any> extends Generic {
   index?: string;
   type?: string;
+  _source_exclude?: string | string[];
+  _source_include?: string | string[];
   wait_for_active_shards?: string;
   refresh?: 'true' | 'false' | 'wait_for';
   routing?: string;
@@ -115,6 +117,7 @@ export interface CatIndices extends Generic {
   pri?: boolean;
   s?: string | string[];
   v?: boolean;
+  include_unloaded_segments?: boolean;
 }
 
 export interface CatMaster extends Generic {
@@ -277,6 +280,7 @@ export interface ClusterGetSettings extends Generic {
 
 export interface ClusterHealth extends Generic {
   index?: string | string[];
+  expand_wildcards?: 'open' | 'closed' | 'none' | 'all';
   level?: 'cluster' | 'indices' | 'shards';
   local?: boolean;
   master_timeout?: string;
@@ -358,7 +362,6 @@ export interface Create<T = any> extends Generic {
   index: string;
   type?: string;
   wait_for_active_shards?: string;
-  parent?: string;
   refresh?: 'true' | 'false' | 'wait_for';
   routing?: string;
   timeout?: string;
@@ -373,7 +376,6 @@ export interface Delete extends Generic {
   index: string;
   type?: string;
   wait_for_active_shards?: string;
-  parent?: string;
   refresh?: 'true' | 'false' | 'wait_for';
   routing?: string;
   timeout?: string;
@@ -386,6 +388,8 @@ export interface Delete extends Generic {
 export interface DeleteByQuery<T = any> extends Generic {
   index: string | string[];
   type?: string | string[];
+  _source_exclude?: string | string[];
+  _source_include?: string | string[];
   analyzer?: string;
   analyze_wildcard?: boolean;
   default_operator?: 'AND' | 'OR';
@@ -436,8 +440,9 @@ export interface Exists extends Generic {
   id: string;
   index: string;
   type?: string;
+  _source_exclude?: string | string[];
+  _source_include?: string | string[];
   stored_fields?: string | string[];
-  parent?: string;
   preference?: string;
   realtime?: boolean;
   refresh?: boolean;
@@ -453,7 +458,8 @@ export interface ExistsSource extends Generic {
   id: string;
   index: string;
   type?: string;
-  parent?: string;
+  _source_exclude?: string | string[];
+  _source_include?: string | string[];
   preference?: string;
   realtime?: boolean;
   refresh?: boolean;
@@ -469,13 +475,14 @@ export interface Explain<T = any> extends Generic {
   id: string;
   index: string;
   type?: string;
+  _source_exclude?: string | string[];
+  _source_include?: string | string[];
   analyze_wildcard?: boolean;
   analyzer?: string;
   default_operator?: 'AND' | 'OR';
   df?: string;
   stored_fields?: string | string[];
   lenient?: boolean;
-  parent?: string;
   preference?: string;
   q?: string;
   routing?: string;
@@ -491,14 +498,16 @@ export interface FieldCaps extends Generic {
   ignore_unavailable?: boolean;
   allow_no_indices?: boolean;
   expand_wildcards?: 'open' | 'closed' | 'none' | 'all';
+  include_unmapped?: boolean;
 }
 
 export interface Get extends Generic {
   id: string;
   index: string;
   type?: string;
+  _source_exclude?: string | string[];
+  _source_include?: string | string[];
   stored_fields?: string | string[];
-  parent?: string;
   preference?: string;
   realtime?: boolean;
   refresh?: boolean;
@@ -506,8 +515,6 @@ export interface Get extends Generic {
   _source?: string | string[];
   _source_excludes?: string | string[];
   _source_includes?: string | string[];
-  _source_exclude?: string | string[];
-  _source_include?: string | string[];
   version?: number;
   version_type?: 'internal' | 'external' | 'external_gte' | 'force';
 }
@@ -521,7 +528,8 @@ export interface GetSource extends Generic {
   id: string;
   index: string;
   type?: string;
-  parent?: string;
+  _source_exclude?: string | string[];
+  _source_include?: string | string[];
   preference?: string;
   realtime?: boolean;
   refresh?: boolean;
@@ -539,7 +547,6 @@ export interface Index<T = any> extends Generic {
   type?: string;
   wait_for_active_shards?: string;
   op_type?: 'index' | 'create';
-  parent?: string;
   refresh?: 'true' | 'false' | 'wait_for';
   routing?: string;
   timeout?: string;
@@ -574,6 +581,7 @@ export interface IndicesClose extends Generic {
   ignore_unavailable?: boolean;
   allow_no_indices?: boolean;
   expand_wildcards?: 'open' | 'closed' | 'none' | 'all';
+  wait_for_active_shards?: string;
 }
 
 export interface IndicesCreate<T = any> extends Generic {
@@ -862,6 +870,9 @@ export interface IndicesStats extends Generic {
   level?: 'cluster' | 'indices' | 'shards';
   types?: string | string[];
   include_segment_file_sizes?: boolean;
+  include_unloaded_segments?: boolean;
+  expand_wildcards?: 'open' | 'closed' | 'none' | 'all';
+  forbid_closed_indices?: boolean;
 }
 
 export interface IndicesUpdateAliases<T = any> extends Generic {
@@ -930,6 +941,8 @@ export interface IngestSimulate<T = any> extends Generic {
 export interface Mget<T = any> extends Generic {
   index?: string;
   type?: string;
+  _source_exclude?: string | string[];
+  _source_include?: string | string[];
   stored_fields?: string | string[];
   preference?: string;
   realtime?: boolean;
@@ -977,7 +990,6 @@ export interface Mtermvectors<T = any> extends Generic {
   payloads?: boolean;
   preference?: string;
   routing?: string;
-  parent?: string;
   realtime?: boolean;
   version?: number;
   version_type?: 'internal' | 'external' | 'external_gte' | 'force';
@@ -1066,6 +1078,10 @@ export interface RenderSearchTemplate<T = any> extends Generic {
   body?: T;
 }
 
+export interface ScriptsPainlessContext extends Generic {
+  context?: string;
+}
+
 export interface ScriptsPainlessExecute<T = any> extends Generic {
   body?: T;
 }
@@ -1080,6 +1096,8 @@ export interface Scroll<T = any> extends Generic {
 export interface Search<T = any> extends Generic {
   index?: string | string[];
   type?: string | string[];
+  _source_exclude?: string | string[];
+  _source_include?: string | string[];
   analyzer?: string;
   analyze_wildcard?: boolean;
   ccs_minimize_roundtrips?: boolean;
@@ -1252,7 +1270,6 @@ export interface Termvectors<T = any> extends Generic {
   payloads?: boolean;
   preference?: string;
   routing?: string;
-  parent?: string;
   realtime?: boolean;
   version?: number;
   version_type?: 'internal' | 'external' | 'external_gte' | 'force';
@@ -1263,12 +1280,13 @@ export interface Update<T = any> extends Generic {
   id: string;
   index: string;
   type?: string;
+  _source_exclude?: string | string[];
+  _source_include?: string | string[];
   wait_for_active_shards?: string;
   _source?: string | string[];
   _source_excludes?: string | string[];
   _source_includes?: string | string[];
   lang?: string;
-  parent?: string;
   refresh?: 'true' | 'false' | 'wait_for';
   retry_on_conflict?: number;
   routing?: string;
@@ -1281,6 +1299,8 @@ export interface Update<T = any> extends Generic {
 export interface UpdateByQuery<T = any> extends Generic {
   index: string | string[];
   type?: string | string[];
+  _source_exclude?: string | string[];
+  _source_include?: string | string[];
   analyzer?: string;
   analyze_wildcard?: boolean;
   default_operator?: 'AND' | 'OR';
@@ -1371,6 +1391,42 @@ export interface CcrUnfollow extends Generic {
   index: string;
 }
 
+export interface DataFrameDeleteDataFrameTransform extends Generic {
+  transform_id: string;
+}
+
+export interface DataFrameGetDataFrameTransform extends Generic {
+  transform_id?: string;
+  from?: number;
+  size?: number;
+}
+
+export interface DataFrameGetDataFrameTransformStats extends Generic {
+  transform_id?: string;
+  from?: number;
+  size?: number;
+}
+
+export interface DataFramePreviewDataFrameTransform<T = any> extends Generic {
+  body: T;
+}
+
+export interface DataFramePutDataFrameTransform<T = any> extends Generic {
+  transform_id: string;
+  body: T;
+}
+
+export interface DataFrameStartDataFrameTransform extends Generic {
+  transform_id: string;
+  timeout?: string;
+}
+
+export interface DataFrameStopDataFrameTransform extends Generic {
+  transform_id: string;
+  wait_for_completion?: boolean;
+  timeout?: string;
+}
+
 export interface GraphExplore<T = any> extends Generic {
   index?: string | string[];
   type?: string | string[];

docs/configuration.asciidoc

@@ -8,7 +8,7 @@ The client is designed to be easily configured as you see fit for your needs, fo
 const { Client } = require('@elastic/elasticsearch')
 
 const client = new Client({
-  node: 'http://localhost:9200'
+  node: 'http://localhost:9200',
   maxRetries: 5,
   requestTimeout: 60000,
   sniffOnStart: true
@@ -150,6 +150,26 @@ function generateRequestId (params, options) {
 |`name`
 |`string` - The name to identify the client instance in the events. +
 _Default:_ `elasticsearch-js`
+
+|`headers`
+|`object` - A set of custom headers to send in every request. +
+_Default:_ `{}`
+
+|`cloud`
+a|`object` - Custom configuration for connecting to https://cloud.elastic.co[Elastic Cloud]. See https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/auth-reference.html[Authentication] for more details. +
+_Default:_ `null` + 
+_Cloud configuration example:_ 
+[source,js]
+----
+const client = new Client({
+  cloud: {
+    id: 'name:bG9jYWxob3N0JGFiY2QkZWZnaA==',
+    username: 'elastic',
+    password: 'changeme'
+  }
+})
+----
+
 |===
 
 === Advanced configuration

docs/examples/typescript.asciidoc

@@ -59,7 +59,7 @@ async function run (): void {
   client
     .search(params)
     .then((result: ApiResponse) => {
-      console.og(result.body.hits.hits)
+      console.log(result.body.hits.hits)
     })
     .catch((err: Error) => {
       console.log(err)

docs/reference.asciidoc

@@ -314,6 +314,9 @@ link:{ref}/cat-indices.html[Reference]
 |`v`
 |`boolean` - Verbose mode. Display column headers
 
+|`include_unloaded_segments` or `includeUnloadedSegments`
+|`boolean` - If set to true segment stats will include stats for segments that are not currently loaded into memory
+
 |===
 
 === cat.master
@@ -817,6 +820,10 @@ link:{ref}/cluster-health.html[Reference]
 |`index`
 |`string, string[]` - Limit the information returned to a specific index
 
+|`expand_wildcards` or `expandWildcards`
+|`'open', 'closed', 'none', 'all'` - Whether to expand wildcard expression to concrete indices that are open, closed or both. +
+_Default:_ `all`
+
 |`level`
 |`'cluster', 'indices', 'shards'` - Specify the level of detail for returned information +
 _Default:_ `cluster`
@@ -1070,9 +1077,6 @@ link:{ref}/docs-index_.html[Reference]
 |`wait_for_active_shards` or `waitForActiveShards`
 |`string` - 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)
 
-|`parent`
-|`string` - ID of the parent document
-
 |`refresh`
 |`'true', 'false', 'wait_for'` - 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.
 
@@ -1116,9 +1120,6 @@ link:{ref}/docs-delete.html[Reference]
 |`wait_for_active_shards` or `waitForActiveShards`
 |`string` - 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)
 
-|`parent`
-|`string` - ID of parent document
-
 |`refresh`
 |`'true', 'false', 'wait_for'` - 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.
 
@@ -1318,9 +1319,6 @@ link:{ref}/docs-get.html[Reference]
 |`stored_fields` or `storedFields`
 |`string, string[]` - A comma-separated list of stored fields to return in the response
 
-|`parent`
-|`string` - The ID of the parent document
-
 |`preference`
 |`string` - Specify the node or shard the operation should be performed on (default: random)
 
@@ -1367,9 +1365,6 @@ link:{ref}/docs-get.html[Reference]
 |`type`
 |`string` - The type of the document; deprecated and optional starting with 7.0
 
-|`parent`
-|`string` - The ID of the parent document
-
 |`preference`
 |`string` - Specify the node or shard the operation should be performed on (default: random)
 
@@ -1435,9 +1430,6 @@ _Default:_ `OR`
 |`lenient`
 |`boolean` - Specify whether format-based query failures (such as providing text to a numeric field) should be ignored
 
-|`parent`
-|`string` - The ID of the parent document
-
 |`preference`
 |`string` - Specify the node or shard the operation should be performed on (default: random)
 
@@ -1485,6 +1477,9 @@ link:{ref}/search-field-caps.html[Reference]
 |`'open', 'closed', 'none', 'all'` - Whether to expand wildcard expression to concrete indices that are open, closed or both. +
 _Default:_ `open`
 
+|`include_unmapped` or `includeUnmapped`
+|`boolean` - Indicates whether unmapped fields should be included in the response.
+
 |===
 
 === get
@@ -1507,9 +1502,6 @@ link:{ref}/docs-get.html[Reference]
 |`stored_fields` or `storedFields`
 |`string, string[]` - A comma-separated list of stored fields to return in the response
 
-|`parent`
-|`string` - The ID of the parent document
-
 |`preference`
 |`string` - Specify the node or shard the operation should be performed on (default: random)
 
@@ -1531,12 +1523,6 @@ link:{ref}/docs-get.html[Reference]
 |`_source_includes` or `_sourceIncludes`
 |`string, string[]` - A list of fields to extract and return from the _source field
 
-|`_source_exclude` or `_sourceExclude`
-|`string, string[]` - A list of fields to exclude from the returned _source field
-
-|`_source_include` or `_sourceInclude`
-|`string, string[]` - A list of fields to extract and return from the _source field
-
 |`version`
 |`number` - Explicit version number for concurrency control
 
@@ -1578,9 +1564,6 @@ link:{ref}/docs-get.html[Reference]
 |`type`
 |`string` - The type of the document; deprecated and optional starting with 7.0
 
-|`parent`
-|`string` - The ID of the parent document
-
 |`preference`
 |`string` - Specify the node or shard the operation should be performed on (default: random)
 
@@ -1634,9 +1617,6 @@ link:{ref}/docs-index_.html[Reference]
 |`'index', 'create'` - Explicit operation type +
 _Default:_ `index`
 
-|`parent`
-|`string` - ID of the parent document
-
 |`refresh`
 |`'true', 'false', 'wait_for'` - 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.
 
@@ -1750,6 +1730,9 @@ link:{ref}/indices-open-close.html[Reference]
 |`'open', 'closed', 'none', 'all'` - Whether to expand wildcard expression to concrete indices that are open, closed or both. +
 _Default:_ `open`
 
+|`wait_for_active_shards` or `waitForActiveShards`
+|`string` - Sets the number of active shards to wait for before the operation returns.
+
 |===
 
 === indices.create
@@ -2665,6 +2648,17 @@ _Default:_ `indices`
 |`include_segment_file_sizes` or `includeSegmentFileSizes`
 |`boolean` - Whether to report the aggregated disk usage of each one of the Lucene index files (only applies if segment stats are requested)
 
+|`include_unloaded_segments` or `includeUnloadedSegments`
+|`boolean` - If set to true segment stats will include stats for segments that are not currently loaded into memory
+
+|`expand_wildcards` or `expandWildcards`
+|`'open', 'closed', 'none', 'all'` - Whether to expand wildcard expression to concrete indices that are open, closed or both. +
+_Default:_ `open`
+
+|`forbid_closed_indices` or `forbidClosedIndices`
+|`boolean` - If set to false stats will also collected from closed indices if explicitly specified or if expand_wildcards expands to closed indices +
+_Default:_ `true`
+
 |===
 
 === indices.updateAliases
@@ -2935,8 +2929,8 @@ link:{ref}/search-multi-search.html[Reference]
 _Default:_ `128`
 
 |`max_concurrent_shard_requests` or `maxConcurrentShardRequests`
-|`number` - The number of concurrent shard requests each sub search executes concurrently. This value should be used to limit the impact of the search on the cluster in order to limit the number of concurrent shard requests +
-_Default:_ `The default grows with the number of nodes in the cluster but is at most 256.`
+|`number` - The number of concurrent shard requests each sub search executes concurrently per node. This value should be used to limit the impact of the search on the cluster in order to limit the number of concurrent shard requests +
+_Default:_ `5`
 
 |`rest_total_hits_as_int` or `restTotalHitsAsInt`
 |`boolean` - Indicates whether hits.total should be rendered as an integer or an object in the rest search response
@@ -3030,9 +3024,6 @@ _Default:_ `true`
 |`routing`
 |`string` - Specific routing value. Applies to all returned documents unless otherwise specified in body "params" or "docs".
 
-|`parent`
-|`string` - Parent id of documents. Applies to all returned documents unless otherwise specified in body "params" or "docs".
-
 |`realtime`
 |`boolean` - Specifies if requests are real-time as opposed to near-real-time (default: true).
 
@@ -3311,6 +3302,18 @@ link:{ref}/search-template.html[Reference]
 
 |===
 
+=== scriptsPainlessContext
+[source,js]
+----
+client.scriptsPainlessContext([params] [, options] [, callback])
+----
+[cols=2*]
+|===
+|`context`
+|`string` - Select a specific context to retrieve API information about
+
+|===
+
 === scriptsPainlessExecute
 [source,js]
 ----
@@ -3488,7 +3491,7 @@ _Default:_ `512`
 
 |`max_concurrent_shard_requests` or `maxConcurrentShardRequests`
 |`number` - The number of concurrent shard requests per node this search executes concurrently. This value should be used to limit the impact of the search on the cluster in order to limit the number of concurrent shard requests +
-_Default:_ `The default is 5.`
+_Default:_ `5`
 
 |`pre_filter_shard_size` or `preFilterShardSize`
 |`number` - A threshold that enforces a pre-filter roundtrip to prefilter search shards based on query rewriting if the number of shards the search request expands to exceeds the threshold. This filter roundtrip can limit the number of shards significantly if for instance a shard can not match any documents based on it's rewrite method ie. if date filters are mandatory to match but the shard bounds and the query are disjoint. +
@@ -3910,9 +3913,6 @@ _Default:_ `true`
 |`routing`
 |`string` - Specific routing value.
 
-|`parent`
-|`string` - Parent id of documents.
-
 |`realtime`
 |`boolean` - Specifies if request is real-time as opposed to near-real-time (default: true).
 
@@ -3959,9 +3959,6 @@ link:{ref}/docs-update.html[Reference]
 |`lang`
 |`string` - The script language (default: painless)
 
-|`parent`
-|`string` - ID of the parent document. Is is only used for routing and when for the upsert request
-
 |`refresh`
 |`'true', 'false', 'wait_for'` - 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.
 
@@ -4282,6 +4279,121 @@ link:http://www.elastic.co/guide/en/elasticsearch/reference/current[Reference]
 
 |===
 
+=== dataFrame.deleteDataFrameTransform
+[source,js]
+----
+client.dataFrame.deleteDataFrameTransform([params] [, options] [, callback])
+----
+link:{ref}/delete-data-frame-transform.html[Reference]
+[cols=2*]
+|===
+|`transform_id` or `transformId`
+|`string` - The id of the transform to delete
+
+|===
+
+=== dataFrame.getDataFrameTransform
+[source,js]
+----
+client.dataFrame.getDataFrameTransform([params] [, options] [, callback])
+----
+link:{ref}/get-data-frame-transform.html[Reference]
+[cols=2*]
+|===
+|`transform_id` or `transformId`
+|`string` - The id or comma delimited list of id expressions of the transforms to get, '_all' or '*' implies get all transforms
+
+|`from`
+|`number` - skips a number of transform configs, defaults to 0
+
+|`size`
+|`number` - specifies a max number of transforms to get, defaults to 100
+
+|===
+
+=== dataFrame.getDataFrameTransformStats
+[source,js]
+----
+client.dataFrame.getDataFrameTransformStats([params] [, options] [, callback])
+----
+link:{ref}/get-data-frame-transform-stats.html[Reference]
+[cols=2*]
+|===
+|`transform_id` or `transformId`
+|`string` - The id of the transform for which to get stats. '_all' or '*' implies all transforms
+
+|`from`
+|`number` - skips a number of transform stats, defaults to 0
+
+|`size`
+|`number` - specifies a max number of transform stats to get, defaults to 100
+
+|===
+
+=== dataFrame.previewDataFrameTransform
+[source,js]
+----
+client.dataFrame.previewDataFrameTransform([params] [, options] [, callback])
+----
+link:{ref}/preview-data-frame-transform.html[Reference]
+[cols=2*]
+|===
+|`body`
+|`object` - The definition for the data_frame transform to preview
+
+|===
+
+=== dataFrame.putDataFrameTransform
+[source,js]
+----
+client.dataFrame.putDataFrameTransform([params] [, options] [, callback])
+----
+link:{ref}/put-data-frame-transform.html[Reference]
+[cols=2*]
+|===
+|`transform_id` or `transformId`
+|`string` - The id of the new transform.
+
+|`body`
+|`object` - The data frame transform definition
+
+|===
+
+=== dataFrame.startDataFrameTransform
+[source,js]
+----
+client.dataFrame.startDataFrameTransform([params] [, options] [, callback])
+----
+link:{ref}/start-data-frame-transform.html[Reference]
+[cols=2*]
+|===
+|`transform_id` or `transformId`
+|`string` - The id of the transform to start
+
+|`timeout`
+|`string` - Controls the time to wait for the transform to start
+
+|===
+
+=== dataFrame.stopDataFrameTransform
+[source,js]
+----
+client.dataFrame.stopDataFrameTransform([params] [, options] [, callback])
+----
+link:{ref}/stop-data-frame-transform.html[Reference]
+[cols=2*]
+|===
+|`transform_id` or `transformId`
+|`string` - The id of the transform to stop
+
+|`wait_for_completion` or `waitForCompletion`
+|`boolean` - Whether to wait for the transform to fully stop before returning or not. Default to false
+
+|`timeout`
+|`string` - Controls the time to wait until the transform has stopped. Default to 30 seconds
+
+|===
+
 === graph.explore
 [source,js]
 ----
@@ -6036,7 +6148,7 @@ link:{ref}/security-api-put-role-mapping.html[Reference]
 |`'true', 'false', 'wait_for'` - If `true` (the default) 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` then do nothing with refreshes.
 
 |`body`
-|`object` - The role to add
+|`object` - The role mapping to add
 
 |===
 

index.d.ts

@@ -20,7 +20,7 @@
 /// <reference types="node" />
 
 import { EventEmitter } from 'events';
-import { SecureContextOptions } from 'tls';
+import { ConnectionOptions as TlsConnectionOptions } from 'tls';
 import Transport, {
   ApiResponse,
   RequestEvent,
@@ -31,6 +31,7 @@ import Transport, {
   generateRequestIdFn,
   TransportRequestCallback
 } from './lib/Transport';
+import { URL } from 'url';
 import Connection, { AgentOptions, agentFn } from './lib/Connection';
 import ConnectionPool, { ResurrectEvent } from './lib/ConnectionPool';
 import Serializer from './lib/Serializer';
@@ -72,8 +73,22 @@ interface ClientExtends {
 }
 // /Extend API
 
+interface NodeOptions {
+  url: URL;
+  id?: string;
+  agent?: AgentOptions;
+  ssl?: TlsConnectionOptions;
+  headers?: anyObject;
+  roles?: {
+    master: boolean;
+    data: boolean;
+    ingest: boolean;
+    ml: boolean;
+  }
+}
+
 interface ClientOptions {
-  node?: string | string[];
+  node?: string | string[] | NodeOptions | NodeOptions[];
   nodes?: string | string[];
   Connection?: typeof Connection;
   ConnectionPool?: typeof ConnectionPool;
@@ -89,7 +104,7 @@ interface ClientOptions {
   resurrectStrategy?: 'ping' | 'optimistic' | 'none';
   suggestCompression?: boolean;
   compression?: 'gzip';
-  ssl?: SecureContextOptions;
+  ssl?: TlsConnectionOptions;
   agent?: AgentOptions | agentFn;
   nodeFilter?: nodeFilterFn;
   nodeSelector?: nodeSelectorFn | string;
@@ -177,6 +192,38 @@ declare class Client extends EventEmitter {
   }
   count: ApiMethod<RequestParams.Count>
   create: ApiMethod<RequestParams.Create>
+  data_frame: {
+    delete_data_frame_transform: ApiMethod<RequestParams.DataFrameDeleteDataFrameTransform>
+    deleteDataFrameTransform: ApiMethod<RequestParams.DataFrameDeleteDataFrameTransform>
+    get_data_frame_transform: ApiMethod<RequestParams.DataFrameGetDataFrameTransform>
+    getDataFrameTransform: ApiMethod<RequestParams.DataFrameGetDataFrameTransform>
+    get_data_frame_transform_stats: ApiMethod<RequestParams.DataFrameGetDataFrameTransformStats>
+    getDataFrameTransformStats: ApiMethod<RequestParams.DataFrameGetDataFrameTransformStats>
+    preview_data_frame_transform: ApiMethod<RequestParams.DataFramePreviewDataFrameTransform>
+    previewDataFrameTransform: ApiMethod<RequestParams.DataFramePreviewDataFrameTransform>
+    put_data_frame_transform: ApiMethod<RequestParams.DataFramePutDataFrameTransform>
+    putDataFrameTransform: ApiMethod<RequestParams.DataFramePutDataFrameTransform>
+    start_data_frame_transform: ApiMethod<RequestParams.DataFrameStartDataFrameTransform>
+    startDataFrameTransform: ApiMethod<RequestParams.DataFrameStartDataFrameTransform>
+    stop_data_frame_transform: ApiMethod<RequestParams.DataFrameStopDataFrameTransform>
+    stopDataFrameTransform: ApiMethod<RequestParams.DataFrameStopDataFrameTransform>
+  }
+  dataFrame: {
+    delete_data_frame_transform: ApiMethod<RequestParams.DataFrameDeleteDataFrameTransform>
+    deleteDataFrameTransform: ApiMethod<RequestParams.DataFrameDeleteDataFrameTransform>
+    get_data_frame_transform: ApiMethod<RequestParams.DataFrameGetDataFrameTransform>
+    getDataFrameTransform: ApiMethod<RequestParams.DataFrameGetDataFrameTransform>
+    get_data_frame_transform_stats: ApiMethod<RequestParams.DataFrameGetDataFrameTransformStats>
+    getDataFrameTransformStats: ApiMethod<RequestParams.DataFrameGetDataFrameTransformStats>
+    preview_data_frame_transform: ApiMethod<RequestParams.DataFramePreviewDataFrameTransform>
+    previewDataFrameTransform: ApiMethod<RequestParams.DataFramePreviewDataFrameTransform>
+    put_data_frame_transform: ApiMethod<RequestParams.DataFramePutDataFrameTransform>
+    putDataFrameTransform: ApiMethod<RequestParams.DataFramePutDataFrameTransform>
+    start_data_frame_transform: ApiMethod<RequestParams.DataFrameStartDataFrameTransform>
+    startDataFrameTransform: ApiMethod<RequestParams.DataFrameStartDataFrameTransform>
+    stop_data_frame_transform: ApiMethod<RequestParams.DataFrameStopDataFrameTransform>
+    stopDataFrameTransform: ApiMethod<RequestParams.DataFrameStopDataFrameTransform>
+  }
   delete: ApiMethod<RequestParams.Delete>
   delete_by_query: ApiMethod<RequestParams.DeleteByQuery>
   deleteByQuery: ApiMethod<RequestParams.DeleteByQuery>
@@ -443,6 +490,8 @@ declare class Client extends EventEmitter {
     stop_job: ApiMethod<RequestParams.RollupStopJob>
     stopJob: ApiMethod<RequestParams.RollupStopJob>
   }
+  scripts_painless_context: ApiMethod<RequestParams.ScriptsPainlessContext>
+  scriptsPainlessContext: ApiMethod<RequestParams.ScriptsPainlessContext>
   scripts_painless_execute: ApiMethod<RequestParams.ScriptsPainlessExecute>
   scriptsPainlessExecute: ApiMethod<RequestParams.ScriptsPainlessExecute>
   scroll: ApiMethod<RequestParams.Scroll>
@@ -576,10 +625,12 @@ export {
   Connection,
   Serializer,
   events,
+  errors,
   ApiResponse,
   RequestEvent,
   ResurrectEvent,
   RequestParams,
   ClientOptions,
+  NodeOptions,
   ClientExtendsCallbackOptions
 };

lib/Connection.d.ts

@@ -22,13 +22,13 @@
 import { URL } from 'url';
 import { inspect, InspectOptions } from 'util';
 import * as http from 'http';
-import { SecureContextOptions } from 'tls';
+import { ConnectionOptions as TlsConnectionOptions } from 'tls';
 
 export declare type agentFn = () => any;
 
 interface ConnectionOptions {
   url: URL;
-  ssl?: SecureContextOptions;
+  ssl?: TlsConnectionOptions;
   id?: string;
   headers?: any;
   agent?: AgentOptions | agentFn;
@@ -59,7 +59,7 @@ export default class Connection {
     ML: string;
   };
   url: URL;
-  ssl: SecureContextOptions | null;
+  ssl: TlsConnectionOptions | null;
   id: string;
   headers: any;
   deadCount: number;
@@ -76,7 +76,9 @@ export default class Connection {
   setRole(role: string, enabled: boolean): Connection;
   status: string;
   buildRequestObject(params: any): http.ClientRequestArgs;
+  // @ts-ignore
   [inspect.custom](object: any, options: InspectOptions): string;
+  toJSON(): any;
 }
 
 export {};

lib/Connection.js

@@ -35,6 +35,7 @@ class Connection {
     this.ssl = opts.ssl || null
     this.id = opts.id || stripAuth(opts.url.href)
     this.headers = opts.headers || null
+    this.auth = opts.auth || { username: null, password: null }
     this.deadCount = 0
     this.resurrectTimeout = 0
 
@@ -180,6 +181,7 @@ class Connection {
 
   buildRequestObject (params) {
     const url = this.url
+    const { username, password } = this.auth
     const request = {
       protocol: url.protocol,
       hostname: url.hostname[0] === '['
@@ -191,10 +193,11 @@ class Connection {
       path: '',
       href: url.href,
       origin: url.origin,
-      port: url.port,
+      // https://github.com/elastic/elasticsearch-js/issues/843
+      port: url.port !== '' ? url.port : undefined,
       headers: this.headers,
-      auth: !!url.username === true || !!url.password === true
-        ? `${url.username}:${url.password}`
+      auth: username != null && password != null
+        ? `${username}:${password}`
         : undefined,
       agent: this.agent
     }
@@ -223,12 +226,25 @@ class Connection {
   }
 
   // Handles console.log and utils.inspect invocations.
-  // We want to hide `agent` and `ssl` since they made
+  // We want to hide `auth`, `agent` and `ssl` since they made
   // the logs very hard to read. The user can still
   // access them with `instance.agent` and `instance.ssl`.
   [inspect.custom] (depth, options) {
     return {
-      url: this.url,
+      url: stripAuth(this.url.toString()),
+      id: this.id,
+      headers: this.headers,
+      deadCount: this.deadCount,
+      resurrectTimeout: this.resurrectTimeout,
+      _openRequests: this._openRequests,
+      status: this.status,
+      roles: this.roles
+    }
+  }
+
+  toJSON () {
+    return {
+      url: stripAuth(this.url.toString()),
       id: this.id,
       headers: this.headers,
       deadCount: this.deadCount,

lib/ConnectionPool.js

@@ -222,21 +222,24 @@ class ConnectionPool {
     // we can add it to them once the connection instance has been created
     if (opts.url.username !== '' && opts.url.password !== '') {
       this._auth = {
-        username: opts.url.username,
-        password: opts.url.password
+        username: decodeURIComponent(opts.url.username),
+        password: decodeURIComponent(opts.url.password)
+      }
+      opts.auth = this._auth
+    }
+
+    if (this._auth != null) {
+      if (opts.auth == null || (opts.auth.username == null && opts.auth.password == null)) {
+        opts.auth = this._auth
+        opts.url.username = this._auth.username
+        opts.url.password = this._auth.password
       }
     }
+
     if (opts.ssl == null) opts.ssl = this._ssl
     if (opts.agent == null) opts.agent = this._agent
 
     const connection = new this.Connection(opts)
-    if (connection.url.username === '' &&
-        connection.url.password === '' &&
-        this._auth != null) {
-      connection.url.username = this._auth.username
-      connection.url.password = this._auth.password
-    }
-
     debug('Adding a new connection', connection)
     if (this.connections.has(connection.id)) {
       throw new Error(`Connection with id '${connection.id}' is already present`)

package.json

@@ -4,7 +4,7 @@
   "main": "index.js",
   "types": "index.d.ts",
   "homepage": "http://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/index.html",
-  "version": "7.0.0-rc.3",
+  "version": "7.2.0",
   "keywords": [
     "elasticsearch",
     "elastic",

scripts/generate.js

@@ -35,12 +35,12 @@ const {
 } = require('./utils')
 
 start(minimist(process.argv.slice(2), {
-  string: ['tag']
+  string: ['tag', 'branch']
 }))
 
 function start (opts) {
   const log = ora('Loading Elasticsearch Repository').start()
-  if (semver.valid(opts.tag) === null) {
+  if (opts.branch == null && semver.valid(opts.tag) === null) {
     log.fail(`Missing or invalid tag: ${opts.tag}`)
     return
   }
@@ -55,7 +55,7 @@ function start (opts) {
   log.text = 'Cleaning API folder...'
   rimraf.sync(join(apiOutputFolder, '*.js'))
 
-  cloneAndCheckout({ log, tag: opts.tag }, (err, { apiFolder, xPackFolder }) => {
+  cloneAndCheckout({ log, tag: opts.tag, branch: opts.branch }, (err, { apiFolder, xPackFolder }) => {
     if (err) {
       log.fail(err.message)
       return
@@ -69,7 +69,7 @@ function start (opts) {
 
     writeFileSync(
       requestParamsOutputFile,
-      generateRequestTypes(allSpec),
+      generateRequestTypes(opts.branch || opts.tag, allSpec),
       { encoding: 'utf8' }
     )
 
@@ -113,7 +113,7 @@ function start (opts) {
 
       const spec = require(join(apiFolder, file))
       allSpec.push(spec)
-      const code = generate(spec, common)
+      const code = generate(opts.branch || opts.tag, spec, common)
       const filePath = join(apiOutputFolder, `${file.slice(0, file.lastIndexOf('.'))}.js`)
 
       writeFileSync(filePath, code, { encoding: 'utf8' })

scripts/utils/clone-es.js

@@ -29,7 +29,7 @@ const apiFolder = join(esFolder, 'rest-api-spec', 'src', 'main', 'resources', 'r
 const xPackFolder = join(esFolder, 'x-pack', 'plugin', 'src', 'test', 'resources', 'rest-api-spec', 'api')
 
 function cloneAndCheckout (opts, callback) {
-  const { log, tag } = opts
+  const { log, tag, branch } = opts
   withTag(tag, callback)
 
   /**
@@ -57,13 +57,19 @@ function cloneAndCheckout (opts, callback) {
 
     if (fresh) {
       clone(checkout)
+    } else if (opts.branch) {
+      checkout(true)
     } else {
       checkout()
     }
 
-    function checkout () {
-      log.text = `Checking out tag '${tag}'`
-      git.checkout(tag, err => {
+    function checkout (alsoPull = false) {
+      if (branch) {
+        log.text = `Checking out branch '${branch}'`
+      } else {
+        log.text = `Checking out tag '${tag}'`
+      }
+      git.checkout(branch || tag, err => {
         if (err) {
           if (retry++ > 0) {
             callback(new Error(`Cannot checkout tag '${tag}'`), { apiFolder, xPackFolder })
@@ -71,6 +77,9 @@ function cloneAndCheckout (opts, callback) {
           }
           return pull(checkout)
         }
+        if (alsoPull) {
+          return pull(checkout)
+        }
         callback(null, { apiFolder, xPackFolder })
       })
     }

scripts/utils/generateApis.js

@@ -22,11 +22,16 @@
 'use strict'
 
 const dedent = require('dedent')
+const semver = require('semver')
 const allowedMethods = {
   noBody: ['GET', 'HEAD', 'DELETE'],
   body: ['POST', 'PUT', 'DELETE']
 }
 
+// if a parameter is depracted in a minor release
+// we should be able to support it until the next major
+const deprecatedParameters = require('./patch.json')
+
 // list of apis that does not need any kind of validation
 // because of how the url is built or the `type` handling in ES7
 const noPathValidation = [
@@ -63,7 +68,8 @@ const ndjsonApi = [
   'xpack.monitoring.bulk'
 ]
 
-function generate (spec, common) {
+function generate (version, spec, common) {
+  const release = semver.valid(version) ? semver.major(version) : version
   const api = Object.keys(spec)[0]
   const name = api
     .replace(/\.([a-z])/g, k => k[1].toUpperCase())
@@ -90,7 +96,11 @@ function generate (spec, common) {
     if (params[key].required) {
       required.push(key)
     }
+
     acceptedQuerystring.push(key)
+    if (deprecatedParameters[release] && deprecatedParameters[release][key]) {
+      acceptedQuerystring.push(deprecatedParameters[release][key])
+    }
   }
 
   for (const key in spec[api]) {

scripts/utils/generateRequestTypes.js

@@ -19,7 +19,11 @@
 
 'use strict'
 
-function generate (api) {
+const semver = require('semver')
+const deprecatedParameters = require('./patch.json')
+
+function generate (version, api) {
+  const release = semver.valid(version) ? semver.major(version) : version
   var types = `/*
  * Licensed to Elasticsearch B.V. under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -64,9 +68,20 @@ export interface Generic {
 
     const partsArr = Object.keys(parts)
       .map(k => ({ key: k, value: parts[k] }))
+    const deprecatedParametersToAdd = []
     const paramsArr = Object.keys(params)
       .filter(k => !Object.keys(parts).includes(k))
-      .map(k => ({ key: k, value: params[k] }))
+      .map(k => {
+        if (deprecatedParameters[release] && deprecatedParameters[release][k]) {
+          deprecatedParametersToAdd.push({
+            key: deprecatedParameters[release][k],
+            value: params[k]
+          })
+        }
+        return { key: k, value: params[k] }
+      })
+
+    deprecatedParametersToAdd.forEach(k => partsArr.push(k))
 
     const genLine = e => {
       const optional = e.value.required ? '' : '?'

scripts/utils/patch.json

@@ -0,0 +1,14 @@
+{
+  "6": {
+    "_source_includes": "_source_include",
+    "_source_excludes": "_source_exclude"
+  },
+  "7": {
+    "_source_includes": "_source_include",
+    "_source_excludes": "_source_exclude"
+  },
+  "master": {
+    "_source_includes": "_source_include",
+    "_source_excludes": "_source_exclude"
+  }
+}

test/integration/helper.js

@@ -26,6 +26,8 @@ const esDefaultRoles = [
   'beats_system',
   'code_admin',
   'code_user',
+  'data_frame_transforms_admin',
+  'data_frame_transforms_user',
   'ingest_admin',
   'kibana_dashboard_only_user',
   'kibana_system',

test/integration/index.js

@@ -34,6 +34,10 @@ const esFolder = join(__dirname, '..', '..', 'elasticsearch')
 const yamlFolder = join(esFolder, 'rest-api-spec', 'src', 'main', 'resources', 'rest-api-spec', 'test')
 const xPackYamlFolder = join(esFolder, 'x-pack', 'plugin', 'src', 'test', 'resources', 'rest-api-spec', 'test')
 const customSkips = [
+  // Test cat indices output for closed index (pre 7.2.0) is failing
+  'cat.indices/10_basic.yml',
+  // cluster health with closed index (pre 7.2.0) is failing
+  'cluster.health/10_basic.yml',
   // TODO: remove this once 'arbitrary_key' is implemented
   // https://github.com/elastic/elasticsearch/pull/41492
   'indices.split/30_copy_settings.yml',

test/types/index.ts

@@ -26,30 +26,47 @@ import {
   RequestEvent,
   ResurrectEvent,
   events,
-  ClientExtendsCallbackOptions
+  errors,
+  ClientExtendsCallbackOptions,
+  NodeOptions
 } from '../../index'
 
 import { TransportRequestParams, TransportRequestOptions } from '../../lib/Transport'
+import { URL } from 'url'
 
 const client = new Client({ node: 'http://localhost:9200' })
 
-client.on(events.RESPONSE, (err: Error | null, request: RequestEvent) => {
+const nodeOpts: NodeOptions = {
+  url: new URL('http://localhost:9200'),
+  id: 'winteriscoming',
+  headers: { 'foo': 'bar' },
+  roles: {
+    master: false,
+    data: true,
+    ingest: false,
+    ml: false
+  }
+}
+
+const client2 = new Client({ node: nodeOpts })
+
+client.on(events.RESPONSE, (err: errors.ElasticsearchClientError | null, request: RequestEvent) => {
   if (err) console.log(err)
   const { body, statusCode } = request
   const { params } = request.meta.request
   console.log(params, body, statusCode)
 })
-client.on(events.RESURRECT, (err: Error | null, meta: ResurrectEvent) => {})
+client.on(events.RESURRECT, (err: errors.ElasticsearchClientError | null, meta: ResurrectEvent) => {})
 
 // Callbacks
-client.info((err: Error | null, result: ApiResponse) => {})
+client.info((err: errors.ElasticsearchClientError | null, result: ApiResponse) => {})
 
 client.index({
   index: 'test',
   type: 'test',
   id: 'test',
   body: { hello: 'world' }
-}, (err: Error | null, result: ApiResponse) => {})
+}, (err: errors.ElasticsearchClientError | null, result: ApiResponse) => {})
 
 // request options
 client.index({
@@ -65,12 +82,12 @@ client.index({
   querystring: { baz: 'faz' },
   compression: 'gzip',
   asStream: false
-}, (err: Error | null, result: ApiResponse) => {})
+}, (err: errors.ElasticsearchClientError | null, result: ApiResponse) => {})
 
 // Promises
 client.info()
   .then((result: ApiResponse) => {})
-  .catch((err: Error) => {})
+  .catch((err: errors.ElasticsearchClientError) => {})
 
 client.index({
   index: 'test',
@@ -79,7 +96,7 @@ client.index({
   body: { hello: 'world' }
 })
   .then((result: ApiResponse) => {})
-  .catch((err: Error) => {})
+  .catch((err: errors.ElasticsearchClientError) => {})
 
 // request options
 client.index({
@@ -93,7 +110,7 @@ client.index({
   requestTimeout: 2000
 })
   .then((result: ApiResponse) => {})
-  .catch((err: Error) => {})
+  .catch((err: errors.ElasticsearchClientError) => {})
 
 // --- Use generics ---
 // Define the search parameters
@@ -127,7 +144,7 @@ interface Source {
 
 client.search(searchParams)
   .then((response: ApiResponse<SearchResponse<Source>>) => console.log(response))
-  .catch((err: Error) => {})
+  .catch((err: errors.ElasticsearchClientError) => {})
 
 // extend client
 client.extend('namespace.method', (options: ClientExtendsCallbackOptions) => {

test/unit/connection-pool.test.js

@@ -61,8 +61,23 @@ test('API', t => {
     t.deepEqual(pool._auth, { username: 'foo', password: 'bar' })
 
     pool.addConnection('http://localhost:9201')
-    t.strictEqual(pool.connections.get('http://localhost:9201/').url.username, 'foo')
-    t.strictEqual(pool.connections.get('http://localhost:9201/').url.password, 'bar')
+    const conn = pool.connections.get('http://localhost:9201/')
+    t.strictEqual(conn.url.username, 'foo')
+    t.strictEqual(conn.url.password, 'bar')
+    t.strictEqual(conn.auth.username, 'foo')
+    t.strictEqual(conn.auth.password, 'bar')
+    t.end()
+  })
+
+  t.test('addConnection should handle not-friendly url parameters for user and password', t => {
+    const pool = new ConnectionPool({ Connection })
+    const href = 'http://us"er:p@assword@localhost:9200/'
+    pool.addConnection(href)
+    const conn = pool.getConnection()
+    t.strictEqual(conn.url.username, 'us%22er')
+    t.strictEqual(conn.url.password, 'p%40assword')
+    t.strictEqual(conn.auth.username, 'us"er')
+    t.strictEqual(conn.auth.password, 'p@assword')
     t.end()
   })
 

test/unit/connection.test.js

@@ -526,7 +526,8 @@ test('Url with auth', t => {
 
   buildServer(handler, ({ port }, server) => {
     const connection = new Connection({
-      url: new URL(`http://foo:bar@localhost:${port}`)
+      url: new URL(`http://foo:bar@localhost:${port}`),
+      auth: { username: 'foo', password: 'bar' }
     })
     connection.request({
       path: '/hello',
@@ -722,11 +723,11 @@ test('setRole', t => {
   t.end()
 })
 
-test('Util.inspect Connection class should hide agent and ssl', t => {
+test('Util.inspect Connection class should hide agent, ssl and auth', t => {
   t.plan(1)
 
   const connection = new Connection({
-    url: new URL('http://localhost:9200'),
+    url: new URL('http://user:password@localhost:9200'),
     id: 'node-id',
     headers: { foo: 'bar' }
   })
@@ -740,20 +741,7 @@ test('Util.inspect Connection class should hide agent and ssl', t => {
       .replace(/(\r\n|\n|\r)/gm, '')
   }
 
-  t.strictEqual(cleanStr(inspect(connection)), cleanStr(`{ url:
-   URL {
-     href: 'http://localhost:9200/',
-     origin: 'http://localhost:9200',
-     protocol: 'http:',
-     username: '',
-     password: '',
-     host: 'localhost:9200',
-     hostname: 'localhost',
-     port: '9200',
-     pathname: '/',
-     search: '',
-     searchParams: URLSearchParams {},
-     hash: '' },
+  t.strictEqual(cleanStr(inspect(connection)), cleanStr(`{ url: 'http://localhost:9200/',
   id: 'node-id',
   headers: { foo: 'bar' },
   deadCount: 0,
@@ -763,3 +751,75 @@ test('Util.inspect Connection class should hide agent and ssl', t => {
   roles: { master: true, data: true, ingest: true, ml: false } }`)
   )
 })
+
+test('connection.toJSON should hide agent, ssl and auth', t => {
+  t.plan(1)
+
+  const connection = new Connection({
+    url: new URL('http://user:password@localhost:9200'),
+    id: 'node-id',
+    headers: { foo: 'bar' }
+  })
+
+  t.deepEqual(connection.toJSON(), {
+    url: 'http://localhost:9200/',
+    id: 'node-id',
+    headers: {
+      foo: 'bar'
+    },
+    deadCount: 0,
+    resurrectTimeout: 0,
+    _openRequests: 0,
+    status: 'alive',
+    roles: {
+      master: true,
+      data: true,
+      ingest: true,
+      ml: false
+    }
+  })
+})
+
+// https://github.com/elastic/elasticsearch-js/issues/843
+test('Port handling', t => {
+  t.test('http 80', t => {
+    const connection = new Connection({
+      url: new URL('http://localhost:80')
+    })
+
+    t.strictEqual(
+      connection.buildRequestObject({}).port,
+      undefined
+    )
+
+    t.end()
+  })
+
+  t.test('https 443', t => {
+    const connection = new Connection({
+      url: new URL('https://localhost:443')
+    })
+
+    t.strictEqual(
+      connection.buildRequestObject({}).port,
+      undefined
+    )
+
+    t.end()
+  })
+
+  t.end()
+})
+
+test('Should not add agent and ssl to the serialized connection', t => {
+  const connection = new Connection({
+    url: new URL('http://localhost:9200')
+  })
+
+  t.strictEqual(
+    JSON.stringify(connection),
+    '{"url":"http://localhost:9200/","id":"http://localhost:9200/","headers":null,"deadCount":0,"resurrectTimeout":0,"_openRequests":0,"status":"alive","roles":{"master":true,"data":true,"ingest":true,"ml":false}}'
+  )
+
+  t.end()
+})