From c1eadd6e88342b318a9b2b4b1996b2cc05a2a817 Mon Sep 17 00:00:00 2001 From: Tomas Della Vedova Date: Fri, 3 May 2019 19:02:10 +0200 Subject: [PATCH] Simplify API wrappers (#839) * Updated code generation * API generation * Updated test * Updated code generation * API generation * API generation --- api/api/bulk.js | 44 ++------ api/api/cat.aliases.js | 44 ++------ api/api/cat.allocation.js | 44 ++------ api/api/cat.count.js | 44 ++------ api/api/cat.fielddata.js | 44 ++------ api/api/cat.health.js | 44 ++------ api/api/cat.help.js | 44 ++------ api/api/cat.indices.js | 44 ++------ api/api/cat.master.js | 44 ++------ api/api/cat.nodeattrs.js | 44 ++------ api/api/cat.nodes.js | 44 ++------ api/api/cat.pending_tasks.js | 44 ++------ api/api/cat.plugins.js | 44 ++------ api/api/cat.recovery.js | 44 ++------ api/api/cat.repositories.js | 44 ++------ api/api/cat.segments.js | 44 ++------ api/api/cat.shards.js | 44 ++------ api/api/cat.snapshots.js | 44 ++------ api/api/cat.tasks.js | 44 ++------ api/api/cat.templates.js | 44 ++------ api/api/cat.thread_pool.js | 44 ++------ api/api/ccr.delete_auto_follow_pattern.js | 44 ++------ api/api/ccr.follow.js | 44 ++------ api/api/ccr.follow_info.js | 44 ++------ api/api/ccr.follow_stats.js | 44 ++------ api/api/ccr.forget_follower.js | 44 ++------ api/api/ccr.get_auto_follow_pattern.js | 44 ++------ api/api/ccr.pause_follow.js | 44 ++------ api/api/ccr.put_auto_follow_pattern.js | 44 ++------ api/api/ccr.resume_follow.js | 44 ++------ api/api/ccr.stats.js | 44 ++------ api/api/ccr.unfollow.js | 44 ++------ api/api/clear_scroll.js | 44 ++------ api/api/cluster.allocation_explain.js | 44 ++------ api/api/cluster.get_settings.js | 44 ++------ api/api/cluster.health.js | 44 ++------ api/api/cluster.pending_tasks.js | 44 ++------ api/api/cluster.put_settings.js | 44 ++------ api/api/cluster.remote_info.js | 44 ++------ api/api/cluster.reroute.js | 44 ++------ api/api/cluster.state.js | 44 ++------ api/api/cluster.stats.js | 44 ++------ api/api/count.js | 44 ++------ api/api/create.js | 44 ++------ .../data_frame.delete_data_frame_transform.js | 100 +++++++++++++++++ .../data_frame.get_data_frame_transform.js | 103 +++++++++++++++++ ...ta_frame.get_data_frame_transform_stats.js | 99 +++++++++++++++++ .../data_frame.put_data_frame_transform.js | 101 +++++++++++++++++ .../data_frame.start_data_frame_transform.js | 101 +++++++++++++++++ .../data_frame.stop_data_frame_transform.js | 104 ++++++++++++++++++ api/api/delete.js | 44 ++------ api/api/delete_by_query.js | 44 ++------ api/api/delete_by_query_rethrottle.js | 44 ++------ api/api/delete_script.js | 44 ++------ api/api/exists.js | 44 ++------ api/api/exists_source.js | 44 ++------ api/api/explain.js | 44 ++------ api/api/field_caps.js | 44 ++------ api/api/get.js | 44 ++------ api/api/get_script.js | 44 ++------ api/api/get_source.js | 44 ++------ api/api/ilm.delete_lifecycle.js | 44 ++------ api/api/ilm.explain_lifecycle.js | 44 ++------ api/api/ilm.get_lifecycle.js | 44 ++------ api/api/ilm.get_status.js | 44 ++------ api/api/ilm.move_to_step.js | 44 ++------ api/api/ilm.put_lifecycle.js | 44 ++------ api/api/ilm.remove_policy.js | 44 ++------ api/api/ilm.retry.js | 44 ++------ api/api/ilm.start.js | 44 ++------ api/api/ilm.stop.js | 44 ++------ api/api/index.js | 44 ++------ api/api/indices.analyze.js | 44 ++------ api/api/indices.clear_cache.js | 44 ++------ api/api/indices.close.js | 44 ++------ api/api/indices.create.js | 44 ++------ api/api/indices.delete.js | 44 ++------ api/api/indices.delete_alias.js | 44 ++------ api/api/indices.delete_template.js | 44 ++------ api/api/indices.exists.js | 44 ++------ api/api/indices.exists_alias.js | 44 ++------ api/api/indices.exists_template.js | 44 ++------ api/api/indices.exists_type.js | 44 ++------ api/api/indices.flush.js | 44 ++------ api/api/indices.flush_synced.js | 44 ++------ api/api/indices.forcemerge.js | 44 ++------ api/api/indices.freeze.js | 44 ++------ api/api/indices.get.js | 44 ++------ api/api/indices.get_alias.js | 44 ++------ api/api/indices.get_field_mapping.js | 44 ++------ api/api/indices.get_mapping.js | 44 ++------ api/api/indices.get_settings.js | 44 ++------ api/api/indices.get_template.js | 44 ++------ api/api/indices.get_upgrade.js | 44 ++------ api/api/indices.open.js | 44 ++------ api/api/indices.put_alias.js | 44 ++------ api/api/indices.put_mapping.js | 44 ++------ api/api/indices.put_settings.js | 44 ++------ api/api/indices.put_template.js | 44 ++------ api/api/indices.recovery.js | 44 ++------ api/api/indices.refresh.js | 44 ++------ api/api/indices.rollover.js | 44 ++------ api/api/indices.segments.js | 44 ++------ api/api/indices.shard_stores.js | 44 ++------ api/api/indices.shrink.js | 44 ++------ api/api/indices.split.js | 44 ++------ api/api/indices.stats.js | 44 ++------ api/api/indices.unfreeze.js | 44 ++------ api/api/indices.update_aliases.js | 44 ++------ api/api/indices.upgrade.js | 44 ++------ api/api/indices.validate_query.js | 44 ++------ api/api/info.js | 44 ++------ api/api/ingest.delete_pipeline.js | 44 ++------ api/api/ingest.get_pipeline.js | 44 ++------ api/api/ingest.processor_grok.js | 44 ++------ api/api/ingest.put_pipeline.js | 44 ++------ api/api/ingest.simulate.js | 44 ++------ api/api/mget.js | 44 ++------ api/api/msearch.js | 44 ++------ api/api/msearch_template.js | 44 ++------ api/api/mtermvectors.js | 44 ++------ api/api/nodes.hot_threads.js | 44 ++------ api/api/nodes.info.js | 44 ++------ api/api/nodes.reload_secure_settings.js | 44 ++------ api/api/nodes.stats.js | 44 ++------ api/api/nodes.usage.js | 44 ++------ api/api/ping.js | 44 ++------ api/api/put_script.js | 44 ++------ api/api/rank_eval.js | 44 ++------ api/api/reindex.js | 44 ++------ api/api/reindex_rethrottle.js | 44 ++------ api/api/render_search_template.js | 44 ++------ api/api/scripts_painless_context.js | 96 ++++++++++++++++ api/api/scripts_painless_execute.js | 44 ++------ api/api/scroll.js | 44 ++------ api/api/search.js | 44 ++------ api/api/search_shards.js | 44 ++------ api/api/search_template.js | 44 ++------ api/api/security.create_api_key.js | 44 ++------ api/api/security.get_api_key.js | 44 ++------ api/api/security.invalidate_api_key.js | 44 ++------ api/api/snapshot.create.js | 44 ++------ api/api/snapshot.create_repository.js | 44 ++------ api/api/snapshot.delete.js | 44 ++------ api/api/snapshot.delete_repository.js | 44 ++------ api/api/snapshot.get.js | 44 ++------ api/api/snapshot.get_repository.js | 44 ++------ api/api/snapshot.restore.js | 44 ++------ api/api/snapshot.status.js | 44 ++------ api/api/snapshot.verify_repository.js | 44 ++------ api/api/tasks.cancel.js | 44 ++------ api/api/tasks.get.js | 44 ++------ api/api/tasks.list.js | 44 ++------ api/api/termvectors.js | 44 ++------ api/api/update.js | 44 ++------ api/api/update_by_query.js | 44 ++------ api/api/update_by_query_rethrottle.js | 44 ++------ api/api/xpack.graph.explore.js | 44 ++------ api/api/xpack.info.js | 44 ++------ api/api/xpack.license.delete.js | 44 ++------ api/api/xpack.license.get.js | 44 ++------ api/api/xpack.license.get_basic_status.js | 44 ++------ api/api/xpack.license.get_trial_status.js | 44 ++------ api/api/xpack.license.post.js | 44 ++------ api/api/xpack.license.post_start_basic.js | 44 ++------ api/api/xpack.license.post_start_trial.js | 44 ++------ api/api/xpack.migration.deprecations.js | 44 ++------ api/api/xpack.migration.upgrade.js | 44 ++------ api/api/xpack.ml.close_job.js | 44 ++------ api/api/xpack.ml.delete_calendar.js | 44 ++------ api/api/xpack.ml.delete_calendar_event.js | 44 ++------ api/api/xpack.ml.delete_calendar_job.js | 44 ++------ api/api/xpack.ml.delete_datafeed.js | 44 ++------ api/api/xpack.ml.delete_expired_data.js | 44 ++------ api/api/xpack.ml.delete_filter.js | 44 ++------ api/api/xpack.ml.delete_forecast.js | 44 ++------ api/api/xpack.ml.delete_job.js | 44 ++------ api/api/xpack.ml.delete_model_snapshot.js | 44 ++------ api/api/xpack.ml.find_file_structure.js | 44 ++------ api/api/xpack.ml.flush_job.js | 44 ++------ api/api/xpack.ml.forecast.js | 44 ++------ api/api/xpack.ml.get_buckets.js | 44 ++------ api/api/xpack.ml.get_calendar_events.js | 44 ++------ api/api/xpack.ml.get_calendars.js | 44 ++------ api/api/xpack.ml.get_categories.js | 44 ++------ api/api/xpack.ml.get_datafeed_stats.js | 44 ++------ api/api/xpack.ml.get_datafeeds.js | 44 ++------ api/api/xpack.ml.get_filters.js | 44 ++------ api/api/xpack.ml.get_influencers.js | 44 ++------ api/api/xpack.ml.get_job_stats.js | 44 ++------ api/api/xpack.ml.get_jobs.js | 44 ++------ api/api/xpack.ml.get_model_snapshots.js | 44 ++------ api/api/xpack.ml.get_overall_buckets.js | 44 ++------ api/api/xpack.ml.get_records.js | 44 ++------ api/api/xpack.ml.info.js | 44 ++------ api/api/xpack.ml.open_job.js | 44 ++------ api/api/xpack.ml.post_calendar_events.js | 44 ++------ api/api/xpack.ml.post_data.js | 44 ++------ api/api/xpack.ml.preview_datafeed.js | 44 ++------ api/api/xpack.ml.put_calendar.js | 44 ++------ api/api/xpack.ml.put_calendar_job.js | 44 ++------ api/api/xpack.ml.put_datafeed.js | 44 ++------ api/api/xpack.ml.put_filter.js | 44 ++------ api/api/xpack.ml.put_job.js | 44 ++------ api/api/xpack.ml.revert_model_snapshot.js | 44 ++------ api/api/xpack.ml.set_upgrade_mode.js | 44 ++------ api/api/xpack.ml.start_datafeed.js | 44 ++------ api/api/xpack.ml.stop_datafeed.js | 44 ++------ api/api/xpack.ml.update_datafeed.js | 44 ++------ api/api/xpack.ml.update_filter.js | 44 ++------ api/api/xpack.ml.update_job.js | 44 ++------ api/api/xpack.ml.update_model_snapshot.js | 44 ++------ api/api/xpack.ml.validate.js | 44 ++------ api/api/xpack.ml.validate_detector.js | 44 ++------ api/api/xpack.monitoring.bulk.js | 44 ++------ api/api/xpack.rollup.delete_job.js | 44 ++------ api/api/xpack.rollup.get_jobs.js | 44 ++------ api/api/xpack.rollup.get_rollup_caps.js | 44 ++------ api/api/xpack.rollup.get_rollup_index_caps.js | 44 ++------ api/api/xpack.rollup.put_job.js | 44 ++------ api/api/xpack.rollup.rollup_search.js | 44 ++------ api/api/xpack.rollup.start_job.js | 44 ++------ api/api/xpack.rollup.stop_job.js | 44 ++------ api/api/xpack.security.authenticate.js | 44 ++------ api/api/xpack.security.change_password.js | 44 ++------ api/api/xpack.security.clear_cached_realms.js | 44 ++------ api/api/xpack.security.clear_cached_roles.js | 44 ++------ api/api/xpack.security.delete_privileges.js | 44 ++------ api/api/xpack.security.delete_role.js | 44 ++------ api/api/xpack.security.delete_role_mapping.js | 44 ++------ api/api/xpack.security.delete_user.js | 44 ++------ api/api/xpack.security.disable_user.js | 44 ++------ api/api/xpack.security.enable_user.js | 44 ++------ api/api/xpack.security.get_privileges.js | 44 ++------ api/api/xpack.security.get_role.js | 44 ++------ api/api/xpack.security.get_role_mapping.js | 44 ++------ api/api/xpack.security.get_token.js | 44 ++------ api/api/xpack.security.get_user.js | 44 ++------ api/api/xpack.security.get_user_privileges.js | 44 ++------ api/api/xpack.security.has_privileges.js | 44 ++------ api/api/xpack.security.invalidate_token.js | 44 ++------ api/api/xpack.security.put_privileges.js | 44 ++------ api/api/xpack.security.put_role.js | 44 ++------ api/api/xpack.security.put_role_mapping.js | 44 ++------ api/api/xpack.security.put_user.js | 44 ++------ api/api/xpack.sql.clear_cursor.js | 44 ++------ api/api/xpack.sql.query.js | 44 ++------ api/api/xpack.sql.translate.js | 44 ++------ api/api/xpack.ssl.certificates.js | 44 ++------ api/api/xpack.usage.js | 44 ++------ api/api/xpack.watcher.ack_watch.js | 44 ++------ api/api/xpack.watcher.activate_watch.js | 44 ++------ api/api/xpack.watcher.deactivate_watch.js | 44 ++------ api/api/xpack.watcher.delete_watch.js | 44 ++------ api/api/xpack.watcher.execute_watch.js | 44 ++------ api/api/xpack.watcher.get_watch.js | 44 ++------ api/api/xpack.watcher.put_watch.js | 44 ++------ api/api/xpack.watcher.start.js | 44 ++------ api/api/xpack.watcher.stats.js | 44 ++------ api/api/xpack.watcher.stop.js | 44 ++------ api/index.js | 14 +++ scripts/utils/generateApis.js | 44 ++------ scripts/utils/generateMain.js | 14 +++ test/unit/events.test.js | 28 +---- 264 files changed, 2770 insertions(+), 9166 deletions(-) create mode 100644 api/api/data_frame.delete_data_frame_transform.js create mode 100644 api/api/data_frame.get_data_frame_transform.js create mode 100644 api/api/data_frame.get_data_frame_transform_stats.js create mode 100644 api/api/data_frame.put_data_frame_transform.js create mode 100644 api/api/data_frame.start_data_frame_transform.js create mode 100644 api/api/data_frame.stop_data_frame_transform.js create mode 100644 api/api/scripts_painless_context.js diff --git a/api/api/bulk.js b/api/api/bulk.js index 9a82a85f2..40f702d9d 100644 --- a/api/api/bulk.js +++ b/api/api/bulk.js @@ -24,7 +24,7 @@ function buildBulk (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [bulk](http://www.elastic.co/guide/en/elasticsearch/reference/master/docs-bulk.html) request * @@ -99,17 +99,17 @@ function buildBulk (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index, type } = params - var querystring = semicopy(params, ['method', 'body', 'index', 'type']) + var warnings = [] + var { method, body, index, type, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -130,36 +130,8 @@ function buildBulk (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/cat.aliases.js b/api/api/cat.aliases.js index 2b7ef3bc3..c5dd54002 100644 --- a/api/api/cat.aliases.js +++ b/api/api/cat.aliases.js @@ -24,7 +24,7 @@ function buildCatAliases (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [cat.aliases](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-alias.html) request * @@ -83,17 +83,17 @@ function buildCatAliases (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, name } = params - var querystring = semicopy(params, ['method', 'body', 'name']) + var warnings = [] + var { method, body, name, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -112,36 +112,8 @@ function buildCatAliases (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/cat.allocation.js b/api/api/cat.allocation.js index f7118efea..0813c9adf 100644 --- a/api/api/cat.allocation.js +++ b/api/api/cat.allocation.js @@ -24,7 +24,7 @@ function buildCatAllocation (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [cat.allocation](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-allocation.html) request * @@ -85,17 +85,17 @@ function buildCatAllocation (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, nodeId, node_id } = params - var querystring = semicopy(params, ['method', 'body', 'nodeId', 'node_id']) + var warnings = [] + var { method, body, nodeId, node_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -114,36 +114,8 @@ function buildCatAllocation (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/cat.count.js b/api/api/cat.count.js index cdb1c2ccd..79e6ba665 100644 --- a/api/api/cat.count.js +++ b/api/api/cat.count.js @@ -24,7 +24,7 @@ function buildCatCount (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [cat.count](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-count.html) request * @@ -83,17 +83,17 @@ function buildCatCount (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index } = params - var querystring = semicopy(params, ['method', 'body', 'index']) + var warnings = [] + var { method, body, index, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -112,36 +112,8 @@ function buildCatCount (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/cat.fielddata.js b/api/api/cat.fielddata.js index d1e22cf0a..2871e8276 100644 --- a/api/api/cat.fielddata.js +++ b/api/api/cat.fielddata.js @@ -24,7 +24,7 @@ function buildCatFielddata (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [cat.fielddata](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-fielddata.html) request * @@ -87,17 +87,17 @@ function buildCatFielddata (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, fields } = params - var querystring = semicopy(params, ['method', 'body', 'fields']) + var warnings = [] + var { method, body, fields, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -116,36 +116,8 @@ function buildCatFielddata (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/cat.health.js b/api/api/cat.health.js index 827ebd276..ee9088774 100644 --- a/api/api/cat.health.js +++ b/api/api/cat.health.js @@ -24,7 +24,7 @@ function buildCatHealth (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [cat.health](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-health.html) request * @@ -84,17 +84,17 @@ function buildCatHealth (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -109,36 +109,8 @@ function buildCatHealth (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/cat.help.js b/api/api/cat.help.js index 2f744f49d..3129b9892 100644 --- a/api/api/cat.help.js +++ b/api/api/cat.help.js @@ -24,7 +24,7 @@ function buildCatHelp (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [cat.help](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat.html) request * @@ -71,17 +71,17 @@ function buildCatHelp (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -96,36 +96,8 @@ function buildCatHelp (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/cat.indices.js b/api/api/cat.indices.js index 12b7823be..9b7b8a924 100644 --- a/api/api/cat.indices.js +++ b/api/api/cat.indices.js @@ -24,7 +24,7 @@ function buildCatIndices (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [cat.indices](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-indices.html) request * @@ -89,17 +89,17 @@ function buildCatIndices (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index } = params - var querystring = semicopy(params, ['method', 'body', 'index']) + var warnings = [] + var { method, body, index, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -118,36 +118,8 @@ function buildCatIndices (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/cat.master.js b/api/api/cat.master.js index 6ea1ef531..859eaa3a0 100644 --- a/api/api/cat.master.js +++ b/api/api/cat.master.js @@ -24,7 +24,7 @@ function buildCatMaster (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [cat.master](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-master.html) request * @@ -82,17 +82,17 @@ function buildCatMaster (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -107,36 +107,8 @@ function buildCatMaster (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/cat.nodeattrs.js b/api/api/cat.nodeattrs.js index 66995d45c..94b6c5a03 100644 --- a/api/api/cat.nodeattrs.js +++ b/api/api/cat.nodeattrs.js @@ -24,7 +24,7 @@ function buildCatNodeattrs (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [cat.nodeattrs](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-nodeattrs.html) request * @@ -82,17 +82,17 @@ function buildCatNodeattrs (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -107,36 +107,8 @@ function buildCatNodeattrs (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/cat.nodes.js b/api/api/cat.nodes.js index 21f27a517..024a85d9c 100644 --- a/api/api/cat.nodes.js +++ b/api/api/cat.nodes.js @@ -24,7 +24,7 @@ function buildCatNodes (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [cat.nodes](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-nodes.html) request * @@ -85,17 +85,17 @@ function buildCatNodes (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -110,36 +110,8 @@ function buildCatNodes (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/cat.pending_tasks.js b/api/api/cat.pending_tasks.js index 920a77e47..399fa8df0 100644 --- a/api/api/cat.pending_tasks.js +++ b/api/api/cat.pending_tasks.js @@ -24,7 +24,7 @@ function buildCatPendingTasks (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [cat.pending_tasks](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-pending-tasks.html) request * @@ -82,17 +82,17 @@ function buildCatPendingTasks (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -107,36 +107,8 @@ function buildCatPendingTasks (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/cat.plugins.js b/api/api/cat.plugins.js index e254ddb3b..accfcd225 100644 --- a/api/api/cat.plugins.js +++ b/api/api/cat.plugins.js @@ -24,7 +24,7 @@ function buildCatPlugins (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [cat.plugins](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-plugins.html) request * @@ -82,17 +82,17 @@ function buildCatPlugins (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -107,36 +107,8 @@ function buildCatPlugins (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/cat.recovery.js b/api/api/cat.recovery.js index 27938674a..1e2673d45 100644 --- a/api/api/cat.recovery.js +++ b/api/api/cat.recovery.js @@ -24,7 +24,7 @@ function buildCatRecovery (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [cat.recovery](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-recovery.html) request * @@ -83,17 +83,17 @@ function buildCatRecovery (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index } = params - var querystring = semicopy(params, ['method', 'body', 'index']) + var warnings = [] + var { method, body, index, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -112,36 +112,8 @@ function buildCatRecovery (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/cat.repositories.js b/api/api/cat.repositories.js index d4801efc9..a5fccaf72 100644 --- a/api/api/cat.repositories.js +++ b/api/api/cat.repositories.js @@ -24,7 +24,7 @@ function buildCatRepositories (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [cat.repositories](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-repositories.html) request * @@ -82,17 +82,17 @@ function buildCatRepositories (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -107,36 +107,8 @@ function buildCatRepositories (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/cat.segments.js b/api/api/cat.segments.js index 9e2415c34..80289fab2 100644 --- a/api/api/cat.segments.js +++ b/api/api/cat.segments.js @@ -24,7 +24,7 @@ function buildCatSegments (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [cat.segments](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-segments.html) request * @@ -80,17 +80,17 @@ function buildCatSegments (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index } = params - var querystring = semicopy(params, ['method', 'body', 'index']) + var warnings = [] + var { method, body, index, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -109,36 +109,8 @@ function buildCatSegments (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/cat.shards.js b/api/api/cat.shards.js index 15031236f..8a558a3f6 100644 --- a/api/api/cat.shards.js +++ b/api/api/cat.shards.js @@ -24,7 +24,7 @@ function buildCatShards (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [cat.shards](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-shards.html) request * @@ -85,17 +85,17 @@ function buildCatShards (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index } = params - var querystring = semicopy(params, ['method', 'body', 'index']) + var warnings = [] + var { method, body, index, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -114,36 +114,8 @@ function buildCatShards (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/cat.snapshots.js b/api/api/cat.snapshots.js index 94ead6ac4..dd13a1a3b 100644 --- a/api/api/cat.snapshots.js +++ b/api/api/cat.snapshots.js @@ -24,7 +24,7 @@ function buildCatSnapshots (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [cat.snapshots](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-snapshots.html) request * @@ -84,17 +84,17 @@ function buildCatSnapshots (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, repository } = params - var querystring = semicopy(params, ['method', 'body', 'repository']) + var warnings = [] + var { method, body, repository, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -113,36 +113,8 @@ function buildCatSnapshots (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/cat.tasks.js b/api/api/cat.tasks.js index e478ccc7e..7de46c56a 100644 --- a/api/api/cat.tasks.js +++ b/api/api/cat.tasks.js @@ -24,7 +24,7 @@ function buildCatTasks (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [cat.tasks](http://www.elastic.co/guide/en/elasticsearch/reference/master/tasks.html) request * @@ -87,17 +87,17 @@ function buildCatTasks (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -112,36 +112,8 @@ function buildCatTasks (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/cat.templates.js b/api/api/cat.templates.js index 432e1d28d..13ab47f23 100644 --- a/api/api/cat.templates.js +++ b/api/api/cat.templates.js @@ -24,7 +24,7 @@ function buildCatTemplates (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [cat.templates](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-templates.html) request * @@ -83,17 +83,17 @@ function buildCatTemplates (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, name } = params - var querystring = semicopy(params, ['method', 'body', 'name']) + var warnings = [] + var { method, body, name, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -112,36 +112,8 @@ function buildCatTemplates (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/cat.thread_pool.js b/api/api/cat.thread_pool.js index 49d7078f8..d1dcde6f1 100644 --- a/api/api/cat.thread_pool.js +++ b/api/api/cat.thread_pool.js @@ -24,7 +24,7 @@ function buildCatThreadPool (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [cat.thread_pool](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-thread-pool.html) request * @@ -85,17 +85,17 @@ function buildCatThreadPool (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, threadPoolPatterns, thread_pool_patterns } = params - var querystring = semicopy(params, ['method', 'body', 'threadPoolPatterns', 'thread_pool_patterns']) + var warnings = [] + var { method, body, threadPoolPatterns, thread_pool_patterns, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -114,36 +114,8 @@ function buildCatThreadPool (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/ccr.delete_auto_follow_pattern.js b/api/api/ccr.delete_auto_follow_pattern.js index f5241c473..d9d8dbf8c 100644 --- a/api/api/ccr.delete_auto_follow_pattern.js +++ b/api/api/ccr.delete_auto_follow_pattern.js @@ -24,7 +24,7 @@ function buildCcrDeleteAutoFollowPattern (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [ccr.delete_auto_follow_pattern](https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-delete-auto-follow-pattern.html) request * @@ -63,17 +63,17 @@ function buildCcrDeleteAutoFollowPattern (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, name } = params - var querystring = semicopy(params, ['method', 'body', 'name']) + var warnings = [] + var { method, body, name, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'DELETE' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -88,36 +88,8 @@ function buildCcrDeleteAutoFollowPattern (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/ccr.follow.js b/api/api/ccr.follow.js index 9ee3158c6..f98f46dab 100644 --- a/api/api/ccr.follow.js +++ b/api/api/ccr.follow.js @@ -24,7 +24,7 @@ function buildCcrFollow (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [ccr.follow](https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-put-follow.html) request * @@ -69,17 +69,17 @@ function buildCcrFollow (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index } = params - var querystring = semicopy(params, ['method', 'body', 'index']) + var warnings = [] + var { method, body, index, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'PUT' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -94,36 +94,8 @@ function buildCcrFollow (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/ccr.follow_info.js b/api/api/ccr.follow_info.js index 1e8040461..2599c47eb 100644 --- a/api/api/ccr.follow_info.js +++ b/api/api/ccr.follow_info.js @@ -24,7 +24,7 @@ function buildCcrFollowInfo (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [ccr.follow_info](https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-get-follow-info.html) request * @@ -57,17 +57,17 @@ function buildCcrFollowInfo (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index } = params - var querystring = semicopy(params, ['method', 'body', 'index']) + var warnings = [] + var { method, body, index, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -82,36 +82,8 @@ function buildCcrFollowInfo (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/ccr.follow_stats.js b/api/api/ccr.follow_stats.js index 1e68f4216..a04db5cfa 100644 --- a/api/api/ccr.follow_stats.js +++ b/api/api/ccr.follow_stats.js @@ -24,7 +24,7 @@ function buildCcrFollowStats (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [ccr.follow_stats](https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-get-follow-stats.html) request * @@ -57,17 +57,17 @@ function buildCcrFollowStats (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index } = params - var querystring = semicopy(params, ['method', 'body', 'index']) + var warnings = [] + var { method, body, index, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -82,36 +82,8 @@ function buildCcrFollowStats (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/ccr.forget_follower.js b/api/api/ccr.forget_follower.js index db17668a5..a13fed2f7 100644 --- a/api/api/ccr.forget_follower.js +++ b/api/api/ccr.forget_follower.js @@ -24,7 +24,7 @@ function buildCcrForgetFollower (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [ccr.forget_follower](http://www.elastic.co/guide/en/elasticsearch/reference/current) request * @@ -68,17 +68,17 @@ function buildCcrForgetFollower (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index } = params - var querystring = semicopy(params, ['method', 'body', 'index']) + var warnings = [] + var { method, body, index, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -93,36 +93,8 @@ function buildCcrForgetFollower (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/ccr.get_auto_follow_pattern.js b/api/api/ccr.get_auto_follow_pattern.js index 577e229ac..4408c4fc9 100644 --- a/api/api/ccr.get_auto_follow_pattern.js +++ b/api/api/ccr.get_auto_follow_pattern.js @@ -24,7 +24,7 @@ function buildCcrGetAutoFollowPattern (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [ccr.get_auto_follow_pattern](https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-get-auto-follow-pattern.html) request * @@ -57,17 +57,17 @@ function buildCcrGetAutoFollowPattern (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, name } = params - var querystring = semicopy(params, ['method', 'body', 'name']) + var warnings = [] + var { method, body, name, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -86,36 +86,8 @@ function buildCcrGetAutoFollowPattern (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/ccr.pause_follow.js b/api/api/ccr.pause_follow.js index 462e30be4..36038853a 100644 --- a/api/api/ccr.pause_follow.js +++ b/api/api/ccr.pause_follow.js @@ -24,7 +24,7 @@ function buildCcrPauseFollow (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [ccr.pause_follow](https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-post-pause-follow.html) request * @@ -63,17 +63,17 @@ function buildCcrPauseFollow (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index } = params - var querystring = semicopy(params, ['method', 'body', 'index']) + var warnings = [] + var { method, body, index, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -88,36 +88,8 @@ function buildCcrPauseFollow (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/ccr.put_auto_follow_pattern.js b/api/api/ccr.put_auto_follow_pattern.js index 0f2691714..c01ceeeae 100644 --- a/api/api/ccr.put_auto_follow_pattern.js +++ b/api/api/ccr.put_auto_follow_pattern.js @@ -24,7 +24,7 @@ function buildCcrPutAutoFollowPattern (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [ccr.put_auto_follow_pattern](https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-put-auto-follow-pattern.html) request * @@ -68,17 +68,17 @@ function buildCcrPutAutoFollowPattern (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, name } = params - var querystring = semicopy(params, ['method', 'body', 'name']) + var warnings = [] + var { method, body, name, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'PUT' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -93,36 +93,8 @@ function buildCcrPutAutoFollowPattern (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/ccr.resume_follow.js b/api/api/ccr.resume_follow.js index 36c666531..6a55c779d 100644 --- a/api/api/ccr.resume_follow.js +++ b/api/api/ccr.resume_follow.js @@ -24,7 +24,7 @@ function buildCcrResumeFollow (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [ccr.resume_follow](https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-post-resume-follow.html) request * @@ -64,17 +64,17 @@ function buildCcrResumeFollow (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index } = params - var querystring = semicopy(params, ['method', 'body', 'index']) + var warnings = [] + var { method, body, index, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -89,36 +89,8 @@ function buildCcrResumeFollow (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/ccr.stats.js b/api/api/ccr.stats.js index 3f1d9bc39..4297da6c7 100644 --- a/api/api/ccr.stats.js +++ b/api/api/ccr.stats.js @@ -24,7 +24,7 @@ function buildCcrStats (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [ccr.stats](https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-get-stats.html) request * @@ -56,17 +56,17 @@ function buildCcrStats (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -81,36 +81,8 @@ function buildCcrStats (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/ccr.unfollow.js b/api/api/ccr.unfollow.js index 43c1ba4b1..50601072b 100644 --- a/api/api/ccr.unfollow.js +++ b/api/api/ccr.unfollow.js @@ -24,7 +24,7 @@ function buildCcrUnfollow (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [ccr.unfollow](http://www.elastic.co/guide/en/elasticsearch/reference/current) request * @@ -63,17 +63,17 @@ function buildCcrUnfollow (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index } = params - var querystring = semicopy(params, ['method', 'body', 'index']) + var warnings = [] + var { method, body, index, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -88,36 +88,8 @@ function buildCcrUnfollow (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/clear_scroll.js b/api/api/clear_scroll.js index 8f17c4dc3..7d02162ad 100644 --- a/api/api/clear_scroll.js +++ b/api/api/clear_scroll.js @@ -24,7 +24,7 @@ function buildClearScroll (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [clear_scroll](http://www.elastic.co/guide/en/elasticsearch/reference/master/search-request-scroll.html) request * @@ -63,17 +63,17 @@ function buildClearScroll (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, scrollId, scroll_id } = params - var querystring = semicopy(params, ['method', 'body', 'scrollId', 'scroll_id']) + var warnings = [] + var { method, body, scrollId, scroll_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'DELETE' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -92,36 +92,8 @@ function buildClearScroll (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/cluster.allocation_explain.js b/api/api/cluster.allocation_explain.js index 4e7155e30..f7d18de2c 100644 --- a/api/api/cluster.allocation_explain.js +++ b/api/api/cluster.allocation_explain.js @@ -24,7 +24,7 @@ function buildClusterAllocationExplain (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [cluster.allocation_explain](http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-allocation-explain.html) request * @@ -68,17 +68,17 @@ function buildClusterAllocationExplain (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = body == null ? 'GET' : 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -93,36 +93,8 @@ function buildClusterAllocationExplain (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/cluster.get_settings.js b/api/api/cluster.get_settings.js index f9722e0b9..7bf393d80 100644 --- a/api/api/cluster.get_settings.js +++ b/api/api/cluster.get_settings.js @@ -24,7 +24,7 @@ function buildClusterGetSettings (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [cluster.get_settings](http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-update-settings.html) request * @@ -78,17 +78,17 @@ function buildClusterGetSettings (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -103,36 +103,8 @@ function buildClusterGetSettings (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/cluster.health.js b/api/api/cluster.health.js index e62b3492b..30844abd4 100644 --- a/api/api/cluster.health.js +++ b/api/api/cluster.health.js @@ -24,7 +24,7 @@ function buildClusterHealth (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [cluster.health](http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-health.html) request * @@ -95,17 +95,17 @@ function buildClusterHealth (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index } = params - var querystring = semicopy(params, ['method', 'body', 'index']) + var warnings = [] + var { method, body, index, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -124,36 +124,8 @@ function buildClusterHealth (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/cluster.pending_tasks.js b/api/api/cluster.pending_tasks.js index 32802c975..c8bdd8ca3 100644 --- a/api/api/cluster.pending_tasks.js +++ b/api/api/cluster.pending_tasks.js @@ -24,7 +24,7 @@ function buildClusterPendingTasks (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [cluster.pending_tasks](http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-pending.html) request * @@ -72,17 +72,17 @@ function buildClusterPendingTasks (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -97,36 +97,8 @@ function buildClusterPendingTasks (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/cluster.put_settings.js b/api/api/cluster.put_settings.js index 230714ce7..06a07efa0 100644 --- a/api/api/cluster.put_settings.js +++ b/api/api/cluster.put_settings.js @@ -24,7 +24,7 @@ function buildClusterPutSettings (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [cluster.put_settings](http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-update-settings.html) request * @@ -76,17 +76,17 @@ function buildClusterPutSettings (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'PUT' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -101,36 +101,8 @@ function buildClusterPutSettings (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/cluster.remote_info.js b/api/api/cluster.remote_info.js index 62122e6ac..5c3b65f54 100644 --- a/api/api/cluster.remote_info.js +++ b/api/api/cluster.remote_info.js @@ -24,7 +24,7 @@ function buildClusterRemoteInfo (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [cluster.remote_info](http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-remote-info.html) request * @@ -67,17 +67,17 @@ function buildClusterRemoteInfo (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -92,36 +92,8 @@ function buildClusterRemoteInfo (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/cluster.reroute.js b/api/api/cluster.reroute.js index 9173b8b36..c7e083bf8 100644 --- a/api/api/cluster.reroute.js +++ b/api/api/cluster.reroute.js @@ -24,7 +24,7 @@ function buildClusterReroute (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [cluster.reroute](http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-reroute.html) request * @@ -77,17 +77,17 @@ function buildClusterReroute (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -102,36 +102,8 @@ function buildClusterReroute (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/cluster.state.js b/api/api/cluster.state.js index 002097761..b4eaa7995 100644 --- a/api/api/cluster.state.js +++ b/api/api/cluster.state.js @@ -24,7 +24,7 @@ function buildClusterState (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [cluster.state](http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-state.html) request * @@ -98,17 +98,17 @@ function buildClusterState (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index, metric } = params - var querystring = semicopy(params, ['method', 'body', 'index', 'metric']) + var warnings = [] + var { method, body, index, metric, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -129,36 +129,8 @@ function buildClusterState (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/cluster.stats.js b/api/api/cluster.stats.js index b57e67c56..f90bdd11f 100644 --- a/api/api/cluster.stats.js +++ b/api/api/cluster.stats.js @@ -24,7 +24,7 @@ function buildClusterStats (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [cluster.stats](http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-stats.html) request * @@ -73,17 +73,17 @@ function buildClusterStats (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, nodeId, node_id } = params - var querystring = semicopy(params, ['method', 'body', 'nodeId', 'node_id']) + var warnings = [] + var { method, body, nodeId, node_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -102,36 +102,8 @@ function buildClusterStats (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/count.js b/api/api/count.js index ac504f2e5..c4559bcd3 100644 --- a/api/api/count.js +++ b/api/api/count.js @@ -24,7 +24,7 @@ function buildCount (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [count](http://www.elastic.co/guide/en/elasticsearch/reference/master/search-count.html) request * @@ -106,17 +106,17 @@ function buildCount (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index, type } = params - var querystring = semicopy(params, ['method', 'body', 'index', 'type']) + var warnings = [] + var { method, body, index, type, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = body == null ? 'GET' : 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -137,36 +137,8 @@ function buildCount (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/create.js b/api/api/create.js index 3c8ebbde0..777e46437 100644 --- a/api/api/create.js +++ b/api/api/create.js @@ -24,7 +24,7 @@ function buildCreate (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [create](http://www.elastic.co/guide/en/elasticsearch/reference/master/docs-index_.html) request * @@ -101,17 +101,17 @@ function buildCreate (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, id, index, type } = params - var querystring = semicopy(params, ['method', 'body', 'id', 'index', 'type']) + var warnings = [] + var { method, body, id, index, type, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'PUT' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -126,36 +126,8 @@ function buildCreate (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/data_frame.delete_data_frame_transform.js b/api/api/data_frame.delete_data_frame_transform.js new file mode 100644 index 000000000..68fb7118d --- /dev/null +++ b/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 diff --git a/api/api/data_frame.get_data_frame_transform.js b/api/api/data_frame.get_data_frame_transform.js new file mode 100644 index 000000000..160f75c7e --- /dev/null +++ b/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 diff --git a/api/api/data_frame.get_data_frame_transform_stats.js b/api/api/data_frame.get_data_frame_transform_stats.js new file mode 100644 index 000000000..c11e1e94b --- /dev/null +++ b/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 diff --git a/api/api/data_frame.put_data_frame_transform.js b/api/api/data_frame.put_data_frame_transform.js new file mode 100644 index 000000000..30993de05 --- /dev/null +++ b/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 diff --git a/api/api/data_frame.start_data_frame_transform.js b/api/api/data_frame.start_data_frame_transform.js new file mode 100644 index 000000000..2bffd5d50 --- /dev/null +++ b/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 diff --git a/api/api/data_frame.stop_data_frame_transform.js b/api/api/data_frame.stop_data_frame_transform.js new file mode 100644 index 000000000..87ee0929f --- /dev/null +++ b/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 diff --git a/api/api/delete.js b/api/api/delete.js index 099e9e94b..14e2e3df5 100644 --- a/api/api/delete.js +++ b/api/api/delete.js @@ -24,7 +24,7 @@ function buildDelete (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [delete](http://www.elastic.co/guide/en/elasticsearch/reference/master/docs-delete.html) request * @@ -113,17 +113,17 @@ function buildDelete (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, id, index, type } = params - var querystring = semicopy(params, ['method', 'body', 'id', 'index', 'type']) + var warnings = [] + var { method, body, id, index, type, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'DELETE' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -138,36 +138,8 @@ function buildDelete (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/delete_by_query.js b/api/api/delete_by_query.js index 2b95a02e6..c760a1dab 100644 --- a/api/api/delete_by_query.js +++ b/api/api/delete_by_query.js @@ -24,7 +24,7 @@ function buildDeleteByQuery (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [delete_by_query](https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-delete-by-query.html) request * @@ -159,17 +159,17 @@ function buildDeleteByQuery (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index, type } = params - var querystring = semicopy(params, ['method', 'body', 'index', 'type']) + var warnings = [] + var { method, body, index, type, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -188,36 +188,8 @@ function buildDeleteByQuery (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/delete_by_query_rethrottle.js b/api/api/delete_by_query_rethrottle.js index 8cc90e6ab..6759b1d4a 100644 --- a/api/api/delete_by_query_rethrottle.js +++ b/api/api/delete_by_query_rethrottle.js @@ -24,7 +24,7 @@ function buildDeleteByQueryRethrottle (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [delete_by_query_rethrottle](https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-delete-by-query.html) request * @@ -79,17 +79,17 @@ function buildDeleteByQueryRethrottle (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, taskId, task_id } = params - var querystring = semicopy(params, ['method', 'body', 'taskId', 'task_id']) + var warnings = [] + var { method, body, taskId, task_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -104,36 +104,8 @@ function buildDeleteByQueryRethrottle (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/delete_script.js b/api/api/delete_script.js index 9ab6c4460..4efd049d2 100644 --- a/api/api/delete_script.js +++ b/api/api/delete_script.js @@ -24,7 +24,7 @@ function buildDeleteScript (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [delete_script](http://www.elastic.co/guide/en/elasticsearch/reference/master/modules-scripting.html) request * @@ -77,17 +77,17 @@ function buildDeleteScript (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, id } = params - var querystring = semicopy(params, ['method', 'body', 'id']) + var warnings = [] + var { method, body, id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'DELETE' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -102,36 +102,8 @@ function buildDeleteScript (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/exists.js b/api/api/exists.js index 46408f2af..7f4742236 100644 --- a/api/api/exists.js +++ b/api/api/exists.js @@ -24,7 +24,7 @@ function buildExists (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [exists](http://www.elastic.co/guide/en/elasticsearch/reference/master/docs-get.html) request * @@ -108,17 +108,17 @@ function buildExists (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, id, index, type } = params - var querystring = semicopy(params, ['method', 'body', 'id', 'index', 'type']) + var warnings = [] + var { method, body, id, index, type, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'HEAD' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -133,36 +133,8 @@ function buildExists (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/exists_source.js b/api/api/exists_source.js index fd39b921e..607438e9c 100644 --- a/api/api/exists_source.js +++ b/api/api/exists_source.js @@ -24,7 +24,7 @@ function buildExistsSource (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [exists_source](http://www.elastic.co/guide/en/elasticsearch/reference/master/docs-get.html) request * @@ -114,17 +114,17 @@ function buildExistsSource (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, id, index, type } = params - var querystring = semicopy(params, ['method', 'body', 'id', 'index', 'type']) + var warnings = [] + var { method, body, id, index, type, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'HEAD' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -139,36 +139,8 @@ function buildExistsSource (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/explain.js b/api/api/explain.js index 810a804a7..4ac7bb453 100644 --- a/api/api/explain.js +++ b/api/api/explain.js @@ -24,7 +24,7 @@ function buildExplain (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [explain](http://www.elastic.co/guide/en/elasticsearch/reference/master/search-explain.html) request * @@ -110,17 +110,17 @@ function buildExplain (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, id, index, type } = params - var querystring = semicopy(params, ['method', 'body', 'id', 'index', 'type']) + var warnings = [] + var { method, body, id, index, type, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = body == null ? 'GET' : 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -135,36 +135,8 @@ function buildExplain (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/field_caps.js b/api/api/field_caps.js index 2b609550b..c51ac6e38 100644 --- a/api/api/field_caps.js +++ b/api/api/field_caps.js @@ -24,7 +24,7 @@ function buildFieldCaps (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [field_caps](http://www.elastic.co/guide/en/elasticsearch/reference/master/search-field-caps.html) request * @@ -74,17 +74,17 @@ function buildFieldCaps (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index } = params - var querystring = semicopy(params, ['method', 'body', 'index']) + var warnings = [] + var { method, body, index, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = body == null ? 'GET' : 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -103,36 +103,8 @@ function buildFieldCaps (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/get.js b/api/api/get.js index 0d9ce71f8..1aa4abf8a 100644 --- a/api/api/get.js +++ b/api/api/get.js @@ -24,7 +24,7 @@ function buildGet (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [get](http://www.elastic.co/guide/en/elasticsearch/reference/master/docs-get.html) request * @@ -114,17 +114,17 @@ function buildGet (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, id, index, type } = params - var querystring = semicopy(params, ['method', 'body', 'id', 'index', 'type']) + var warnings = [] + var { method, body, id, index, type, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -139,36 +139,8 @@ function buildGet (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/get_script.js b/api/api/get_script.js index aae577d34..b02c02455 100644 --- a/api/api/get_script.js +++ b/api/api/get_script.js @@ -24,7 +24,7 @@ function buildGetScript (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [get_script](http://www.elastic.co/guide/en/elasticsearch/reference/master/modules-scripting.html) request * @@ -75,17 +75,17 @@ function buildGetScript (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, id } = params - var querystring = semicopy(params, ['method', 'body', 'id']) + var warnings = [] + var { method, body, id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -100,36 +100,8 @@ function buildGetScript (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/get_source.js b/api/api/get_source.js index b4afae752..b2f143a2f 100644 --- a/api/api/get_source.js +++ b/api/api/get_source.js @@ -24,7 +24,7 @@ function buildGetSource (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [get_source](http://www.elastic.co/guide/en/elasticsearch/reference/master/docs-get.html) request * @@ -105,17 +105,17 @@ function buildGetSource (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, id, index, type } = params - var querystring = semicopy(params, ['method', 'body', 'id', 'index', 'type']) + var warnings = [] + var { method, body, id, index, type, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -130,36 +130,8 @@ function buildGetSource (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/ilm.delete_lifecycle.js b/api/api/ilm.delete_lifecycle.js index 57ced77cc..6ae64f5ae 100644 --- a/api/api/ilm.delete_lifecycle.js +++ b/api/api/ilm.delete_lifecycle.js @@ -24,7 +24,7 @@ function buildIlmDeleteLifecycle (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [ilm.delete_lifecycle](https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-delete-lifecycle.html) request * @@ -63,17 +63,17 @@ function buildIlmDeleteLifecycle (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, policy } = params - var querystring = semicopy(params, ['method', 'body', 'policy']) + var warnings = [] + var { method, body, policy, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'DELETE' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -88,36 +88,8 @@ function buildIlmDeleteLifecycle (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/ilm.explain_lifecycle.js b/api/api/ilm.explain_lifecycle.js index 446d8b9e9..9e3a3e5b5 100644 --- a/api/api/ilm.explain_lifecycle.js +++ b/api/api/ilm.explain_lifecycle.js @@ -24,7 +24,7 @@ function buildIlmExplainLifecycle (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [ilm.explain_lifecycle](https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-explain-lifecycle.html) request * @@ -64,17 +64,17 @@ function buildIlmExplainLifecycle (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index } = params - var querystring = semicopy(params, ['method', 'body', 'index']) + var warnings = [] + var { method, body, index, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -89,36 +89,8 @@ function buildIlmExplainLifecycle (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/ilm.get_lifecycle.js b/api/api/ilm.get_lifecycle.js index 1145c399a..05050040c 100644 --- a/api/api/ilm.get_lifecycle.js +++ b/api/api/ilm.get_lifecycle.js @@ -24,7 +24,7 @@ function buildIlmGetLifecycle (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [ilm.get_lifecycle](https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-get-lifecycle.html) request * @@ -63,17 +63,17 @@ function buildIlmGetLifecycle (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, policy } = params - var querystring = semicopy(params, ['method', 'body', 'policy']) + var warnings = [] + var { method, body, policy, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -92,36 +92,8 @@ function buildIlmGetLifecycle (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/ilm.get_status.js b/api/api/ilm.get_status.js index f27b964e3..5cbb2bc12 100644 --- a/api/api/ilm.get_status.js +++ b/api/api/ilm.get_status.js @@ -24,7 +24,7 @@ function buildIlmGetStatus (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [ilm.get_status](https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-get-status.html) request * @@ -62,17 +62,17 @@ function buildIlmGetStatus (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -87,36 +87,8 @@ function buildIlmGetStatus (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/ilm.move_to_step.js b/api/api/ilm.move_to_step.js index c450a083a..3f699d25d 100644 --- a/api/api/ilm.move_to_step.js +++ b/api/api/ilm.move_to_step.js @@ -24,7 +24,7 @@ function buildIlmMoveToStep (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [ilm.move_to_step](https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-move-to-step.html) request * @@ -58,17 +58,17 @@ function buildIlmMoveToStep (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index } = params - var querystring = semicopy(params, ['method', 'body', 'index']) + var warnings = [] + var { method, body, index, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -83,36 +83,8 @@ function buildIlmMoveToStep (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/ilm.put_lifecycle.js b/api/api/ilm.put_lifecycle.js index b8d58d5f3..8f875547a 100644 --- a/api/api/ilm.put_lifecycle.js +++ b/api/api/ilm.put_lifecycle.js @@ -24,7 +24,7 @@ function buildIlmPutLifecycle (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [ilm.put_lifecycle](https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-put-lifecycle.html) request * @@ -58,17 +58,17 @@ function buildIlmPutLifecycle (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, policy } = params - var querystring = semicopy(params, ['method', 'body', 'policy']) + var warnings = [] + var { method, body, policy, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'PUT' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -83,36 +83,8 @@ function buildIlmPutLifecycle (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/ilm.remove_policy.js b/api/api/ilm.remove_policy.js index ca37399d2..0ad388fc0 100644 --- a/api/api/ilm.remove_policy.js +++ b/api/api/ilm.remove_policy.js @@ -24,7 +24,7 @@ function buildIlmRemovePolicy (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [ilm.remove_policy](https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-remove-policy.html) request * @@ -63,17 +63,17 @@ function buildIlmRemovePolicy (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index } = params - var querystring = semicopy(params, ['method', 'body', 'index']) + var warnings = [] + var { method, body, index, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -88,36 +88,8 @@ function buildIlmRemovePolicy (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/ilm.retry.js b/api/api/ilm.retry.js index 1fbcdd1da..30ee6a8ea 100644 --- a/api/api/ilm.retry.js +++ b/api/api/ilm.retry.js @@ -24,7 +24,7 @@ function buildIlmRetry (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [ilm.retry](https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-retry-policy.html) request * @@ -63,17 +63,17 @@ function buildIlmRetry (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index } = params - var querystring = semicopy(params, ['method', 'body', 'index']) + var warnings = [] + var { method, body, index, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -88,36 +88,8 @@ function buildIlmRetry (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/ilm.start.js b/api/api/ilm.start.js index 8c907d91d..2dcd08d4b 100644 --- a/api/api/ilm.start.js +++ b/api/api/ilm.start.js @@ -24,7 +24,7 @@ function buildIlmStart (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [ilm.start](https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-start.html) request * @@ -62,17 +62,17 @@ function buildIlmStart (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -87,36 +87,8 @@ function buildIlmStart (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/ilm.stop.js b/api/api/ilm.stop.js index b056fa599..d22d2491a 100644 --- a/api/api/ilm.stop.js +++ b/api/api/ilm.stop.js @@ -24,7 +24,7 @@ function buildIlmStop (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [ilm.stop](https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-stop.html) request * @@ -62,17 +62,17 @@ function buildIlmStop (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -87,36 +87,8 @@ function buildIlmStop (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/index.js b/api/api/index.js index 4b9de4503..886e71c69 100644 --- a/api/api/index.js +++ b/api/api/index.js @@ -24,7 +24,7 @@ function buildIndex (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [index](http://www.elastic.co/guide/en/elasticsearch/reference/master/docs-index_.html) request * @@ -115,17 +115,17 @@ function buildIndex (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, id, index, type } = params - var querystring = semicopy(params, ['method', 'body', 'id', 'index', 'type']) + var warnings = [] + var { method, body, id, index, type, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -144,36 +144,8 @@ function buildIndex (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/indices.analyze.js b/api/api/indices.analyze.js index a9d6e886f..718a3e094 100644 --- a/api/api/indices.analyze.js +++ b/api/api/indices.analyze.js @@ -24,7 +24,7 @@ function buildIndicesAnalyze (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [indices.analyze](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-analyze.html) request * @@ -65,17 +65,17 @@ function buildIndicesAnalyze (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index } = params - var querystring = semicopy(params, ['method', 'body', 'index']) + var warnings = [] + var { method, body, index, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = body == null ? 'GET' : 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -94,36 +94,8 @@ function buildIndicesAnalyze (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/indices.clear_cache.js b/api/api/indices.clear_cache.js index f8c24edc5..74f1b9c5a 100644 --- a/api/api/indices.clear_cache.js +++ b/api/api/indices.clear_cache.js @@ -24,7 +24,7 @@ function buildIndicesClearCache (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [indices.clear_cache](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-clearcache.html) request * @@ -93,17 +93,17 @@ function buildIndicesClearCache (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index } = params - var querystring = semicopy(params, ['method', 'body', 'index']) + var warnings = [] + var { method, body, index, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = body == null ? 'GET' : 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -122,36 +122,8 @@ function buildIndicesClearCache (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/indices.close.js b/api/api/indices.close.js index 73f134b41..24c34e6bf 100644 --- a/api/api/indices.close.js +++ b/api/api/indices.close.js @@ -24,7 +24,7 @@ function buildIndicesClose (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [indices.close](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-open-close.html) request * @@ -86,17 +86,17 @@ function buildIndicesClose (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index } = params - var querystring = semicopy(params, ['method', 'body', 'index']) + var warnings = [] + var { method, body, index, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -111,36 +111,8 @@ function buildIndicesClose (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/indices.create.js b/api/api/indices.create.js index 5708080a0..c2aa3c421 100644 --- a/api/api/indices.create.js +++ b/api/api/indices.create.js @@ -24,7 +24,7 @@ function buildIndicesCreate (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [indices.create](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-create-index.html) request * @@ -83,17 +83,17 @@ function buildIndicesCreate (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index } = params - var querystring = semicopy(params, ['method', 'body', 'index']) + var warnings = [] + var { method, body, index, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'PUT' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -108,36 +108,8 @@ function buildIndicesCreate (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/indices.delete.js b/api/api/indices.delete.js index ced4e48e2..277ecd916 100644 --- a/api/api/indices.delete.js +++ b/api/api/indices.delete.js @@ -24,7 +24,7 @@ function buildIndicesDelete (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [indices.delete](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-delete-index.html) request * @@ -86,17 +86,17 @@ function buildIndicesDelete (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index } = params - var querystring = semicopy(params, ['method', 'body', 'index']) + var warnings = [] + var { method, body, index, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'DELETE' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -111,36 +111,8 @@ function buildIndicesDelete (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/indices.delete_alias.js b/api/api/indices.delete_alias.js index f7f37523d..b32076509 100644 --- a/api/api/indices.delete_alias.js +++ b/api/api/indices.delete_alias.js @@ -24,7 +24,7 @@ function buildIndicesDeleteAlias (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [indices.delete_alias](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-aliases.html) request * @@ -88,17 +88,17 @@ function buildIndicesDeleteAlias (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index, name } = params - var querystring = semicopy(params, ['method', 'body', 'index', 'name']) + var warnings = [] + var { method, body, index, name, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'DELETE' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -117,36 +117,8 @@ function buildIndicesDeleteAlias (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/indices.delete_template.js b/api/api/indices.delete_template.js index 4f969efe0..2304f0127 100644 --- a/api/api/indices.delete_template.js +++ b/api/api/indices.delete_template.js @@ -24,7 +24,7 @@ function buildIndicesDeleteTemplate (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [indices.delete_template](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-templates.html) request * @@ -77,17 +77,17 @@ function buildIndicesDeleteTemplate (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, name } = params - var querystring = semicopy(params, ['method', 'body', 'name']) + var warnings = [] + var { method, body, name, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'DELETE' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -102,36 +102,8 @@ function buildIndicesDeleteTemplate (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/indices.exists.js b/api/api/indices.exists.js index 629725623..72386351a 100644 --- a/api/api/indices.exists.js +++ b/api/api/indices.exists.js @@ -24,7 +24,7 @@ function buildIndicesExists (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [indices.exists](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-exists.html) request * @@ -89,17 +89,17 @@ function buildIndicesExists (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index } = params - var querystring = semicopy(params, ['method', 'body', 'index']) + var warnings = [] + var { method, body, index, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'HEAD' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -114,36 +114,8 @@ function buildIndicesExists (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/indices.exists_alias.js b/api/api/indices.exists_alias.js index 7531e6fb0..a86badbf2 100644 --- a/api/api/indices.exists_alias.js +++ b/api/api/indices.exists_alias.js @@ -24,7 +24,7 @@ function buildIndicesExistsAlias (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [indices.exists_alias](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-aliases.html) request * @@ -84,17 +84,17 @@ function buildIndicesExistsAlias (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index, name } = params - var querystring = semicopy(params, ['method', 'body', 'index', 'name']) + var warnings = [] + var { method, body, index, name, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'HEAD' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -113,36 +113,8 @@ function buildIndicesExistsAlias (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/indices.exists_template.js b/api/api/indices.exists_template.js index 83273b91d..e05a64740 100644 --- a/api/api/indices.exists_template.js +++ b/api/api/indices.exists_template.js @@ -24,7 +24,7 @@ function buildIndicesExistsTemplate (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [indices.exists_template](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-templates.html) request * @@ -80,17 +80,17 @@ function buildIndicesExistsTemplate (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, name } = params - var querystring = semicopy(params, ['method', 'body', 'name']) + var warnings = [] + var { method, body, name, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'HEAD' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -105,36 +105,8 @@ function buildIndicesExistsTemplate (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/indices.exists_type.js b/api/api/indices.exists_type.js index 585c2d325..b7adfa719 100644 --- a/api/api/indices.exists_type.js +++ b/api/api/indices.exists_type.js @@ -24,7 +24,7 @@ function buildIndicesExistsType (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [indices.exists_type](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-types-exists.html) request * @@ -94,17 +94,17 @@ function buildIndicesExistsType (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index, type } = params - var querystring = semicopy(params, ['method', 'body', 'index', 'type']) + var warnings = [] + var { method, body, index, type, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'HEAD' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -119,36 +119,8 @@ function buildIndicesExistsType (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/indices.flush.js b/api/api/indices.flush.js index 94d64e23e..cb4712260 100644 --- a/api/api/indices.flush.js +++ b/api/api/indices.flush.js @@ -24,7 +24,7 @@ function buildIndicesFlush (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [indices.flush](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-flush.html) request * @@ -82,17 +82,17 @@ function buildIndicesFlush (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index } = params - var querystring = semicopy(params, ['method', 'body', 'index']) + var warnings = [] + var { method, body, index, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = body == null ? 'GET' : 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -111,36 +111,8 @@ function buildIndicesFlush (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/indices.flush_synced.js b/api/api/indices.flush_synced.js index f4c69b758..239e07b20 100644 --- a/api/api/indices.flush_synced.js +++ b/api/api/indices.flush_synced.js @@ -24,7 +24,7 @@ function buildIndicesFlushSynced (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [indices.flush_synced](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-synced-flush.html) request * @@ -77,17 +77,17 @@ function buildIndicesFlushSynced (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index } = params - var querystring = semicopy(params, ['method', 'body', 'index']) + var warnings = [] + var { method, body, index, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = body == null ? 'GET' : 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -106,36 +106,8 @@ function buildIndicesFlushSynced (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/indices.forcemerge.js b/api/api/indices.forcemerge.js index b5249ecfc..175d010ae 100644 --- a/api/api/indices.forcemerge.js +++ b/api/api/indices.forcemerge.js @@ -24,7 +24,7 @@ function buildIndicesForcemerge (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [indices.forcemerge](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-forcemerge.html) request * @@ -85,17 +85,17 @@ function buildIndicesForcemerge (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index } = params - var querystring = semicopy(params, ['method', 'body', 'index']) + var warnings = [] + var { method, body, index, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -114,36 +114,8 @@ function buildIndicesForcemerge (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/indices.freeze.js b/api/api/indices.freeze.js index 0400b00d5..b5e239f45 100644 --- a/api/api/indices.freeze.js +++ b/api/api/indices.freeze.js @@ -24,7 +24,7 @@ function buildIndicesFreeze (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [indices.freeze](https://www.elastic.co/guide/en/elasticsearch/reference/current/frozen.html) request * @@ -82,17 +82,17 @@ function buildIndicesFreeze (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index } = params - var querystring = semicopy(params, ['method', 'body', 'index']) + var warnings = [] + var { method, body, index, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -107,36 +107,8 @@ function buildIndicesFreeze (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/indices.get.js b/api/api/indices.get.js index 54dbf86e0..7fea2e0a0 100644 --- a/api/api/indices.get.js +++ b/api/api/indices.get.js @@ -24,7 +24,7 @@ function buildIndicesGet (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [indices.get](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-get-index.html) request * @@ -95,17 +95,17 @@ function buildIndicesGet (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index } = params - var querystring = semicopy(params, ['method', 'body', 'index']) + var warnings = [] + var { method, body, index, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -120,36 +120,8 @@ function buildIndicesGet (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/indices.get_alias.js b/api/api/indices.get_alias.js index d016d5741..e462915ae 100644 --- a/api/api/indices.get_alias.js +++ b/api/api/indices.get_alias.js @@ -24,7 +24,7 @@ function buildIndicesGetAlias (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [indices.get_alias](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-aliases.html) request * @@ -80,17 +80,17 @@ function buildIndicesGetAlias (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index, name } = params - var querystring = semicopy(params, ['method', 'body', 'index', 'name']) + var warnings = [] + var { method, body, index, name, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -113,36 +113,8 @@ function buildIndicesGetAlias (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/indices.get_field_mapping.js b/api/api/indices.get_field_mapping.js index 70a9efaa0..1c2df81ef 100644 --- a/api/api/indices.get_field_mapping.js +++ b/api/api/indices.get_field_mapping.js @@ -24,7 +24,7 @@ function buildIndicesGetFieldMapping (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [indices.get_field_mapping](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-get-field-mapping.html) request * @@ -91,17 +91,17 @@ function buildIndicesGetFieldMapping (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index, type, fields } = params - var querystring = semicopy(params, ['method', 'body', 'index', 'type', 'fields']) + var warnings = [] + var { method, body, index, type, fields, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -124,36 +124,8 @@ function buildIndicesGetFieldMapping (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/indices.get_mapping.js b/api/api/indices.get_mapping.js index 804019ff9..d139c396c 100644 --- a/api/api/indices.get_mapping.js +++ b/api/api/indices.get_mapping.js @@ -24,7 +24,7 @@ function buildIndicesGetMapping (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [indices.get_mapping](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-get-mapping.html) request * @@ -86,17 +86,17 @@ function buildIndicesGetMapping (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index, type } = params - var querystring = semicopy(params, ['method', 'body', 'index', 'type']) + var warnings = [] + var { method, body, index, type, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -119,36 +119,8 @@ function buildIndicesGetMapping (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/indices.get_settings.js b/api/api/indices.get_settings.js index 79d82cbee..8d876e932 100644 --- a/api/api/indices.get_settings.js +++ b/api/api/indices.get_settings.js @@ -24,7 +24,7 @@ function buildIndicesGetSettings (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [indices.get_settings](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-get-settings.html) request * @@ -89,17 +89,17 @@ function buildIndicesGetSettings (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index, name } = params - var querystring = semicopy(params, ['method', 'body', 'index', 'name']) + var warnings = [] + var { method, body, index, name, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -122,36 +122,8 @@ function buildIndicesGetSettings (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/indices.get_template.js b/api/api/indices.get_template.js index 68d6a6b51..31e49a339 100644 --- a/api/api/indices.get_template.js +++ b/api/api/indices.get_template.js @@ -24,7 +24,7 @@ function buildIndicesGetTemplate (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [indices.get_template](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-templates.html) request * @@ -79,17 +79,17 @@ function buildIndicesGetTemplate (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, name } = params - var querystring = semicopy(params, ['method', 'body', 'name']) + var warnings = [] + var { method, body, name, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -108,36 +108,8 @@ function buildIndicesGetTemplate (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/indices.get_upgrade.js b/api/api/indices.get_upgrade.js index 06781bda7..61f9bc4dd 100644 --- a/api/api/indices.get_upgrade.js +++ b/api/api/indices.get_upgrade.js @@ -24,7 +24,7 @@ function buildIndicesGetUpgrade (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [indices.get_upgrade](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-upgrade.html) request * @@ -77,17 +77,17 @@ function buildIndicesGetUpgrade (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index } = params - var querystring = semicopy(params, ['method', 'body', 'index']) + var warnings = [] + var { method, body, index, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -106,36 +106,8 @@ function buildIndicesGetUpgrade (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/indices.open.js b/api/api/indices.open.js index 742cb028d..7a77de7dd 100644 --- a/api/api/indices.open.js +++ b/api/api/indices.open.js @@ -24,7 +24,7 @@ function buildIndicesOpen (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [indices.open](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-open-close.html) request * @@ -89,17 +89,17 @@ function buildIndicesOpen (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index } = params - var querystring = semicopy(params, ['method', 'body', 'index']) + var warnings = [] + var { method, body, index, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -114,36 +114,8 @@ function buildIndicesOpen (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/indices.put_alias.js b/api/api/indices.put_alias.js index c6d2df4a3..d38dd6d83 100644 --- a/api/api/indices.put_alias.js +++ b/api/api/indices.put_alias.js @@ -24,7 +24,7 @@ function buildIndicesPutAlias (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [indices.put_alias](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-aliases.html) request * @@ -85,17 +85,17 @@ function buildIndicesPutAlias (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index, name } = params - var querystring = semicopy(params, ['method', 'body', 'index', 'name']) + var warnings = [] + var { method, body, index, name, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'PUT' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -114,36 +114,8 @@ function buildIndicesPutAlias (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/indices.put_mapping.js b/api/api/indices.put_mapping.js index 90bf52d89..aa7b8a27b 100644 --- a/api/api/indices.put_mapping.js +++ b/api/api/indices.put_mapping.js @@ -24,7 +24,7 @@ function buildIndicesPutMapping (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [indices.put_mapping](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-put-mapping.html) request * @@ -90,17 +90,17 @@ function buildIndicesPutMapping (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index, type } = params - var querystring = semicopy(params, ['method', 'body', 'index', 'type']) + var warnings = [] + var { method, body, index, type, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'PUT' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -131,36 +131,8 @@ function buildIndicesPutMapping (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/indices.put_settings.js b/api/api/indices.put_settings.js index ba394a719..82984834d 100644 --- a/api/api/indices.put_settings.js +++ b/api/api/indices.put_settings.js @@ -24,7 +24,7 @@ function buildIndicesPutSettings (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [indices.put_settings](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-update-settings.html) request * @@ -89,17 +89,17 @@ function buildIndicesPutSettings (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index } = params - var querystring = semicopy(params, ['method', 'body', 'index']) + var warnings = [] + var { method, body, index, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'PUT' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -118,36 +118,8 @@ function buildIndicesPutSettings (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/indices.put_template.js b/api/api/indices.put_template.js index 931a2ab85..12c08451f 100644 --- a/api/api/indices.put_template.js +++ b/api/api/indices.put_template.js @@ -24,7 +24,7 @@ function buildIndicesPutTemplate (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [indices.put_template](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-templates.html) request * @@ -88,17 +88,17 @@ function buildIndicesPutTemplate (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, name } = params - var querystring = semicopy(params, ['method', 'body', 'name']) + var warnings = [] + var { method, body, name, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'PUT' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -113,36 +113,8 @@ function buildIndicesPutTemplate (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/indices.recovery.js b/api/api/indices.recovery.js index 7362561b7..f373a3236 100644 --- a/api/api/indices.recovery.js +++ b/api/api/indices.recovery.js @@ -24,7 +24,7 @@ function buildIndicesRecovery (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [indices.recovery](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-recovery.html) request * @@ -73,17 +73,17 @@ function buildIndicesRecovery (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index } = params - var querystring = semicopy(params, ['method', 'body', 'index']) + var warnings = [] + var { method, body, index, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -102,36 +102,8 @@ function buildIndicesRecovery (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/indices.refresh.js b/api/api/indices.refresh.js index 1a263c834..7f11d2faa 100644 --- a/api/api/indices.refresh.js +++ b/api/api/indices.refresh.js @@ -24,7 +24,7 @@ function buildIndicesRefresh (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [indices.refresh](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-refresh.html) request * @@ -77,17 +77,17 @@ function buildIndicesRefresh (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index } = params - var querystring = semicopy(params, ['method', 'body', 'index']) + var warnings = [] + var { method, body, index, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = body == null ? 'GET' : 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -106,36 +106,8 @@ function buildIndicesRefresh (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/indices.rollover.js b/api/api/indices.rollover.js index 8b7fecb73..bb5e45ebe 100644 --- a/api/api/indices.rollover.js +++ b/api/api/indices.rollover.js @@ -24,7 +24,7 @@ function buildIndicesRollover (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [indices.rollover](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-rollover-index.html) request * @@ -90,17 +90,17 @@ function buildIndicesRollover (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, alias, newIndex, new_index } = params - var querystring = semicopy(params, ['method', 'body', 'alias', 'newIndex', 'new_index']) + var warnings = [] + var { method, body, alias, newIndex, new_index, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -119,36 +119,8 @@ function buildIndicesRollover (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/indices.segments.js b/api/api/indices.segments.js index a9feb67f5..aabd9e7df 100644 --- a/api/api/indices.segments.js +++ b/api/api/indices.segments.js @@ -24,7 +24,7 @@ function buildIndicesSegments (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [indices.segments](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-segments.html) request * @@ -79,17 +79,17 @@ function buildIndicesSegments (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index } = params - var querystring = semicopy(params, ['method', 'body', 'index']) + var warnings = [] + var { method, body, index, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -108,36 +108,8 @@ function buildIndicesSegments (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/indices.shard_stores.js b/api/api/indices.shard_stores.js index 35d5924b8..dccc29561 100644 --- a/api/api/indices.shard_stores.js +++ b/api/api/indices.shard_stores.js @@ -24,7 +24,7 @@ function buildIndicesShardStores (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [indices.shard_stores](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-shards-stores.html) request * @@ -79,17 +79,17 @@ function buildIndicesShardStores (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index } = params - var querystring = semicopy(params, ['method', 'body', 'index']) + var warnings = [] + var { method, body, index, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -108,36 +108,8 @@ function buildIndicesShardStores (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/indices.shrink.js b/api/api/indices.shrink.js index 1febb1643..364138767 100644 --- a/api/api/indices.shrink.js +++ b/api/api/indices.shrink.js @@ -24,7 +24,7 @@ function buildIndicesShrink (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [indices.shrink](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-shrink-index.html) request * @@ -91,17 +91,17 @@ function buildIndicesShrink (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index, target } = params - var querystring = semicopy(params, ['method', 'body', 'index', 'target']) + var warnings = [] + var { method, body, index, target, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'PUT' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -116,36 +116,8 @@ function buildIndicesShrink (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/indices.split.js b/api/api/indices.split.js index 77d8288cd..50283502d 100644 --- a/api/api/indices.split.js +++ b/api/api/indices.split.js @@ -24,7 +24,7 @@ function buildIndicesSplit (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [indices.split](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-split-index.html) request * @@ -91,17 +91,17 @@ function buildIndicesSplit (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index, target } = params - var querystring = semicopy(params, ['method', 'body', 'index', 'target']) + var warnings = [] + var { method, body, index, target, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'PUT' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -116,36 +116,8 @@ function buildIndicesSplit (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/indices.stats.js b/api/api/indices.stats.js index 3efb1949b..883a4a094 100644 --- a/api/api/indices.stats.js +++ b/api/api/indices.stats.js @@ -24,7 +24,7 @@ function buildIndicesStats (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [indices.stats](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-stats.html) request * @@ -86,17 +86,17 @@ function buildIndicesStats (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index, metric } = params - var querystring = semicopy(params, ['method', 'body', 'index', 'metric']) + var warnings = [] + var { method, body, index, metric, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -119,36 +119,8 @@ function buildIndicesStats (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/indices.unfreeze.js b/api/api/indices.unfreeze.js index 81a55968f..6004938fa 100644 --- a/api/api/indices.unfreeze.js +++ b/api/api/indices.unfreeze.js @@ -24,7 +24,7 @@ function buildIndicesUnfreeze (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [indices.unfreeze](https://www.elastic.co/guide/en/elasticsearch/reference/current/frozen.html) request * @@ -82,17 +82,17 @@ function buildIndicesUnfreeze (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index } = params - var querystring = semicopy(params, ['method', 'body', 'index']) + var warnings = [] + var { method, body, index, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -107,36 +107,8 @@ function buildIndicesUnfreeze (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/indices.update_aliases.js b/api/api/indices.update_aliases.js index 5c83d0798..69836c820 100644 --- a/api/api/indices.update_aliases.js +++ b/api/api/indices.update_aliases.js @@ -24,7 +24,7 @@ function buildIndicesUpdateAliases (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [indices.update_aliases](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-aliases.html) request * @@ -73,17 +73,17 @@ function buildIndicesUpdateAliases (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -98,36 +98,8 @@ function buildIndicesUpdateAliases (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/indices.upgrade.js b/api/api/indices.upgrade.js index bae33c59a..72cba50ca 100644 --- a/api/api/indices.upgrade.js +++ b/api/api/indices.upgrade.js @@ -24,7 +24,7 @@ function buildIndicesUpgrade (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [indices.upgrade](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-upgrade.html) request * @@ -83,17 +83,17 @@ function buildIndicesUpgrade (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index } = params - var querystring = semicopy(params, ['method', 'body', 'index']) + var warnings = [] + var { method, body, index, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -112,36 +112,8 @@ function buildIndicesUpgrade (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/indices.validate_query.js b/api/api/indices.validate_query.js index 3dea50479..4615cd2eb 100644 --- a/api/api/indices.validate_query.js +++ b/api/api/indices.validate_query.js @@ -24,7 +24,7 @@ function buildIndicesValidateQuery (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [indices.validate_query](http://www.elastic.co/guide/en/elasticsearch/reference/master/search-validate.html) request * @@ -100,17 +100,17 @@ function buildIndicesValidateQuery (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index, type } = params - var querystring = semicopy(params, ['method', 'body', 'index', 'type']) + var warnings = [] + var { method, body, index, type, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = body == null ? 'GET' : 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -131,36 +131,8 @@ function buildIndicesValidateQuery (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/info.js b/api/api/info.js index 0d5eb79e1..b43a6c1d3 100644 --- a/api/api/info.js +++ b/api/api/info.js @@ -24,7 +24,7 @@ function buildInfo (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [info](http://www.elastic.co/guide/) request * @@ -67,17 +67,17 @@ function buildInfo (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -92,36 +92,8 @@ function buildInfo (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/ingest.delete_pipeline.js b/api/api/ingest.delete_pipeline.js index f5f920984..bc2bf037c 100644 --- a/api/api/ingest.delete_pipeline.js +++ b/api/api/ingest.delete_pipeline.js @@ -24,7 +24,7 @@ function buildIngestDeletePipeline (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [ingest.delete_pipeline](https://www.elastic.co/guide/en/elasticsearch/plugins/master/ingest.html) request * @@ -77,17 +77,17 @@ function buildIngestDeletePipeline (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, id } = params - var querystring = semicopy(params, ['method', 'body', 'id']) + var warnings = [] + var { method, body, id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'DELETE' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -102,36 +102,8 @@ function buildIngestDeletePipeline (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/ingest.get_pipeline.js b/api/api/ingest.get_pipeline.js index ec9096fdc..f9cb4b131 100644 --- a/api/api/ingest.get_pipeline.js +++ b/api/api/ingest.get_pipeline.js @@ -24,7 +24,7 @@ function buildIngestGetPipeline (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [ingest.get_pipeline](https://www.elastic.co/guide/en/elasticsearch/plugins/master/ingest.html) request * @@ -71,17 +71,17 @@ function buildIngestGetPipeline (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, id } = params - var querystring = semicopy(params, ['method', 'body', 'id']) + var warnings = [] + var { method, body, id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -100,36 +100,8 @@ function buildIngestGetPipeline (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/ingest.processor_grok.js b/api/api/ingest.processor_grok.js index 056843cb2..d6d23d6b9 100644 --- a/api/api/ingest.processor_grok.js +++ b/api/api/ingest.processor_grok.js @@ -24,7 +24,7 @@ function buildIngestProcessorGrok (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [ingest.processor_grok](https://www.elastic.co/guide/en/elasticsearch/plugins/master/ingest.html) request * @@ -67,17 +67,17 @@ function buildIngestProcessorGrok (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -92,36 +92,8 @@ function buildIngestProcessorGrok (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/ingest.put_pipeline.js b/api/api/ingest.put_pipeline.js index 0b34bf29c..181c85328 100644 --- a/api/api/ingest.put_pipeline.js +++ b/api/api/ingest.put_pipeline.js @@ -24,7 +24,7 @@ function buildIngestPutPipeline (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [ingest.put_pipeline](https://www.elastic.co/guide/en/elasticsearch/plugins/master/ingest.html) request * @@ -78,17 +78,17 @@ function buildIngestPutPipeline (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, id } = params - var querystring = semicopy(params, ['method', 'body', 'id']) + var warnings = [] + var { method, body, id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'PUT' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -103,36 +103,8 @@ function buildIngestPutPipeline (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/ingest.simulate.js b/api/api/ingest.simulate.js index 4296037df..243380664 100644 --- a/api/api/ingest.simulate.js +++ b/api/api/ingest.simulate.js @@ -24,7 +24,7 @@ function buildIngestSimulate (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [ingest.simulate](https://www.elastic.co/guide/en/elasticsearch/plugins/master/ingest.html) request * @@ -71,17 +71,17 @@ function buildIngestSimulate (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, id } = params - var querystring = semicopy(params, ['method', 'body', 'id']) + var warnings = [] + var { method, body, id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = body == null ? 'GET' : 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -100,36 +100,8 @@ function buildIngestSimulate (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/mget.js b/api/api/mget.js index 14b29eaf4..7a0b5ee4c 100644 --- a/api/api/mget.js +++ b/api/api/mget.js @@ -24,7 +24,7 @@ function buildMget (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [mget](http://www.elastic.co/guide/en/elasticsearch/reference/master/docs-multi-get.html) request * @@ -95,17 +95,17 @@ function buildMget (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index, type } = params - var querystring = semicopy(params, ['method', 'body', 'index', 'type']) + var warnings = [] + var { method, body, index, type, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = body == null ? 'GET' : 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -126,36 +126,8 @@ function buildMget (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/msearch.js b/api/api/msearch.js index dc232936e..5ca1ebd34 100644 --- a/api/api/msearch.js +++ b/api/api/msearch.js @@ -24,7 +24,7 @@ function buildMsearch (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [msearch](http://www.elastic.co/guide/en/elasticsearch/reference/master/search-multi-search.html) request * @@ -94,17 +94,17 @@ function buildMsearch (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index, type } = params - var querystring = semicopy(params, ['method', 'body', 'index', 'type']) + var warnings = [] + var { method, body, index, type, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = body == null ? 'GET' : 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -125,36 +125,8 @@ function buildMsearch (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/msearch_template.js b/api/api/msearch_template.js index bb4b3103f..54a499ddb 100644 --- a/api/api/msearch_template.js +++ b/api/api/msearch_template.js @@ -24,7 +24,7 @@ function buildMsearchTemplate (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [msearch_template](http://www.elastic.co/guide/en/elasticsearch/reference/current/search-multi-search.html) request * @@ -88,17 +88,17 @@ function buildMsearchTemplate (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index, type } = params - var querystring = semicopy(params, ['method', 'body', 'index', 'type']) + var warnings = [] + var { method, body, index, type, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = body == null ? 'GET' : 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -119,36 +119,8 @@ function buildMsearchTemplate (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/mtermvectors.js b/api/api/mtermvectors.js index a46362de3..92d14c93c 100644 --- a/api/api/mtermvectors.js +++ b/api/api/mtermvectors.js @@ -24,7 +24,7 @@ function buildMtermvectors (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [mtermvectors](http://www.elastic.co/guide/en/elasticsearch/reference/master/docs-multi-termvectors.html) request * @@ -99,17 +99,17 @@ function buildMtermvectors (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index, type } = params - var querystring = semicopy(params, ['method', 'body', 'index', 'type']) + var warnings = [] + var { method, body, index, type, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = body == null ? 'GET' : 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -130,36 +130,8 @@ function buildMtermvectors (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/nodes.hot_threads.js b/api/api/nodes.hot_threads.js index d5823e4e8..e1af4b1d0 100644 --- a/api/api/nodes.hot_threads.js +++ b/api/api/nodes.hot_threads.js @@ -24,7 +24,7 @@ function buildNodesHotThreads (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [nodes.hot_threads](http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-nodes-hot-threads.html) request * @@ -81,17 +81,17 @@ function buildNodesHotThreads (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, nodeId, node_id } = params - var querystring = semicopy(params, ['method', 'body', 'nodeId', 'node_id']) + var warnings = [] + var { method, body, nodeId, node_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -116,36 +116,8 @@ function buildNodesHotThreads (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/nodes.info.js b/api/api/nodes.info.js index 4e27f08ff..26e7421ea 100644 --- a/api/api/nodes.info.js +++ b/api/api/nodes.info.js @@ -24,7 +24,7 @@ function buildNodesInfo (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [nodes.info](http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-nodes-info.html) request * @@ -74,17 +74,17 @@ function buildNodesInfo (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, nodeId, node_id, metric } = params - var querystring = semicopy(params, ['method', 'body', 'nodeId', 'node_id', 'metric']) + var warnings = [] + var { method, body, nodeId, node_id, metric, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -107,36 +107,8 @@ function buildNodesInfo (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/nodes.reload_secure_settings.js b/api/api/nodes.reload_secure_settings.js index 9dff0fa62..fa4afbee9 100644 --- a/api/api/nodes.reload_secure_settings.js +++ b/api/api/nodes.reload_secure_settings.js @@ -24,7 +24,7 @@ function buildNodesReloadSecureSettings (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [nodes.reload_secure_settings](https://www.elastic.co/guide/en/elasticsearch/reference/6.x/secure-settings.html#reloadable-secure-settings) request * @@ -70,17 +70,17 @@ function buildNodesReloadSecureSettings (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, nodeId, node_id } = params - var querystring = semicopy(params, ['method', 'body', 'nodeId', 'node_id']) + var warnings = [] + var { method, body, nodeId, node_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -99,36 +99,8 @@ function buildNodesReloadSecureSettings (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/nodes.stats.js b/api/api/nodes.stats.js index 04425a8fb..7a8a1db36 100644 --- a/api/api/nodes.stats.js +++ b/api/api/nodes.stats.js @@ -24,7 +24,7 @@ function buildNodesStats (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [nodes.stats](http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-nodes-stats.html) request * @@ -89,17 +89,17 @@ function buildNodesStats (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, metric, indexMetric, index_metric, nodeId, node_id } = params - var querystring = semicopy(params, ['method', 'body', 'metric', 'indexMetric', 'index_metric', 'nodeId', 'node_id']) + var warnings = [] + var { method, body, metric, indexMetric, index_metric, nodeId, node_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -126,36 +126,8 @@ function buildNodesStats (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/nodes.usage.js b/api/api/nodes.usage.js index 1d62545be..159b09f7c 100644 --- a/api/api/nodes.usage.js +++ b/api/api/nodes.usage.js @@ -24,7 +24,7 @@ function buildNodesUsage (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [nodes.usage](http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-nodes-usage.html) request * @@ -71,17 +71,17 @@ function buildNodesUsage (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, metric, nodeId, node_id } = params - var querystring = semicopy(params, ['method', 'body', 'metric', 'nodeId', 'node_id']) + var warnings = [] + var { method, body, metric, nodeId, node_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -104,36 +104,8 @@ function buildNodesUsage (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/ping.js b/api/api/ping.js index 71a0dc79e..7aa59fb5e 100644 --- a/api/api/ping.js +++ b/api/api/ping.js @@ -24,7 +24,7 @@ function buildPing (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [ping](http://www.elastic.co/guide/) request * @@ -67,17 +67,17 @@ function buildPing (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'HEAD' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -92,36 +92,8 @@ function buildPing (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/put_script.js b/api/api/put_script.js index 9ffd1db70..9f17d8316 100644 --- a/api/api/put_script.js +++ b/api/api/put_script.js @@ -24,7 +24,7 @@ function buildPutScript (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [put_script](http://www.elastic.co/guide/en/elasticsearch/reference/master/modules-scripting.html) request * @@ -87,17 +87,17 @@ function buildPutScript (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, id, context } = params - var querystring = semicopy(params, ['method', 'body', 'id', 'context']) + var warnings = [] + var { method, body, id, context, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'PUT' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -116,36 +116,8 @@ function buildPutScript (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/rank_eval.js b/api/api/rank_eval.js index df81a0385..98242a4cd 100644 --- a/api/api/rank_eval.js +++ b/api/api/rank_eval.js @@ -24,7 +24,7 @@ function buildRankEval (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [rank_eval](https://www.elastic.co/guide/en/elasticsearch/reference/master/search-rank-eval.html) request * @@ -78,17 +78,17 @@ function buildRankEval (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index } = params - var querystring = semicopy(params, ['method', 'body', 'index']) + var warnings = [] + var { method, body, index, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = body == null ? 'GET' : 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -107,36 +107,8 @@ function buildRankEval (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/reindex.js b/api/api/reindex.js index 25ce5f076..9bceabe95 100644 --- a/api/api/reindex.js +++ b/api/api/reindex.js @@ -24,7 +24,7 @@ function buildReindex (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [reindex](https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-reindex.html) request * @@ -83,17 +83,17 @@ function buildReindex (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -108,36 +108,8 @@ function buildReindex (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/reindex_rethrottle.js b/api/api/reindex_rethrottle.js index 2a24b921b..7f9e0bc67 100644 --- a/api/api/reindex_rethrottle.js +++ b/api/api/reindex_rethrottle.js @@ -24,7 +24,7 @@ function buildReindexRethrottle (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [reindex_rethrottle](https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-reindex.html) request * @@ -79,17 +79,17 @@ function buildReindexRethrottle (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, taskId, task_id } = params - var querystring = semicopy(params, ['method', 'body', 'taskId', 'task_id']) + var warnings = [] + var { method, body, taskId, task_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -104,36 +104,8 @@ function buildReindexRethrottle (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/render_search_template.js b/api/api/render_search_template.js index 0564ba781..9ec822538 100644 --- a/api/api/render_search_template.js +++ b/api/api/render_search_template.js @@ -24,7 +24,7 @@ function buildRenderSearchTemplate (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [render_search_template](http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/search-template.html) request * @@ -63,17 +63,17 @@ function buildRenderSearchTemplate (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, id } = params - var querystring = semicopy(params, ['method', 'body', 'id']) + var warnings = [] + var { method, body, id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = body == null ? 'GET' : 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -92,36 +92,8 @@ function buildRenderSearchTemplate (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/scripts_painless_context.js b/api/api/scripts_painless_context.js new file mode 100644 index 000000000..b10b63ac9 --- /dev/null +++ b/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 diff --git a/api/api/scripts_painless_execute.js b/api/api/scripts_painless_execute.js index 231a3e461..db99454e1 100644 --- a/api/api/scripts_painless_execute.js +++ b/api/api/scripts_painless_execute.js @@ -24,7 +24,7 @@ function buildScriptsPainlessExecute (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [scripts_painless_execute](https://www.elastic.co/guide/en/elasticsearch/painless/master/painless-execute-api.html) request * @@ -62,17 +62,17 @@ function buildScriptsPainlessExecute (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = body == null ? 'GET' : 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -87,36 +87,8 @@ function buildScriptsPainlessExecute (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/scroll.js b/api/api/scroll.js index 4b34b107c..3da27ae1e 100644 --- a/api/api/scroll.js +++ b/api/api/scroll.js @@ -24,7 +24,7 @@ function buildScroll (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [scroll](http://www.elastic.co/guide/en/elasticsearch/reference/master/search-request-scroll.html) request * @@ -71,17 +71,17 @@ function buildScroll (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, scrollId, scroll_id } = params - var querystring = semicopy(params, ['method', 'body', 'scrollId', 'scroll_id']) + var warnings = [] + var { method, body, scrollId, scroll_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = body == null ? 'GET' : 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -100,36 +100,8 @@ function buildScroll (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/search.js b/api/api/search.js index d1a845c85..111f86498 100644 --- a/api/api/search.js +++ b/api/api/search.js @@ -24,7 +24,7 @@ function buildSearch (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [search](http://www.elastic.co/guide/en/elasticsearch/reference/master/search-search.html) request * @@ -178,17 +178,17 @@ function buildSearch (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index, type } = params - var querystring = semicopy(params, ['method', 'body', 'index', 'type']) + var warnings = [] + var { method, body, index, type, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = body == null ? 'GET' : 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -209,36 +209,8 @@ function buildSearch (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/search_shards.js b/api/api/search_shards.js index bae036cef..b819d66b2 100644 --- a/api/api/search_shards.js +++ b/api/api/search_shards.js @@ -24,7 +24,7 @@ function buildSearchShards (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [search_shards](http://www.elastic.co/guide/en/elasticsearch/reference/master/search-shards.html) request * @@ -83,17 +83,17 @@ function buildSearchShards (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index } = params - var querystring = semicopy(params, ['method', 'body', 'index']) + var warnings = [] + var { method, body, index, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = body == null ? 'GET' : 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -112,36 +112,8 @@ function buildSearchShards (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/search_template.js b/api/api/search_template.js index 01803aa4e..02682fbf0 100644 --- a/api/api/search_template.js +++ b/api/api/search_template.js @@ -24,7 +24,7 @@ function buildSearchTemplate (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [search_template](http://www.elastic.co/guide/en/elasticsearch/reference/current/search-template.html) request * @@ -107,17 +107,17 @@ function buildSearchTemplate (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index, type } = params - var querystring = semicopy(params, ['method', 'body', 'index', 'type']) + var warnings = [] + var { method, body, index, type, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = body == null ? 'GET' : 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -138,36 +138,8 @@ function buildSearchTemplate (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/security.create_api_key.js b/api/api/security.create_api_key.js index a2e0cd315..a2e6a2e29 100644 --- a/api/api/security.create_api_key.js +++ b/api/api/security.create_api_key.js @@ -24,7 +24,7 @@ function buildSecurityCreateApiKey (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [security.create_api_key](https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-create-api-key.html) request * @@ -64,17 +64,17 @@ function buildSecurityCreateApiKey (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'PUT' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -89,36 +89,8 @@ function buildSecurityCreateApiKey (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/security.get_api_key.js b/api/api/security.get_api_key.js index eb8af6ea9..eea2eb066 100644 --- a/api/api/security.get_api_key.js +++ b/api/api/security.get_api_key.js @@ -24,7 +24,7 @@ function buildSecurityGetApiKey (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [security.get_api_key](https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-get-api-key.html) request * @@ -69,17 +69,17 @@ function buildSecurityGetApiKey (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -94,36 +94,8 @@ function buildSecurityGetApiKey (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/security.invalidate_api_key.js b/api/api/security.invalidate_api_key.js index 983ef2ac8..16f0bf3f1 100644 --- a/api/api/security.invalidate_api_key.js +++ b/api/api/security.invalidate_api_key.js @@ -24,7 +24,7 @@ function buildSecurityInvalidateApiKey (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [security.invalidate_api_key](https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-invalidate-api-key.html) request * @@ -63,17 +63,17 @@ function buildSecurityInvalidateApiKey (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'DELETE' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -88,36 +88,8 @@ function buildSecurityInvalidateApiKey (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/snapshot.create.js b/api/api/snapshot.create.js index a54cc4b8e..d11ff8931 100644 --- a/api/api/snapshot.create.js +++ b/api/api/snapshot.create.js @@ -24,7 +24,7 @@ function buildSnapshotCreate (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [snapshot.create](http://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html) request * @@ -86,17 +86,17 @@ function buildSnapshotCreate (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, repository, snapshot } = params - var querystring = semicopy(params, ['method', 'body', 'repository', 'snapshot']) + var warnings = [] + var { method, body, repository, snapshot, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'PUT' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -111,36 +111,8 @@ function buildSnapshotCreate (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/snapshot.create_repository.js b/api/api/snapshot.create_repository.js index 7d06c4135..c779a0f07 100644 --- a/api/api/snapshot.create_repository.js +++ b/api/api/snapshot.create_repository.js @@ -24,7 +24,7 @@ function buildSnapshotCreateRepository (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [snapshot.create_repository](http://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html) request * @@ -80,17 +80,17 @@ function buildSnapshotCreateRepository (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, repository } = params - var querystring = semicopy(params, ['method', 'body', 'repository']) + var warnings = [] + var { method, body, repository, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'PUT' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -105,36 +105,8 @@ function buildSnapshotCreateRepository (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/snapshot.delete.js b/api/api/snapshot.delete.js index 86e090012..a7338d088 100644 --- a/api/api/snapshot.delete.js +++ b/api/api/snapshot.delete.js @@ -24,7 +24,7 @@ function buildSnapshotDelete (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [snapshot.delete](http://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html) request * @@ -86,17 +86,17 @@ function buildSnapshotDelete (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, repository, snapshot } = params - var querystring = semicopy(params, ['method', 'body', 'repository', 'snapshot']) + var warnings = [] + var { method, body, repository, snapshot, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'DELETE' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -111,36 +111,8 @@ function buildSnapshotDelete (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/snapshot.delete_repository.js b/api/api/snapshot.delete_repository.js index 48aa929e1..af9c5a287 100644 --- a/api/api/snapshot.delete_repository.js +++ b/api/api/snapshot.delete_repository.js @@ -24,7 +24,7 @@ function buildSnapshotDeleteRepository (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [snapshot.delete_repository](http://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html) request * @@ -77,17 +77,17 @@ function buildSnapshotDeleteRepository (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, repository } = params - var querystring = semicopy(params, ['method', 'body', 'repository']) + var warnings = [] + var { method, body, repository, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'DELETE' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -102,36 +102,8 @@ function buildSnapshotDeleteRepository (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/snapshot.get.js b/api/api/snapshot.get.js index 621f7417c..86a18d362 100644 --- a/api/api/snapshot.get.js +++ b/api/api/snapshot.get.js @@ -24,7 +24,7 @@ function buildSnapshotGet (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [snapshot.get](http://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html) request * @@ -91,17 +91,17 @@ function buildSnapshotGet (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, repository, snapshot } = params - var querystring = semicopy(params, ['method', 'body', 'repository', 'snapshot']) + var warnings = [] + var { method, body, repository, snapshot, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -116,36 +116,8 @@ function buildSnapshotGet (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/snapshot.get_repository.js b/api/api/snapshot.get_repository.js index ae7d9fcdc..3de7b4b7e 100644 --- a/api/api/snapshot.get_repository.js +++ b/api/api/snapshot.get_repository.js @@ -24,7 +24,7 @@ function buildSnapshotGetRepository (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [snapshot.get_repository](http://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html) request * @@ -73,17 +73,17 @@ function buildSnapshotGetRepository (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, repository } = params - var querystring = semicopy(params, ['method', 'body', 'repository']) + var warnings = [] + var { method, body, repository, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -102,36 +102,8 @@ function buildSnapshotGetRepository (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/snapshot.restore.js b/api/api/snapshot.restore.js index 217bb7fef..5694aa4ec 100644 --- a/api/api/snapshot.restore.js +++ b/api/api/snapshot.restore.js @@ -24,7 +24,7 @@ function buildSnapshotRestore (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [snapshot.restore](http://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html) request * @@ -86,17 +86,17 @@ function buildSnapshotRestore (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, repository, snapshot } = params - var querystring = semicopy(params, ['method', 'body', 'repository', 'snapshot']) + var warnings = [] + var { method, body, repository, snapshot, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -111,36 +111,8 @@ function buildSnapshotRestore (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/snapshot.status.js b/api/api/snapshot.status.js index bf15fa342..6a8213b16 100644 --- a/api/api/snapshot.status.js +++ b/api/api/snapshot.status.js @@ -24,7 +24,7 @@ function buildSnapshotStatus (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [snapshot.status](http://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html) request * @@ -81,17 +81,17 @@ function buildSnapshotStatus (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, repository, snapshot } = params - var querystring = semicopy(params, ['method', 'body', 'repository', 'snapshot']) + var warnings = [] + var { method, body, repository, snapshot, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -112,36 +112,8 @@ function buildSnapshotStatus (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/snapshot.verify_repository.js b/api/api/snapshot.verify_repository.js index 0bb67a727..fcf6a1caa 100644 --- a/api/api/snapshot.verify_repository.js +++ b/api/api/snapshot.verify_repository.js @@ -24,7 +24,7 @@ function buildSnapshotVerifyRepository (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [snapshot.verify_repository](http://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html) request * @@ -77,17 +77,17 @@ function buildSnapshotVerifyRepository (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, repository } = params - var querystring = semicopy(params, ['method', 'body', 'repository']) + var warnings = [] + var { method, body, repository, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -102,36 +102,8 @@ function buildSnapshotVerifyRepository (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/tasks.cancel.js b/api/api/tasks.cancel.js index 6e674b2b2..1dbd66ac4 100644 --- a/api/api/tasks.cancel.js +++ b/api/api/tasks.cancel.js @@ -24,7 +24,7 @@ function buildTasksCancel (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [tasks.cancel](http://www.elastic.co/guide/en/elasticsearch/reference/master/tasks.html) request * @@ -75,17 +75,17 @@ function buildTasksCancel (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, taskId, task_id } = params - var querystring = semicopy(params, ['method', 'body', 'taskId', 'task_id']) + var warnings = [] + var { method, body, taskId, task_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -104,36 +104,8 @@ function buildTasksCancel (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/tasks.get.js b/api/api/tasks.get.js index c3435158f..d4e886adb 100644 --- a/api/api/tasks.get.js +++ b/api/api/tasks.get.js @@ -24,7 +24,7 @@ function buildTasksGet (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [tasks.get](http://www.elastic.co/guide/en/elasticsearch/reference/master/tasks.html) request * @@ -77,17 +77,17 @@ function buildTasksGet (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, taskId, task_id } = params - var querystring = semicopy(params, ['method', 'body', 'taskId', 'task_id']) + var warnings = [] + var { method, body, taskId, task_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -102,36 +102,8 @@ function buildTasksGet (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/tasks.list.js b/api/api/tasks.list.js index 9d74e774d..e8a69211f 100644 --- a/api/api/tasks.list.js +++ b/api/api/tasks.list.js @@ -24,7 +24,7 @@ function buildTasksList (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [tasks.list](http://www.elastic.co/guide/en/elasticsearch/reference/master/tasks.html) request * @@ -84,17 +84,17 @@ function buildTasksList (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -109,36 +109,8 @@ function buildTasksList (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/termvectors.js b/api/api/termvectors.js index d889fb9a1..5dde2e86e 100644 --- a/api/api/termvectors.js +++ b/api/api/termvectors.js @@ -24,7 +24,7 @@ function buildTermvectors (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [termvectors](http://www.elastic.co/guide/en/elasticsearch/reference/master/docs-termvectors.html) request * @@ -102,17 +102,17 @@ function buildTermvectors (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index, type, id } = params - var querystring = semicopy(params, ['method', 'body', 'index', 'type', 'id']) + var warnings = [] + var { method, body, index, type, id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = body == null ? 'GET' : 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -131,36 +131,8 @@ function buildTermvectors (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/update.js b/api/api/update.js index cfbd8c78a..26ec2707a 100644 --- a/api/api/update.js +++ b/api/api/update.js @@ -24,7 +24,7 @@ function buildUpdate (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [update](http://www.elastic.co/guide/en/elasticsearch/reference/master/docs-update.html) request * @@ -120,17 +120,17 @@ function buildUpdate (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, id, index, type } = params - var querystring = semicopy(params, ['method', 'body', 'id', 'index', 'type']) + var warnings = [] + var { method, body, id, index, type, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -145,36 +145,8 @@ function buildUpdate (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/update_by_query.js b/api/api/update_by_query.js index ac34e44db..7d7d7bc47 100644 --- a/api/api/update_by_query.js +++ b/api/api/update_by_query.js @@ -24,7 +24,7 @@ function buildUpdateByQuery (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [update_by_query](https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-update-by-query.html) request * @@ -160,17 +160,17 @@ function buildUpdateByQuery (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index, type } = params - var querystring = semicopy(params, ['method', 'body', 'index', 'type']) + var warnings = [] + var { method, body, index, type, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -189,36 +189,8 @@ function buildUpdateByQuery (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/update_by_query_rethrottle.js b/api/api/update_by_query_rethrottle.js index 050feed99..59a72a6e5 100644 --- a/api/api/update_by_query_rethrottle.js +++ b/api/api/update_by_query_rethrottle.js @@ -24,7 +24,7 @@ function buildUpdateByQueryRethrottle (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [update_by_query_rethrottle](https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-update-by-query.html) request * @@ -79,17 +79,17 @@ function buildUpdateByQueryRethrottle (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, taskId, task_id } = params - var querystring = semicopy(params, ['method', 'body', 'taskId', 'task_id']) + var warnings = [] + var { method, body, taskId, task_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -104,36 +104,8 @@ function buildUpdateByQueryRethrottle (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.graph.explore.js b/api/api/xpack.graph.explore.js index cf9ab5d93..5bed3421a 100644 --- a/api/api/xpack.graph.explore.js +++ b/api/api/xpack.graph.explore.js @@ -24,7 +24,7 @@ function buildXpackGraphExplore (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.graph.explore](https://www.elastic.co/guide/en/elasticsearch/reference/current/graph-explore-api.html) request * @@ -68,17 +68,17 @@ function buildXpackGraphExplore (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index, type } = params - var querystring = semicopy(params, ['method', 'body', 'index', 'type']) + var warnings = [] + var { method, body, index, type, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = body == null ? 'GET' : 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -97,36 +97,8 @@ function buildXpackGraphExplore (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.info.js b/api/api/xpack.info.js index 22d1f9f18..504e3543d 100644 --- a/api/api/xpack.info.js +++ b/api/api/xpack.info.js @@ -24,7 +24,7 @@ function buildXpackInfo (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.info](https://www.elastic.co/guide/en/elasticsearch/reference/current/info-api.html) request * @@ -63,17 +63,17 @@ function buildXpackInfo (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -88,36 +88,8 @@ function buildXpackInfo (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.license.delete.js b/api/api/xpack.license.delete.js index b76136f93..688f9d972 100644 --- a/api/api/xpack.license.delete.js +++ b/api/api/xpack.license.delete.js @@ -24,7 +24,7 @@ function buildXpackLicenseDelete (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.license.delete](https://www.elastic.co/guide/en/x-pack/current/license-management.html) request * @@ -62,17 +62,17 @@ function buildXpackLicenseDelete (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'DELETE' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -87,36 +87,8 @@ function buildXpackLicenseDelete (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.license.get.js b/api/api/xpack.license.get.js index e8f868277..66190c522 100644 --- a/api/api/xpack.license.get.js +++ b/api/api/xpack.license.get.js @@ -24,7 +24,7 @@ function buildXpackLicenseGet (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.license.get](https://www.elastic.co/guide/en/x-pack/current/license-management.html) request * @@ -63,17 +63,17 @@ function buildXpackLicenseGet (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -88,36 +88,8 @@ function buildXpackLicenseGet (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.license.get_basic_status.js b/api/api/xpack.license.get_basic_status.js index 97f323bde..4c8ed130c 100644 --- a/api/api/xpack.license.get_basic_status.js +++ b/api/api/xpack.license.get_basic_status.js @@ -24,7 +24,7 @@ function buildXpackLicenseGetBasicStatus (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.license.get_basic_status](https://www.elastic.co/guide/en/x-pack/current/license-management.html) request * @@ -62,17 +62,17 @@ function buildXpackLicenseGetBasicStatus (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -87,36 +87,8 @@ function buildXpackLicenseGetBasicStatus (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.license.get_trial_status.js b/api/api/xpack.license.get_trial_status.js index 2a8964dcc..2cbfa7ddb 100644 --- a/api/api/xpack.license.get_trial_status.js +++ b/api/api/xpack.license.get_trial_status.js @@ -24,7 +24,7 @@ function buildXpackLicenseGetTrialStatus (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.license.get_trial_status](https://www.elastic.co/guide/en/x-pack/current/license-management.html) request * @@ -62,17 +62,17 @@ function buildXpackLicenseGetTrialStatus (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -87,36 +87,8 @@ function buildXpackLicenseGetTrialStatus (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.license.post.js b/api/api/xpack.license.post.js index 1b2b6577a..c0b671040 100644 --- a/api/api/xpack.license.post.js +++ b/api/api/xpack.license.post.js @@ -24,7 +24,7 @@ function buildXpackLicensePost (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.license.post](https://www.elastic.co/guide/en/x-pack/current/license-management.html) request * @@ -58,17 +58,17 @@ function buildXpackLicensePost (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'PUT' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -83,36 +83,8 @@ function buildXpackLicensePost (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.license.post_start_basic.js b/api/api/xpack.license.post_start_basic.js index 36ed7443d..8ac6012bf 100644 --- a/api/api/xpack.license.post_start_basic.js +++ b/api/api/xpack.license.post_start_basic.js @@ -24,7 +24,7 @@ function buildXpackLicensePostStartBasic (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.license.post_start_basic](https://www.elastic.co/guide/en/x-pack/current/license-management.html) request * @@ -63,17 +63,17 @@ function buildXpackLicensePostStartBasic (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -88,36 +88,8 @@ function buildXpackLicensePostStartBasic (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.license.post_start_trial.js b/api/api/xpack.license.post_start_trial.js index a57247984..ff777061c 100644 --- a/api/api/xpack.license.post_start_trial.js +++ b/api/api/xpack.license.post_start_trial.js @@ -24,7 +24,7 @@ function buildXpackLicensePostStartTrial (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.license.post_start_trial](https://www.elastic.co/guide/en/x-pack/current/license-management.html) request * @@ -65,17 +65,17 @@ function buildXpackLicensePostStartTrial (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -90,36 +90,8 @@ function buildXpackLicensePostStartTrial (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.migration.deprecations.js b/api/api/xpack.migration.deprecations.js index 3ff1090ec..1ccef4a17 100644 --- a/api/api/xpack.migration.deprecations.js +++ b/api/api/xpack.migration.deprecations.js @@ -24,7 +24,7 @@ function buildXpackMigrationDeprecations (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.migration.deprecations](http://www.elastic.co/guide/en/migration/current/migration-api-deprecation.html) request * @@ -63,17 +63,17 @@ function buildXpackMigrationDeprecations (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index } = params - var querystring = semicopy(params, ['method', 'body', 'index']) + var warnings = [] + var { method, body, index, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -92,36 +92,8 @@ function buildXpackMigrationDeprecations (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.migration.upgrade.js b/api/api/xpack.migration.upgrade.js index d2844c776..ef1c5c20f 100644 --- a/api/api/xpack.migration.upgrade.js +++ b/api/api/xpack.migration.upgrade.js @@ -24,7 +24,7 @@ function buildXpackMigrationUpgrade (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.migration.upgrade](https://www.elastic.co/guide/en/elasticsearch/reference/current/migration-api-upgrade.html) request * @@ -64,17 +64,23 @@ function buildXpackMigrationUpgrade (opts) { return handleError(err, callback) } +<<<<<<< HEAD:api/api/xpack.migration.upgrade.js var warnings = null var { method, body, index } = params var querystring = semicopy(params, ['method', 'body', 'index']) +======= + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) +>>>>>>> 215cc03... Simplify API wrappers (#839):api/api/data_frame.preview_data_frame_transform.js if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -89,36 +95,8 @@ function buildXpackMigrationUpgrade (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.ml.close_job.js b/api/api/xpack.ml.close_job.js index 2dc5cf0d3..7634e8a48 100644 --- a/api/api/xpack.ml.close_job.js +++ b/api/api/xpack.ml.close_job.js @@ -24,7 +24,7 @@ function buildXpackMlCloseJob (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.ml.close_job](http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-close-job.html) request * @@ -70,17 +70,17 @@ function buildXpackMlCloseJob (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, jobId, job_id } = params - var querystring = semicopy(params, ['method', 'body', 'jobId', 'job_id']) + var warnings = [] + var { method, body, jobId, job_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -95,36 +95,8 @@ function buildXpackMlCloseJob (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.ml.delete_calendar.js b/api/api/xpack.ml.delete_calendar.js index aca25986a..80f664773 100644 --- a/api/api/xpack.ml.delete_calendar.js +++ b/api/api/xpack.ml.delete_calendar.js @@ -24,7 +24,7 @@ function buildXpackMlDeleteCalendar (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.ml.delete_calendar](undefined) request * @@ -67,17 +67,17 @@ function buildXpackMlDeleteCalendar (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, calendarId, calendar_id } = params - var querystring = semicopy(params, ['method', 'body', 'calendarId', 'calendar_id']) + var warnings = [] + var { method, body, calendarId, calendar_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'DELETE' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -92,36 +92,8 @@ function buildXpackMlDeleteCalendar (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.ml.delete_calendar_event.js b/api/api/xpack.ml.delete_calendar_event.js index bee7f6b4f..12baf5a41 100644 --- a/api/api/xpack.ml.delete_calendar_event.js +++ b/api/api/xpack.ml.delete_calendar_event.js @@ -24,7 +24,7 @@ function buildXpackMlDeleteCalendarEvent (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.ml.delete_calendar_event](undefined) request * @@ -78,17 +78,17 @@ function buildXpackMlDeleteCalendarEvent (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, calendarId, calendar_id, eventId, event_id } = params - var querystring = semicopy(params, ['method', 'body', 'calendarId', 'calendar_id', 'eventId', 'event_id']) + var warnings = [] + var { method, body, calendarId, calendar_id, eventId, event_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'DELETE' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -103,36 +103,8 @@ function buildXpackMlDeleteCalendarEvent (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.ml.delete_calendar_job.js b/api/api/xpack.ml.delete_calendar_job.js index b3397a8d1..adf106e9c 100644 --- a/api/api/xpack.ml.delete_calendar_job.js +++ b/api/api/xpack.ml.delete_calendar_job.js @@ -24,7 +24,7 @@ function buildXpackMlDeleteCalendarJob (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.ml.delete_calendar_job](undefined) request * @@ -78,17 +78,17 @@ function buildXpackMlDeleteCalendarJob (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, calendarId, calendar_id, jobId, job_id } = params - var querystring = semicopy(params, ['method', 'body', 'calendarId', 'calendar_id', 'jobId', 'job_id']) + var warnings = [] + var { method, body, calendarId, calendar_id, jobId, job_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'DELETE' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -103,36 +103,8 @@ function buildXpackMlDeleteCalendarJob (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.ml.delete_datafeed.js b/api/api/xpack.ml.delete_datafeed.js index 8fc645432..5f7b637ac 100644 --- a/api/api/xpack.ml.delete_datafeed.js +++ b/api/api/xpack.ml.delete_datafeed.js @@ -24,7 +24,7 @@ function buildXpackMlDeleteDatafeed (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.ml.delete_datafeed](http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-delete-datafeed.html) request * @@ -68,17 +68,17 @@ function buildXpackMlDeleteDatafeed (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, datafeedId, datafeed_id } = params - var querystring = semicopy(params, ['method', 'body', 'datafeedId', 'datafeed_id']) + var warnings = [] + var { method, body, datafeedId, datafeed_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'DELETE' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -93,36 +93,8 @@ function buildXpackMlDeleteDatafeed (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.ml.delete_expired_data.js b/api/api/xpack.ml.delete_expired_data.js index 9871bfd69..ccf1b4a54 100644 --- a/api/api/xpack.ml.delete_expired_data.js +++ b/api/api/xpack.ml.delete_expired_data.js @@ -24,7 +24,7 @@ function buildXpackMlDeleteExpiredData (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.ml.delete_expired_data](undefined) request * @@ -62,17 +62,17 @@ function buildXpackMlDeleteExpiredData (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'DELETE' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -87,36 +87,8 @@ function buildXpackMlDeleteExpiredData (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.ml.delete_filter.js b/api/api/xpack.ml.delete_filter.js index f85a3dbe0..e040d5fdd 100644 --- a/api/api/xpack.ml.delete_filter.js +++ b/api/api/xpack.ml.delete_filter.js @@ -24,7 +24,7 @@ function buildXpackMlDeleteFilter (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.ml.delete_filter](undefined) request * @@ -67,17 +67,17 @@ function buildXpackMlDeleteFilter (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, filterId, filter_id } = params - var querystring = semicopy(params, ['method', 'body', 'filterId', 'filter_id']) + var warnings = [] + var { method, body, filterId, filter_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'DELETE' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -92,36 +92,8 @@ function buildXpackMlDeleteFilter (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.ml.delete_forecast.js b/api/api/xpack.ml.delete_forecast.js index 0a7926bfc..1fca8b64c 100644 --- a/api/api/xpack.ml.delete_forecast.js +++ b/api/api/xpack.ml.delete_forecast.js @@ -24,7 +24,7 @@ function buildXpackMlDeleteForecast (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.ml.delete_forecast](http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-delete-forecast.html) request * @@ -78,17 +78,17 @@ function buildXpackMlDeleteForecast (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, jobId, job_id, forecastId, forecast_id } = params - var querystring = semicopy(params, ['method', 'body', 'jobId', 'job_id', 'forecastId', 'forecast_id']) + var warnings = [] + var { method, body, jobId, job_id, forecastId, forecast_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'DELETE' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -107,36 +107,8 @@ function buildXpackMlDeleteForecast (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.ml.delete_job.js b/api/api/xpack.ml.delete_job.js index 185c7919d..cbffc1cac 100644 --- a/api/api/xpack.ml.delete_job.js +++ b/api/api/xpack.ml.delete_job.js @@ -24,7 +24,7 @@ function buildXpackMlDeleteJob (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.ml.delete_job](http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-delete-job.html) request * @@ -70,17 +70,17 @@ function buildXpackMlDeleteJob (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, jobId, job_id } = params - var querystring = semicopy(params, ['method', 'body', 'jobId', 'job_id']) + var warnings = [] + var { method, body, jobId, job_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'DELETE' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -95,36 +95,8 @@ function buildXpackMlDeleteJob (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.ml.delete_model_snapshot.js b/api/api/xpack.ml.delete_model_snapshot.js index eb0c28aac..438f3754e 100644 --- a/api/api/xpack.ml.delete_model_snapshot.js +++ b/api/api/xpack.ml.delete_model_snapshot.js @@ -24,7 +24,7 @@ function buildXpackMlDeleteModelSnapshot (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.ml.delete_model_snapshot](http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-delete-snapshot.html) request * @@ -78,17 +78,17 @@ function buildXpackMlDeleteModelSnapshot (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, jobId, job_id, snapshotId, snapshot_id } = params - var querystring = semicopy(params, ['method', 'body', 'jobId', 'job_id', 'snapshotId', 'snapshot_id']) + var warnings = [] + var { method, body, jobId, job_id, snapshotId, snapshot_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'DELETE' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -103,36 +103,8 @@ function buildXpackMlDeleteModelSnapshot (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.ml.find_file_structure.js b/api/api/xpack.ml.find_file_structure.js index 458c55230..9f40d1baa 100644 --- a/api/api/xpack.ml.find_file_structure.js +++ b/api/api/xpack.ml.find_file_structure.js @@ -24,7 +24,7 @@ function buildXpackMlFindFileStructure (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.ml.find_file_structure](http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-file-structure.html) request * @@ -95,17 +95,17 @@ function buildXpackMlFindFileStructure (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -120,36 +120,8 @@ function buildXpackMlFindFileStructure (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.ml.flush_job.js b/api/api/xpack.ml.flush_job.js index 4372f4c8c..a25be9329 100644 --- a/api/api/xpack.ml.flush_job.js +++ b/api/api/xpack.ml.flush_job.js @@ -24,7 +24,7 @@ function buildXpackMlFlushJob (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.ml.flush_job](http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-flush-job.html) request * @@ -75,17 +75,17 @@ function buildXpackMlFlushJob (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, jobId, job_id } = params - var querystring = semicopy(params, ['method', 'body', 'jobId', 'job_id']) + var warnings = [] + var { method, body, jobId, job_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -100,36 +100,8 @@ function buildXpackMlFlushJob (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.ml.forecast.js b/api/api/xpack.ml.forecast.js index 20227b349..db9e7db20 100644 --- a/api/api/xpack.ml.forecast.js +++ b/api/api/xpack.ml.forecast.js @@ -24,7 +24,7 @@ function buildXpackMlForecast (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.ml.forecast](undefined) request * @@ -70,17 +70,17 @@ function buildXpackMlForecast (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, jobId, job_id } = params - var querystring = semicopy(params, ['method', 'body', 'jobId', 'job_id']) + var warnings = [] + var { method, body, jobId, job_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -95,36 +95,8 @@ function buildXpackMlForecast (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.ml.get_buckets.js b/api/api/xpack.ml.get_buckets.js index e6632f41d..94e4113c2 100644 --- a/api/api/xpack.ml.get_buckets.js +++ b/api/api/xpack.ml.get_buckets.js @@ -24,7 +24,7 @@ function buildXpackMlGetBuckets (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.ml.get_buckets](http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-bucket.html) request * @@ -90,17 +90,17 @@ function buildXpackMlGetBuckets (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, jobId, job_id, timestamp } = params - var querystring = semicopy(params, ['method', 'body', 'jobId', 'job_id', 'timestamp']) + var warnings = [] + var { method, body, jobId, job_id, timestamp, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = body == null ? 'GET' : 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -119,36 +119,8 @@ function buildXpackMlGetBuckets (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.ml.get_calendar_events.js b/api/api/xpack.ml.get_calendar_events.js index a44e554a1..b13415d89 100644 --- a/api/api/xpack.ml.get_calendar_events.js +++ b/api/api/xpack.ml.get_calendar_events.js @@ -24,7 +24,7 @@ function buildXpackMlGetCalendarEvents (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.ml.get_calendar_events](undefined) request * @@ -77,17 +77,17 @@ function buildXpackMlGetCalendarEvents (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, calendarId, calendar_id } = params - var querystring = semicopy(params, ['method', 'body', 'calendarId', 'calendar_id']) + var warnings = [] + var { method, body, calendarId, calendar_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -102,36 +102,8 @@ function buildXpackMlGetCalendarEvents (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.ml.get_calendars.js b/api/api/xpack.ml.get_calendars.js index c231e256a..e90777900 100644 --- a/api/api/xpack.ml.get_calendars.js +++ b/api/api/xpack.ml.get_calendars.js @@ -24,7 +24,7 @@ function buildXpackMlGetCalendars (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.ml.get_calendars](undefined) request * @@ -66,17 +66,17 @@ function buildXpackMlGetCalendars (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, calendarId, calendar_id } = params - var querystring = semicopy(params, ['method', 'body', 'calendarId', 'calendar_id']) + var warnings = [] + var { method, body, calendarId, calendar_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = body == null ? 'GET' : 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -95,36 +95,8 @@ function buildXpackMlGetCalendars (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.ml.get_categories.js b/api/api/xpack.ml.get_categories.js index 0851caad6..d78aebcf2 100644 --- a/api/api/xpack.ml.get_categories.js +++ b/api/api/xpack.ml.get_categories.js @@ -24,7 +24,7 @@ function buildXpackMlGetCategories (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.ml.get_categories](http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-category.html) request * @@ -68,17 +68,17 @@ function buildXpackMlGetCategories (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, jobId, job_id, categoryId, category_id } = params - var querystring = semicopy(params, ['method', 'body', 'jobId', 'job_id', 'categoryId', 'category_id']) + var warnings = [] + var { method, body, jobId, job_id, categoryId, category_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = body == null ? 'GET' : 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -97,36 +97,8 @@ function buildXpackMlGetCategories (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.ml.get_datafeed_stats.js b/api/api/xpack.ml.get_datafeed_stats.js index 4652b8f4d..32db247db 100644 --- a/api/api/xpack.ml.get_datafeed_stats.js +++ b/api/api/xpack.ml.get_datafeed_stats.js @@ -24,7 +24,7 @@ function buildXpackMlGetDatafeedStats (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.ml.get_datafeed_stats](http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-datafeed-stats.html) request * @@ -64,17 +64,17 @@ function buildXpackMlGetDatafeedStats (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, datafeedId, datafeed_id } = params - var querystring = semicopy(params, ['method', 'body', 'datafeedId', 'datafeed_id']) + var warnings = [] + var { method, body, datafeedId, datafeed_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -93,36 +93,8 @@ function buildXpackMlGetDatafeedStats (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.ml.get_datafeeds.js b/api/api/xpack.ml.get_datafeeds.js index 5b6537ee8..a1e42f93a 100644 --- a/api/api/xpack.ml.get_datafeeds.js +++ b/api/api/xpack.ml.get_datafeeds.js @@ -24,7 +24,7 @@ function buildXpackMlGetDatafeeds (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.ml.get_datafeeds](http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-datafeed.html) request * @@ -64,17 +64,17 @@ function buildXpackMlGetDatafeeds (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, datafeedId, datafeed_id } = params - var querystring = semicopy(params, ['method', 'body', 'datafeedId', 'datafeed_id']) + var warnings = [] + var { method, body, datafeedId, datafeed_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -93,36 +93,8 @@ function buildXpackMlGetDatafeeds (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.ml.get_filters.js b/api/api/xpack.ml.get_filters.js index add95f9d6..6e192d0db 100644 --- a/api/api/xpack.ml.get_filters.js +++ b/api/api/xpack.ml.get_filters.js @@ -24,7 +24,7 @@ function buildXpackMlGetFilters (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.ml.get_filters](undefined) request * @@ -66,17 +66,17 @@ function buildXpackMlGetFilters (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, filterId, filter_id } = params - var querystring = semicopy(params, ['method', 'body', 'filterId', 'filter_id']) + var warnings = [] + var { method, body, filterId, filter_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -95,36 +95,8 @@ function buildXpackMlGetFilters (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.ml.get_influencers.js b/api/api/xpack.ml.get_influencers.js index fd0caeb48..29cf90778 100644 --- a/api/api/xpack.ml.get_influencers.js +++ b/api/api/xpack.ml.get_influencers.js @@ -24,7 +24,7 @@ function buildXpackMlGetInfluencers (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.ml.get_influencers](http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-influencer.html) request * @@ -81,17 +81,17 @@ function buildXpackMlGetInfluencers (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, jobId, job_id } = params - var querystring = semicopy(params, ['method', 'body', 'jobId', 'job_id']) + var warnings = [] + var { method, body, jobId, job_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = body == null ? 'GET' : 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -106,36 +106,8 @@ function buildXpackMlGetInfluencers (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.ml.get_job_stats.js b/api/api/xpack.ml.get_job_stats.js index e79edcb9a..51571af1e 100644 --- a/api/api/xpack.ml.get_job_stats.js +++ b/api/api/xpack.ml.get_job_stats.js @@ -24,7 +24,7 @@ function buildXpackMlGetJobStats (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.ml.get_job_stats](http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-job-stats.html) request * @@ -64,17 +64,17 @@ function buildXpackMlGetJobStats (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, jobId, job_id } = params - var querystring = semicopy(params, ['method', 'body', 'jobId', 'job_id']) + var warnings = [] + var { method, body, jobId, job_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -93,36 +93,8 @@ function buildXpackMlGetJobStats (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.ml.get_jobs.js b/api/api/xpack.ml.get_jobs.js index 3ec7d782c..6902fd710 100644 --- a/api/api/xpack.ml.get_jobs.js +++ b/api/api/xpack.ml.get_jobs.js @@ -24,7 +24,7 @@ function buildXpackMlGetJobs (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.ml.get_jobs](http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-job.html) request * @@ -64,17 +64,17 @@ function buildXpackMlGetJobs (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, jobId, job_id } = params - var querystring = semicopy(params, ['method', 'body', 'jobId', 'job_id']) + var warnings = [] + var { method, body, jobId, job_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -93,36 +93,8 @@ function buildXpackMlGetJobs (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.ml.get_model_snapshots.js b/api/api/xpack.ml.get_model_snapshots.js index 3d615ce0d..56b5d517c 100644 --- a/api/api/xpack.ml.get_model_snapshots.js +++ b/api/api/xpack.ml.get_model_snapshots.js @@ -24,7 +24,7 @@ function buildXpackMlGetModelSnapshots (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.ml.get_model_snapshots](http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-snapshot.html) request * @@ -82,17 +82,17 @@ function buildXpackMlGetModelSnapshots (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, jobId, job_id, snapshotId, snapshot_id } = params - var querystring = semicopy(params, ['method', 'body', 'jobId', 'job_id', 'snapshotId', 'snapshot_id']) + var warnings = [] + var { method, body, jobId, job_id, snapshotId, snapshot_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = body == null ? 'GET' : 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -111,36 +111,8 @@ function buildXpackMlGetModelSnapshots (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.ml.get_overall_buckets.js b/api/api/xpack.ml.get_overall_buckets.js index 99ee80422..63515c3ac 100644 --- a/api/api/xpack.ml.get_overall_buckets.js +++ b/api/api/xpack.ml.get_overall_buckets.js @@ -24,7 +24,7 @@ function buildXpackMlGetOverallBuckets (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.ml.get_overall_buckets](http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-overall-buckets.html) request * @@ -81,17 +81,17 @@ function buildXpackMlGetOverallBuckets (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, jobId, job_id } = params - var querystring = semicopy(params, ['method', 'body', 'jobId', 'job_id']) + var warnings = [] + var { method, body, jobId, job_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = body == null ? 'GET' : 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -106,36 +106,8 @@ function buildXpackMlGetOverallBuckets (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.ml.get_records.js b/api/api/xpack.ml.get_records.js index 61f41cb67..215e1ebe9 100644 --- a/api/api/xpack.ml.get_records.js +++ b/api/api/xpack.ml.get_records.js @@ -24,7 +24,7 @@ function buildXpackMlGetRecords (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.ml.get_records](http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-record.html) request * @@ -81,17 +81,17 @@ function buildXpackMlGetRecords (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, jobId, job_id } = params - var querystring = semicopy(params, ['method', 'body', 'jobId', 'job_id']) + var warnings = [] + var { method, body, jobId, job_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = body == null ? 'GET' : 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -106,36 +106,8 @@ function buildXpackMlGetRecords (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.ml.info.js b/api/api/xpack.ml.info.js index 9e827f7f0..3b80aa211 100644 --- a/api/api/xpack.ml.info.js +++ b/api/api/xpack.ml.info.js @@ -24,7 +24,7 @@ function buildXpackMlInfo (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.ml.info](undefined) request * @@ -56,17 +56,17 @@ function buildXpackMlInfo (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -81,36 +81,8 @@ function buildXpackMlInfo (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.ml.open_job.js b/api/api/xpack.ml.open_job.js index 17c42e059..7af7b42ba 100644 --- a/api/api/xpack.ml.open_job.js +++ b/api/api/xpack.ml.open_job.js @@ -24,7 +24,7 @@ function buildXpackMlOpenJob (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.ml.open_job](http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-open-job.html) request * @@ -69,17 +69,17 @@ function buildXpackMlOpenJob (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, jobId, job_id, ignoreDowntime, ignore_downtime, timeout } = params - var querystring = semicopy(params, ['method', 'body', 'jobId', 'job_id', 'ignoreDowntime', 'ignore_downtime', 'timeout']) + var warnings = [] + var { method, body, jobId, job_id, ignoreDowntime, ignore_downtime, timeout, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -94,36 +94,8 @@ function buildXpackMlOpenJob (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.ml.post_calendar_events.js b/api/api/xpack.ml.post_calendar_events.js index 59d26ae3e..ef0d49f10 100644 --- a/api/api/xpack.ml.post_calendar_events.js +++ b/api/api/xpack.ml.post_calendar_events.js @@ -24,7 +24,7 @@ function buildXpackMlPostCalendarEvents (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.ml.post_calendar_events](undefined) request * @@ -68,17 +68,17 @@ function buildXpackMlPostCalendarEvents (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, calendarId, calendar_id } = params - var querystring = semicopy(params, ['method', 'body', 'calendarId', 'calendar_id']) + var warnings = [] + var { method, body, calendarId, calendar_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -93,36 +93,8 @@ function buildXpackMlPostCalendarEvents (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.ml.post_data.js b/api/api/xpack.ml.post_data.js index 2ad49309e..b44b86849 100644 --- a/api/api/xpack.ml.post_data.js +++ b/api/api/xpack.ml.post_data.js @@ -24,7 +24,7 @@ function buildXpackMlPostData (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.ml.post_data](http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-post-data.html) request * @@ -72,17 +72,17 @@ function buildXpackMlPostData (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, jobId, job_id } = params - var querystring = semicopy(params, ['method', 'body', 'jobId', 'job_id']) + var warnings = [] + var { method, body, jobId, job_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -97,36 +97,8 @@ function buildXpackMlPostData (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.ml.preview_datafeed.js b/api/api/xpack.ml.preview_datafeed.js index ac5957488..0200daa77 100644 --- a/api/api/xpack.ml.preview_datafeed.js +++ b/api/api/xpack.ml.preview_datafeed.js @@ -24,7 +24,7 @@ function buildXpackMlPreviewDatafeed (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.ml.preview_datafeed](http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-preview-datafeed.html) request * @@ -67,17 +67,17 @@ function buildXpackMlPreviewDatafeed (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, datafeedId, datafeed_id } = params - var querystring = semicopy(params, ['method', 'body', 'datafeedId', 'datafeed_id']) + var warnings = [] + var { method, body, datafeedId, datafeed_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -92,36 +92,8 @@ function buildXpackMlPreviewDatafeed (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.ml.put_calendar.js b/api/api/xpack.ml.put_calendar.js index 56274f654..5d23ff48b 100644 --- a/api/api/xpack.ml.put_calendar.js +++ b/api/api/xpack.ml.put_calendar.js @@ -24,7 +24,7 @@ function buildXpackMlPutCalendar (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.ml.put_calendar](undefined) request * @@ -64,17 +64,17 @@ function buildXpackMlPutCalendar (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, calendarId, calendar_id } = params - var querystring = semicopy(params, ['method', 'body', 'calendarId', 'calendar_id']) + var warnings = [] + var { method, body, calendarId, calendar_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'PUT' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -89,36 +89,8 @@ function buildXpackMlPutCalendar (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.ml.put_calendar_job.js b/api/api/xpack.ml.put_calendar_job.js index 4bb5a3396..3f7235fd1 100644 --- a/api/api/xpack.ml.put_calendar_job.js +++ b/api/api/xpack.ml.put_calendar_job.js @@ -24,7 +24,7 @@ function buildXpackMlPutCalendarJob (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.ml.put_calendar_job](undefined) request * @@ -78,17 +78,17 @@ function buildXpackMlPutCalendarJob (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, calendarId, calendar_id, jobId, job_id } = params - var querystring = semicopy(params, ['method', 'body', 'calendarId', 'calendar_id', 'jobId', 'job_id']) + var warnings = [] + var { method, body, calendarId, calendar_id, jobId, job_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'PUT' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -103,36 +103,8 @@ function buildXpackMlPutCalendarJob (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.ml.put_datafeed.js b/api/api/xpack.ml.put_datafeed.js index 2b2345c51..af62ea5f9 100644 --- a/api/api/xpack.ml.put_datafeed.js +++ b/api/api/xpack.ml.put_datafeed.js @@ -24,7 +24,7 @@ function buildXpackMlPutDatafeed (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.ml.put_datafeed](http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-put-datafeed.html) request * @@ -68,17 +68,17 @@ function buildXpackMlPutDatafeed (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, datafeedId, datafeed_id } = params - var querystring = semicopy(params, ['method', 'body', 'datafeedId', 'datafeed_id']) + var warnings = [] + var { method, body, datafeedId, datafeed_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'PUT' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -93,36 +93,8 @@ function buildXpackMlPutDatafeed (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.ml.put_filter.js b/api/api/xpack.ml.put_filter.js index 0c4107c77..270e9afec 100644 --- a/api/api/xpack.ml.put_filter.js +++ b/api/api/xpack.ml.put_filter.js @@ -24,7 +24,7 @@ function buildXpackMlPutFilter (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.ml.put_filter](undefined) request * @@ -68,17 +68,17 @@ function buildXpackMlPutFilter (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, filterId, filter_id } = params - var querystring = semicopy(params, ['method', 'body', 'filterId', 'filter_id']) + var warnings = [] + var { method, body, filterId, filter_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'PUT' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -93,36 +93,8 @@ function buildXpackMlPutFilter (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.ml.put_job.js b/api/api/xpack.ml.put_job.js index a038f2cef..ecf3cd828 100644 --- a/api/api/xpack.ml.put_job.js +++ b/api/api/xpack.ml.put_job.js @@ -24,7 +24,7 @@ function buildXpackMlPutJob (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.ml.put_job](http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-put-job.html) request * @@ -68,17 +68,17 @@ function buildXpackMlPutJob (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, jobId, job_id } = params - var querystring = semicopy(params, ['method', 'body', 'jobId', 'job_id']) + var warnings = [] + var { method, body, jobId, job_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'PUT' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -93,36 +93,8 @@ function buildXpackMlPutJob (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.ml.revert_model_snapshot.js b/api/api/xpack.ml.revert_model_snapshot.js index 4f0679520..0e1c83fbb 100644 --- a/api/api/xpack.ml.revert_model_snapshot.js +++ b/api/api/xpack.ml.revert_model_snapshot.js @@ -24,7 +24,7 @@ function buildXpackMlRevertModelSnapshot (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.ml.revert_model_snapshot](http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-revert-snapshot.html) request * @@ -76,17 +76,17 @@ function buildXpackMlRevertModelSnapshot (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, jobId, job_id, snapshotId, snapshot_id } = params - var querystring = semicopy(params, ['method', 'body', 'jobId', 'job_id', 'snapshotId', 'snapshot_id']) + var warnings = [] + var { method, body, jobId, job_id, snapshotId, snapshot_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -101,36 +101,8 @@ function buildXpackMlRevertModelSnapshot (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.ml.set_upgrade_mode.js b/api/api/xpack.ml.set_upgrade_mode.js index bb1d32922..5d0fbfac5 100644 --- a/api/api/xpack.ml.set_upgrade_mode.js +++ b/api/api/xpack.ml.set_upgrade_mode.js @@ -24,7 +24,7 @@ function buildXpackMlSetUpgradeMode (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.ml.set_upgrade_mode](http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-set-upgrade-mode.html) request * @@ -65,17 +65,17 @@ function buildXpackMlSetUpgradeMode (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -90,36 +90,8 @@ function buildXpackMlSetUpgradeMode (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.ml.start_datafeed.js b/api/api/xpack.ml.start_datafeed.js index a39fe7bf2..b043c9dfb 100644 --- a/api/api/xpack.ml.start_datafeed.js +++ b/api/api/xpack.ml.start_datafeed.js @@ -24,7 +24,7 @@ function buildXpackMlStartDatafeed (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.ml.start_datafeed](http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-start-datafeed.html) request * @@ -69,17 +69,17 @@ function buildXpackMlStartDatafeed (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, datafeedId, datafeed_id } = params - var querystring = semicopy(params, ['method', 'body', 'datafeedId', 'datafeed_id']) + var warnings = [] + var { method, body, datafeedId, datafeed_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -94,36 +94,8 @@ function buildXpackMlStartDatafeed (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.ml.stop_datafeed.js b/api/api/xpack.ml.stop_datafeed.js index 4225d4e8b..56cfc0eee 100644 --- a/api/api/xpack.ml.stop_datafeed.js +++ b/api/api/xpack.ml.stop_datafeed.js @@ -24,7 +24,7 @@ function buildXpackMlStopDatafeed (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.ml.stop_datafeed](http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-stop-datafeed.html) request * @@ -69,17 +69,17 @@ function buildXpackMlStopDatafeed (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, datafeedId, datafeed_id } = params - var querystring = semicopy(params, ['method', 'body', 'datafeedId', 'datafeed_id']) + var warnings = [] + var { method, body, datafeedId, datafeed_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -94,36 +94,8 @@ function buildXpackMlStopDatafeed (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.ml.update_datafeed.js b/api/api/xpack.ml.update_datafeed.js index de30d6c94..08e7018b2 100644 --- a/api/api/xpack.ml.update_datafeed.js +++ b/api/api/xpack.ml.update_datafeed.js @@ -24,7 +24,7 @@ function buildXpackMlUpdateDatafeed (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.ml.update_datafeed](http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-update-datafeed.html) request * @@ -68,17 +68,17 @@ function buildXpackMlUpdateDatafeed (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, datafeedId, datafeed_id } = params - var querystring = semicopy(params, ['method', 'body', 'datafeedId', 'datafeed_id']) + var warnings = [] + var { method, body, datafeedId, datafeed_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -93,36 +93,8 @@ function buildXpackMlUpdateDatafeed (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.ml.update_filter.js b/api/api/xpack.ml.update_filter.js index ab1fbf067..15ac8baf6 100644 --- a/api/api/xpack.ml.update_filter.js +++ b/api/api/xpack.ml.update_filter.js @@ -24,7 +24,7 @@ function buildXpackMlUpdateFilter (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.ml.update_filter](undefined) request * @@ -68,17 +68,17 @@ function buildXpackMlUpdateFilter (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, filterId, filter_id } = params - var querystring = semicopy(params, ['method', 'body', 'filterId', 'filter_id']) + var warnings = [] + var { method, body, filterId, filter_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -93,36 +93,8 @@ function buildXpackMlUpdateFilter (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.ml.update_job.js b/api/api/xpack.ml.update_job.js index 0b8f2be59..5ae905ac6 100644 --- a/api/api/xpack.ml.update_job.js +++ b/api/api/xpack.ml.update_job.js @@ -24,7 +24,7 @@ function buildXpackMlUpdateJob (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.ml.update_job](http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-update-job.html) request * @@ -68,17 +68,17 @@ function buildXpackMlUpdateJob (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, jobId, job_id } = params - var querystring = semicopy(params, ['method', 'body', 'jobId', 'job_id']) + var warnings = [] + var { method, body, jobId, job_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -93,36 +93,8 @@ function buildXpackMlUpdateJob (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.ml.update_model_snapshot.js b/api/api/xpack.ml.update_model_snapshot.js index 7bfc854bd..a49ac42d9 100644 --- a/api/api/xpack.ml.update_model_snapshot.js +++ b/api/api/xpack.ml.update_model_snapshot.js @@ -24,7 +24,7 @@ function buildXpackMlUpdateModelSnapshot (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.ml.update_model_snapshot](http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-update-snapshot.html) request * @@ -79,17 +79,17 @@ function buildXpackMlUpdateModelSnapshot (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, jobId, job_id, snapshotId, snapshot_id } = params - var querystring = semicopy(params, ['method', 'body', 'jobId', 'job_id', 'snapshotId', 'snapshot_id']) + var warnings = [] + var { method, body, jobId, job_id, snapshotId, snapshot_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -104,36 +104,8 @@ function buildXpackMlUpdateModelSnapshot (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.ml.validate.js b/api/api/xpack.ml.validate.js index 85a29768b..24407e4f2 100644 --- a/api/api/xpack.ml.validate.js +++ b/api/api/xpack.ml.validate.js @@ -24,7 +24,7 @@ function buildXpackMlValidate (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.ml.validate](undefined) request * @@ -63,17 +63,17 @@ function buildXpackMlValidate (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -88,36 +88,8 @@ function buildXpackMlValidate (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.ml.validate_detector.js b/api/api/xpack.ml.validate_detector.js index 409c76f3d..1e83fc3fa 100644 --- a/api/api/xpack.ml.validate_detector.js +++ b/api/api/xpack.ml.validate_detector.js @@ -24,7 +24,7 @@ function buildXpackMlValidateDetector (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.ml.validate_detector](undefined) request * @@ -63,17 +63,17 @@ function buildXpackMlValidateDetector (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -88,36 +88,8 @@ function buildXpackMlValidateDetector (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.monitoring.bulk.js b/api/api/xpack.monitoring.bulk.js index ef12281fb..4517d2bcf 100644 --- a/api/api/xpack.monitoring.bulk.js +++ b/api/api/xpack.monitoring.bulk.js @@ -24,7 +24,7 @@ function buildXpackMonitoringBulk (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.monitoring.bulk](http://www.elastic.co/guide/en/monitoring/current/appendix-api-bulk.html) request * @@ -71,17 +71,17 @@ function buildXpackMonitoringBulk (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, type } = params - var querystring = semicopy(params, ['method', 'body', 'type']) + var warnings = [] + var { method, body, type, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -100,36 +100,8 @@ function buildXpackMonitoringBulk (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.rollup.delete_job.js b/api/api/xpack.rollup.delete_job.js index 4f10be8b5..f8c4d56e0 100644 --- a/api/api/xpack.rollup.delete_job.js +++ b/api/api/xpack.rollup.delete_job.js @@ -24,7 +24,7 @@ function buildXpackRollupDeleteJob (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.rollup.delete_job]() request * @@ -63,17 +63,17 @@ function buildXpackRollupDeleteJob (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, id } = params - var querystring = semicopy(params, ['method', 'body', 'id']) + var warnings = [] + var { method, body, id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'DELETE' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -88,36 +88,8 @@ function buildXpackRollupDeleteJob (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.rollup.get_jobs.js b/api/api/xpack.rollup.get_jobs.js index 0cba7e988..c73c05853 100644 --- a/api/api/xpack.rollup.get_jobs.js +++ b/api/api/xpack.rollup.get_jobs.js @@ -24,7 +24,7 @@ function buildXpackRollupGetJobs (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.rollup.get_jobs]() request * @@ -57,17 +57,17 @@ function buildXpackRollupGetJobs (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, id } = params - var querystring = semicopy(params, ['method', 'body', 'id']) + var warnings = [] + var { method, body, id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -86,36 +86,8 @@ function buildXpackRollupGetJobs (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.rollup.get_rollup_caps.js b/api/api/xpack.rollup.get_rollup_caps.js index 9f2241033..eba24cfaa 100644 --- a/api/api/xpack.rollup.get_rollup_caps.js +++ b/api/api/xpack.rollup.get_rollup_caps.js @@ -24,7 +24,7 @@ function buildXpackRollupGetRollupCaps (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.rollup.get_rollup_caps]() request * @@ -57,17 +57,17 @@ function buildXpackRollupGetRollupCaps (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, id } = params - var querystring = semicopy(params, ['method', 'body', 'id']) + var warnings = [] + var { method, body, id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -86,36 +86,8 @@ function buildXpackRollupGetRollupCaps (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.rollup.get_rollup_index_caps.js b/api/api/xpack.rollup.get_rollup_index_caps.js index 731ddb1f3..5fec4d294 100644 --- a/api/api/xpack.rollup.get_rollup_index_caps.js +++ b/api/api/xpack.rollup.get_rollup_index_caps.js @@ -24,7 +24,7 @@ function buildXpackRollupGetRollupIndexCaps (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.rollup.get_rollup_index_caps]() request * @@ -63,17 +63,17 @@ function buildXpackRollupGetRollupIndexCaps (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index } = params - var querystring = semicopy(params, ['method', 'body', 'index']) + var warnings = [] + var { method, body, index, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -88,36 +88,8 @@ function buildXpackRollupGetRollupIndexCaps (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.rollup.put_job.js b/api/api/xpack.rollup.put_job.js index 45c0c367a..7c42941b8 100644 --- a/api/api/xpack.rollup.put_job.js +++ b/api/api/xpack.rollup.put_job.js @@ -24,7 +24,7 @@ function buildXpackRollupPutJob (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.rollup.put_job]() request * @@ -68,17 +68,17 @@ function buildXpackRollupPutJob (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, id } = params - var querystring = semicopy(params, ['method', 'body', 'id']) + var warnings = [] + var { method, body, id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'PUT' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -93,36 +93,8 @@ function buildXpackRollupPutJob (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.rollup.rollup_search.js b/api/api/xpack.rollup.rollup_search.js index 236c327dc..fe75feff0 100644 --- a/api/api/xpack.rollup.rollup_search.js +++ b/api/api/xpack.rollup.rollup_search.js @@ -24,7 +24,7 @@ function buildXpackRollupRollupSearch (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.rollup.rollup_search]() request * @@ -76,17 +76,17 @@ function buildXpackRollupRollupSearch (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, index, type } = params - var querystring = semicopy(params, ['method', 'body', 'index', 'type']) + var warnings = [] + var { method, body, index, type, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = body == null ? 'GET' : 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -105,36 +105,8 @@ function buildXpackRollupRollupSearch (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.rollup.start_job.js b/api/api/xpack.rollup.start_job.js index 360bb8906..23bc47c32 100644 --- a/api/api/xpack.rollup.start_job.js +++ b/api/api/xpack.rollup.start_job.js @@ -24,7 +24,7 @@ function buildXpackRollupStartJob (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.rollup.start_job]() request * @@ -63,17 +63,17 @@ function buildXpackRollupStartJob (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, id } = params - var querystring = semicopy(params, ['method', 'body', 'id']) + var warnings = [] + var { method, body, id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -88,36 +88,8 @@ function buildXpackRollupStartJob (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.rollup.stop_job.js b/api/api/xpack.rollup.stop_job.js index a628e5e96..763d0b9e9 100644 --- a/api/api/xpack.rollup.stop_job.js +++ b/api/api/xpack.rollup.stop_job.js @@ -24,7 +24,7 @@ function buildXpackRollupStopJob (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.rollup.stop_job]() request * @@ -67,17 +67,17 @@ function buildXpackRollupStopJob (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, id } = params - var querystring = semicopy(params, ['method', 'body', 'id']) + var warnings = [] + var { method, body, id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -92,36 +92,8 @@ function buildXpackRollupStopJob (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.security.authenticate.js b/api/api/xpack.security.authenticate.js index 5228d8c47..3d2b6eb5f 100644 --- a/api/api/xpack.security.authenticate.js +++ b/api/api/xpack.security.authenticate.js @@ -24,7 +24,7 @@ function buildXpackSecurityAuthenticate (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.security.authenticate](https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-authenticate.html) request * @@ -62,17 +62,17 @@ function buildXpackSecurityAuthenticate (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -87,36 +87,8 @@ function buildXpackSecurityAuthenticate (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.security.change_password.js b/api/api/xpack.security.change_password.js index 0c4a3fc7b..6b1309efb 100644 --- a/api/api/xpack.security.change_password.js +++ b/api/api/xpack.security.change_password.js @@ -24,7 +24,7 @@ function buildXpackSecurityChangePassword (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.security.change_password](https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-change-password.html) request * @@ -65,17 +65,17 @@ function buildXpackSecurityChangePassword (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, username } = params - var querystring = semicopy(params, ['method', 'body', 'username']) + var warnings = [] + var { method, body, username, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'PUT' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -94,36 +94,8 @@ function buildXpackSecurityChangePassword (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.security.clear_cached_realms.js b/api/api/xpack.security.clear_cached_realms.js index 888b1e467..d5b7458f8 100644 --- a/api/api/xpack.security.clear_cached_realms.js +++ b/api/api/xpack.security.clear_cached_realms.js @@ -24,7 +24,7 @@ function buildXpackSecurityClearCachedRealms (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.security.clear_cached_realms](https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-clear-cache.html) request * @@ -68,17 +68,17 @@ function buildXpackSecurityClearCachedRealms (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, realms } = params - var querystring = semicopy(params, ['method', 'body', 'realms']) + var warnings = [] + var { method, body, realms, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -93,36 +93,8 @@ function buildXpackSecurityClearCachedRealms (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.security.clear_cached_roles.js b/api/api/xpack.security.clear_cached_roles.js index c8376b292..bb9a8f490 100644 --- a/api/api/xpack.security.clear_cached_roles.js +++ b/api/api/xpack.security.clear_cached_roles.js @@ -24,7 +24,7 @@ function buildXpackSecurityClearCachedRoles (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.security.clear_cached_roles](https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-clear-role-cache.html) request * @@ -67,17 +67,17 @@ function buildXpackSecurityClearCachedRoles (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, name } = params - var querystring = semicopy(params, ['method', 'body', 'name']) + var warnings = [] + var { method, body, name, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -92,36 +92,8 @@ function buildXpackSecurityClearCachedRoles (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.security.delete_privileges.js b/api/api/xpack.security.delete_privileges.js index 30ce7ff3f..a90ee4c81 100644 --- a/api/api/xpack.security.delete_privileges.js +++ b/api/api/xpack.security.delete_privileges.js @@ -24,7 +24,7 @@ function buildXpackSecurityDeletePrivileges (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.security.delete_privileges](TODO) request * @@ -79,17 +79,17 @@ function buildXpackSecurityDeletePrivileges (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, application, name } = params - var querystring = semicopy(params, ['method', 'body', 'application', 'name']) + var warnings = [] + var { method, body, application, name, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'DELETE' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -104,36 +104,8 @@ function buildXpackSecurityDeletePrivileges (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.security.delete_role.js b/api/api/xpack.security.delete_role.js index 1e35530fb..91970c9b8 100644 --- a/api/api/xpack.security.delete_role.js +++ b/api/api/xpack.security.delete_role.js @@ -24,7 +24,7 @@ function buildXpackSecurityDeleteRole (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.security.delete_role](https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-delete-role.html) request * @@ -68,17 +68,17 @@ function buildXpackSecurityDeleteRole (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, name } = params - var querystring = semicopy(params, ['method', 'body', 'name']) + var warnings = [] + var { method, body, name, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'DELETE' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -93,36 +93,8 @@ function buildXpackSecurityDeleteRole (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.security.delete_role_mapping.js b/api/api/xpack.security.delete_role_mapping.js index 329bcf503..30cc1f8c3 100644 --- a/api/api/xpack.security.delete_role_mapping.js +++ b/api/api/xpack.security.delete_role_mapping.js @@ -24,7 +24,7 @@ function buildXpackSecurityDeleteRoleMapping (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.security.delete_role_mapping](https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-delete-role-mapping.html) request * @@ -68,17 +68,17 @@ function buildXpackSecurityDeleteRoleMapping (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, name } = params - var querystring = semicopy(params, ['method', 'body', 'name']) + var warnings = [] + var { method, body, name, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'DELETE' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -93,36 +93,8 @@ function buildXpackSecurityDeleteRoleMapping (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.security.delete_user.js b/api/api/xpack.security.delete_user.js index 84f4116e9..98fd9ddf2 100644 --- a/api/api/xpack.security.delete_user.js +++ b/api/api/xpack.security.delete_user.js @@ -24,7 +24,7 @@ function buildXpackSecurityDeleteUser (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.security.delete_user](https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-delete-user.html) request * @@ -68,17 +68,17 @@ function buildXpackSecurityDeleteUser (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, username } = params - var querystring = semicopy(params, ['method', 'body', 'username']) + var warnings = [] + var { method, body, username, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'DELETE' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -93,36 +93,8 @@ function buildXpackSecurityDeleteUser (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.security.disable_user.js b/api/api/xpack.security.disable_user.js index e89122793..2c8979b24 100644 --- a/api/api/xpack.security.disable_user.js +++ b/api/api/xpack.security.disable_user.js @@ -24,7 +24,7 @@ function buildXpackSecurityDisableUser (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.security.disable_user](https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-disable-user.html) request * @@ -68,17 +68,17 @@ function buildXpackSecurityDisableUser (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, username } = params - var querystring = semicopy(params, ['method', 'body', 'username']) + var warnings = [] + var { method, body, username, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'PUT' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -93,36 +93,8 @@ function buildXpackSecurityDisableUser (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.security.enable_user.js b/api/api/xpack.security.enable_user.js index 32dcdd3bd..961f75195 100644 --- a/api/api/xpack.security.enable_user.js +++ b/api/api/xpack.security.enable_user.js @@ -24,7 +24,7 @@ function buildXpackSecurityEnableUser (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.security.enable_user](https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-enable-user.html) request * @@ -68,17 +68,17 @@ function buildXpackSecurityEnableUser (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, username } = params - var querystring = semicopy(params, ['method', 'body', 'username']) + var warnings = [] + var { method, body, username, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'PUT' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -93,36 +93,8 @@ function buildXpackSecurityEnableUser (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.security.get_privileges.js b/api/api/xpack.security.get_privileges.js index f8104881a..9caba1add 100644 --- a/api/api/xpack.security.get_privileges.js +++ b/api/api/xpack.security.get_privileges.js @@ -24,7 +24,7 @@ function buildXpackSecurityGetPrivileges (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.security.get_privileges](TODO) request * @@ -70,17 +70,17 @@ function buildXpackSecurityGetPrivileges (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, application, name } = params - var querystring = semicopy(params, ['method', 'body', 'application', 'name']) + var warnings = [] + var { method, body, application, name, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -101,36 +101,8 @@ function buildXpackSecurityGetPrivileges (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.security.get_role.js b/api/api/xpack.security.get_role.js index 15f0b33bc..ff0fee5a6 100644 --- a/api/api/xpack.security.get_role.js +++ b/api/api/xpack.security.get_role.js @@ -24,7 +24,7 @@ function buildXpackSecurityGetRole (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.security.get_role](https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-get-role.html) request * @@ -63,17 +63,17 @@ function buildXpackSecurityGetRole (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, name } = params - var querystring = semicopy(params, ['method', 'body', 'name']) + var warnings = [] + var { method, body, name, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -92,36 +92,8 @@ function buildXpackSecurityGetRole (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.security.get_role_mapping.js b/api/api/xpack.security.get_role_mapping.js index 30b13c578..a500db0cc 100644 --- a/api/api/xpack.security.get_role_mapping.js +++ b/api/api/xpack.security.get_role_mapping.js @@ -24,7 +24,7 @@ function buildXpackSecurityGetRoleMapping (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.security.get_role_mapping](https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-get-role-mapping.html) request * @@ -63,17 +63,17 @@ function buildXpackSecurityGetRoleMapping (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, name } = params - var querystring = semicopy(params, ['method', 'body', 'name']) + var warnings = [] + var { method, body, name, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -92,36 +92,8 @@ function buildXpackSecurityGetRoleMapping (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.security.get_token.js b/api/api/xpack.security.get_token.js index d42935fac..1aa52fc03 100644 --- a/api/api/xpack.security.get_token.js +++ b/api/api/xpack.security.get_token.js @@ -24,7 +24,7 @@ function buildXpackSecurityGetToken (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.security.get_token](https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-get-token.html) request * @@ -63,17 +63,17 @@ function buildXpackSecurityGetToken (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -88,36 +88,8 @@ function buildXpackSecurityGetToken (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.security.get_user.js b/api/api/xpack.security.get_user.js index 887dc1a07..168c79911 100644 --- a/api/api/xpack.security.get_user.js +++ b/api/api/xpack.security.get_user.js @@ -24,7 +24,7 @@ function buildXpackSecurityGetUser (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.security.get_user](https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-get-user.html) request * @@ -63,17 +63,17 @@ function buildXpackSecurityGetUser (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, username } = params - var querystring = semicopy(params, ['method', 'body', 'username']) + var warnings = [] + var { method, body, username, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -92,36 +92,8 @@ function buildXpackSecurityGetUser (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.security.get_user_privileges.js b/api/api/xpack.security.get_user_privileges.js index a192ac6b8..a154428a6 100644 --- a/api/api/xpack.security.get_user_privileges.js +++ b/api/api/xpack.security.get_user_privileges.js @@ -24,7 +24,7 @@ function buildXpackSecurityGetUserPrivileges (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.security.get_user_privileges](https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-get-user-privileges.html) request * @@ -62,17 +62,17 @@ function buildXpackSecurityGetUserPrivileges (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -87,36 +87,8 @@ function buildXpackSecurityGetUserPrivileges (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.security.has_privileges.js b/api/api/xpack.security.has_privileges.js index 1823d8a41..b9105356a 100644 --- a/api/api/xpack.security.has_privileges.js +++ b/api/api/xpack.security.has_privileges.js @@ -24,7 +24,7 @@ function buildXpackSecurityHasPrivileges (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.security.has_privileges](https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-has-privileges.html) request * @@ -64,17 +64,17 @@ function buildXpackSecurityHasPrivileges (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, user } = params - var querystring = semicopy(params, ['method', 'body', 'user']) + var warnings = [] + var { method, body, user, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = body == null ? 'GET' : 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -93,36 +93,8 @@ function buildXpackSecurityHasPrivileges (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.security.invalidate_token.js b/api/api/xpack.security.invalidate_token.js index 2d3bd5480..44dd50f15 100644 --- a/api/api/xpack.security.invalidate_token.js +++ b/api/api/xpack.security.invalidate_token.js @@ -24,7 +24,7 @@ function buildXpackSecurityInvalidateToken (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.security.invalidate_token](https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-invalidate-token.html) request * @@ -63,17 +63,17 @@ function buildXpackSecurityInvalidateToken (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'DELETE' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -88,36 +88,8 @@ function buildXpackSecurityInvalidateToken (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.security.put_privileges.js b/api/api/xpack.security.put_privileges.js index aa4f37675..19e8280f7 100644 --- a/api/api/xpack.security.put_privileges.js +++ b/api/api/xpack.security.put_privileges.js @@ -24,7 +24,7 @@ function buildXpackSecurityPutPrivileges (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.security.put_privileges](TODO) request * @@ -64,17 +64,17 @@ function buildXpackSecurityPutPrivileges (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'PUT' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -89,36 +89,8 @@ function buildXpackSecurityPutPrivileges (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.security.put_role.js b/api/api/xpack.security.put_role.js index 667d245c0..1031fce8d 100644 --- a/api/api/xpack.security.put_role.js +++ b/api/api/xpack.security.put_role.js @@ -24,7 +24,7 @@ function buildXpackSecurityPutRole (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.security.put_role](https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-put-role.html) request * @@ -69,17 +69,17 @@ function buildXpackSecurityPutRole (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, name } = params - var querystring = semicopy(params, ['method', 'body', 'name']) + var warnings = [] + var { method, body, name, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'PUT' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -94,36 +94,8 @@ function buildXpackSecurityPutRole (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.security.put_role_mapping.js b/api/api/xpack.security.put_role_mapping.js index 8bd80ac3d..4200923a8 100644 --- a/api/api/xpack.security.put_role_mapping.js +++ b/api/api/xpack.security.put_role_mapping.js @@ -24,7 +24,7 @@ function buildXpackSecurityPutRoleMapping (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.security.put_role_mapping](https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-put-role-mapping.html) request * @@ -69,17 +69,17 @@ function buildXpackSecurityPutRoleMapping (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, name } = params - var querystring = semicopy(params, ['method', 'body', 'name']) + var warnings = [] + var { method, body, name, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'PUT' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -94,36 +94,8 @@ function buildXpackSecurityPutRoleMapping (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.security.put_user.js b/api/api/xpack.security.put_user.js index 7ad4eaa36..69b41facc 100644 --- a/api/api/xpack.security.put_user.js +++ b/api/api/xpack.security.put_user.js @@ -24,7 +24,7 @@ function buildXpackSecurityPutUser (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.security.put_user](https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-put-user.html) request * @@ -69,17 +69,17 @@ function buildXpackSecurityPutUser (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, username } = params - var querystring = semicopy(params, ['method', 'body', 'username']) + var warnings = [] + var { method, body, username, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'PUT' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -94,36 +94,8 @@ function buildXpackSecurityPutUser (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.sql.clear_cursor.js b/api/api/xpack.sql.clear_cursor.js index a0c49cdc5..fb7ef0f29 100644 --- a/api/api/xpack.sql.clear_cursor.js +++ b/api/api/xpack.sql.clear_cursor.js @@ -24,7 +24,7 @@ function buildXpackSqlClearCursor (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.sql.clear_cursor](Clear SQL cursor) request * @@ -63,17 +63,17 @@ function buildXpackSqlClearCursor (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -88,36 +88,8 @@ function buildXpackSqlClearCursor (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.sql.query.js b/api/api/xpack.sql.query.js index ade00c262..970e39a14 100644 --- a/api/api/xpack.sql.query.js +++ b/api/api/xpack.sql.query.js @@ -24,7 +24,7 @@ function buildXpackSqlQuery (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.sql.query](Execute SQL) request * @@ -64,17 +64,17 @@ function buildXpackSqlQuery (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = body == null ? 'GET' : 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -89,36 +89,8 @@ function buildXpackSqlQuery (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.sql.translate.js b/api/api/xpack.sql.translate.js index 928d084c3..176a2e765 100644 --- a/api/api/xpack.sql.translate.js +++ b/api/api/xpack.sql.translate.js @@ -24,7 +24,7 @@ function buildXpackSqlTranslate (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.sql.translate](Translate SQL into Elasticsearch queries) request * @@ -63,17 +63,17 @@ function buildXpackSqlTranslate (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = body == null ? 'GET' : 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -88,36 +88,8 @@ function buildXpackSqlTranslate (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.ssl.certificates.js b/api/api/xpack.ssl.certificates.js index a8eed9992..88625aed5 100644 --- a/api/api/xpack.ssl.certificates.js +++ b/api/api/xpack.ssl.certificates.js @@ -24,7 +24,7 @@ function buildXpackSslCertificates (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.ssl.certificates](https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-ssl.html) request * @@ -62,17 +62,17 @@ function buildXpackSslCertificates (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -87,36 +87,8 @@ function buildXpackSslCertificates (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.usage.js b/api/api/xpack.usage.js index 1885f4d93..e7f3971a3 100644 --- a/api/api/xpack.usage.js +++ b/api/api/xpack.usage.js @@ -24,7 +24,7 @@ function buildXpackUsage (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.usage](Retrieve information about xpack features usage) request * @@ -63,17 +63,17 @@ function buildXpackUsage (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -88,36 +88,8 @@ function buildXpackUsage (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.watcher.ack_watch.js b/api/api/xpack.watcher.ack_watch.js index 637b5a58e..38057ec67 100644 --- a/api/api/xpack.watcher.ack_watch.js +++ b/api/api/xpack.watcher.ack_watch.js @@ -24,7 +24,7 @@ function buildXpackWatcherAckWatch (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.watcher.ack_watch](http://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-api-ack-watch.html) request * @@ -75,17 +75,17 @@ function buildXpackWatcherAckWatch (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, watchId, watch_id, actionId, action_id } = params - var querystring = semicopy(params, ['method', 'body', 'watchId', 'watch_id', 'actionId', 'action_id']) + var warnings = [] + var { method, body, watchId, watch_id, actionId, action_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'PUT' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -104,36 +104,8 @@ function buildXpackWatcherAckWatch (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.watcher.activate_watch.js b/api/api/xpack.watcher.activate_watch.js index 6a2521167..acda9b4ec 100644 --- a/api/api/xpack.watcher.activate_watch.js +++ b/api/api/xpack.watcher.activate_watch.js @@ -24,7 +24,7 @@ function buildXpackWatcherActivateWatch (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.watcher.activate_watch](https://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-api-activate-watch.html) request * @@ -68,17 +68,17 @@ function buildXpackWatcherActivateWatch (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, watchId, watch_id } = params - var querystring = semicopy(params, ['method', 'body', 'watchId', 'watch_id']) + var warnings = [] + var { method, body, watchId, watch_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'PUT' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -93,36 +93,8 @@ function buildXpackWatcherActivateWatch (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.watcher.deactivate_watch.js b/api/api/xpack.watcher.deactivate_watch.js index 4f7e75a41..8fe4c129a 100644 --- a/api/api/xpack.watcher.deactivate_watch.js +++ b/api/api/xpack.watcher.deactivate_watch.js @@ -24,7 +24,7 @@ function buildXpackWatcherDeactivateWatch (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.watcher.deactivate_watch](https://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-api-deactivate-watch.html) request * @@ -68,17 +68,17 @@ function buildXpackWatcherDeactivateWatch (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, watchId, watch_id } = params - var querystring = semicopy(params, ['method', 'body', 'watchId', 'watch_id']) + var warnings = [] + var { method, body, watchId, watch_id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'PUT' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -93,36 +93,8 @@ function buildXpackWatcherDeactivateWatch (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.watcher.delete_watch.js b/api/api/xpack.watcher.delete_watch.js index 9185ba2e3..568bff591 100644 --- a/api/api/xpack.watcher.delete_watch.js +++ b/api/api/xpack.watcher.delete_watch.js @@ -24,7 +24,7 @@ function buildXpackWatcherDeleteWatch (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.watcher.delete_watch](http://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-api-delete-watch.html) request * @@ -68,17 +68,17 @@ function buildXpackWatcherDeleteWatch (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, id } = params - var querystring = semicopy(params, ['method', 'body', 'id']) + var warnings = [] + var { method, body, id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'DELETE' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -93,36 +93,8 @@ function buildXpackWatcherDeleteWatch (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.watcher.execute_watch.js b/api/api/xpack.watcher.execute_watch.js index a4fba60d4..82a2f7a24 100644 --- a/api/api/xpack.watcher.execute_watch.js +++ b/api/api/xpack.watcher.execute_watch.js @@ -24,7 +24,7 @@ function buildXpackWatcherExecuteWatch (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.watcher.execute_watch](http://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-api-execute-watch.html) request * @@ -59,17 +59,17 @@ function buildXpackWatcherExecuteWatch (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, id } = params - var querystring = semicopy(params, ['method', 'body', 'id']) + var warnings = [] + var { method, body, id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'PUT' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -88,36 +88,8 @@ function buildXpackWatcherExecuteWatch (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.watcher.get_watch.js b/api/api/xpack.watcher.get_watch.js index 8a2b02d40..4e51fc549 100644 --- a/api/api/xpack.watcher.get_watch.js +++ b/api/api/xpack.watcher.get_watch.js @@ -24,7 +24,7 @@ function buildXpackWatcherGetWatch (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.watcher.get_watch](http://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-api-get-watch.html) request * @@ -67,17 +67,17 @@ function buildXpackWatcherGetWatch (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, id } = params - var querystring = semicopy(params, ['method', 'body', 'id']) + var warnings = [] + var { method, body, id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -92,36 +92,8 @@ function buildXpackWatcherGetWatch (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.watcher.put_watch.js b/api/api/xpack.watcher.put_watch.js index be0c6470d..d23c08342 100644 --- a/api/api/xpack.watcher.put_watch.js +++ b/api/api/xpack.watcher.put_watch.js @@ -24,7 +24,7 @@ function buildXpackWatcherPutWatch (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.watcher.put_watch](http://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-api-put-watch.html) request * @@ -75,17 +75,17 @@ function buildXpackWatcherPutWatch (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, id } = params - var querystring = semicopy(params, ['method', 'body', 'id']) + var warnings = [] + var { method, body, id, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'PUT' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -100,36 +100,8 @@ function buildXpackWatcherPutWatch (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.watcher.start.js b/api/api/xpack.watcher.start.js index 8e0e3a48b..3fcdd6443 100644 --- a/api/api/xpack.watcher.start.js +++ b/api/api/xpack.watcher.start.js @@ -24,7 +24,7 @@ function buildXpackWatcherStart (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.watcher.start](http://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-api-start.html) request * @@ -62,17 +62,17 @@ function buildXpackWatcherStart (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -87,36 +87,8 @@ function buildXpackWatcherStart (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.watcher.stats.js b/api/api/xpack.watcher.stats.js index b0fa0b92b..52838f3bf 100644 --- a/api/api/xpack.watcher.stats.js +++ b/api/api/xpack.watcher.stats.js @@ -24,7 +24,7 @@ function buildXpackWatcherStats (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.watcher.stats](http://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-api-stats.html) request * @@ -66,17 +66,17 @@ function buildXpackWatcherStats (opts) { return handleError(err, callback) } - var warnings = null - var { method, body, metric } = params - var querystring = semicopy(params, ['method', 'body', 'metric']) + var warnings = [] + var { method, body, metric, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'GET' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -95,36 +95,8 @@ function buildXpackWatcherStats (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/api/xpack.watcher.stop.js b/api/api/xpack.watcher.stop.js index c3d3c6071..d96ee898d 100644 --- a/api/api/xpack.watcher.stop.js +++ b/api/api/xpack.watcher.stop.js @@ -24,7 +24,7 @@ function buildXpackWatcherStop (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts /** * Perform a [xpack.watcher.stop](http://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-api-stop.html) request * @@ -62,17 +62,17 @@ function buildXpackWatcherStop (opts) { return handleError(err, callback) } - var warnings = null - var { method, body } = params - var querystring = semicopy(params, ['method', 'body']) + var warnings = [] + var { method, body, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { method = 'POST' } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } var path = '' @@ -87,36 +87,8 @@ function buildXpackWatcherStop (opts) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } } diff --git a/api/index.js b/api/index.js index f141843c9..e8b0d35bd 100644 --- a/api/index.js +++ b/api/index.js @@ -28,6 +28,7 @@ function ESAPI (opts) { const { result } = opts opts.handleError = handleError + opts.snakeCaseKeys = snakeCaseKeys const apis = { bulk: lazyLoad('bulk', opts), @@ -493,6 +494,19 @@ function ESAPI (opts) { if (callback) return callback(err, result) return Promise.reject(err) } + + function snakeCaseKeys (acceptedQuerystring, snakeCase, querystring, warnings) { + var target = {} + var keys = Object.keys(querystring) + for (var i = 0, len = keys.length; i < len; i++) { + var key = keys[i] + target[snakeCase[key] || key] = querystring[key] + if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { + warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') + } + } + return target + } } // It's unlikely that a user needs all of our APIs, diff --git a/scripts/utils/generateApis.js b/scripts/utils/generateApis.js index 9e1bfc046..825947737 100644 --- a/scripts/utils/generateApis.js +++ b/scripts/utils/generateApis.js @@ -118,17 +118,17 @@ function generate (spec, common) { return handleError(err, callback) } - var warnings = null - var { ${genQueryBlacklist(false)} } = params - var querystring = semicopy(params, [${genQueryBlacklist()}]) + var warnings = [] + var { ${genQueryBlacklist(false)}, ...querystring } = params + querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings) if (method == null) { ${generatePickMethod(methods)} } - var ignore = options.ignore || null + var ignore = options.ignore if (typeof ignore === 'number') { - ignore = [ignore] + options.ignore = [ignore] } @@ -143,36 +143,8 @@ function generate (spec, common) { querystring } - const requestOptions = { - ignore, - requestTimeout: options.requestTimeout || null, - maxRetries: options.maxRetries || null, - asStream: options.asStream || false, - headers: options.headers || null, - querystring: options.querystring || null, - compression: options.compression || false, - id: options.id || null, - context: options.context || null, - warnings - } - - return makeRequest(request, requestOptions, callback) - - function semicopy (obj, exclude) { - var target = {} - var keys = Object.keys(obj) - for (var i = 0, len = keys.length; i < len; i++) { - var key = keys[i] - if (exclude.indexOf(key) === -1) { - target[snakeCase[key] || key] = obj[key] - if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { - warnings = warnings || [] - warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') - } - } - } - return target - } + options.warnings = warnings.length === 0 ? null : warnings + return makeRequest(request, options, callback) } `.trim() // always call trim to avoid newlines @@ -203,7 +175,7 @@ function generate (spec, common) { function build${name[0].toUpperCase() + name.slice(1)} (opts) { // eslint-disable-next-line no-unused-vars - const { makeRequest, ConfigurationError, handleError } = opts + const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts ${generateDocumentation(spec[api], api)} const acceptedQuerystring = [ diff --git a/scripts/utils/generateMain.js b/scripts/utils/generateMain.js index 7f0a5aeda..99d24f9a9 100644 --- a/scripts/utils/generateMain.js +++ b/scripts/utils/generateMain.js @@ -125,6 +125,7 @@ function genFactory (folder) { const { result } = opts opts.handleError = handleError + opts.snakeCaseKeys = snakeCaseKeys const apis = ${apisStr} @@ -135,6 +136,19 @@ function genFactory (folder) { if (callback) return callback(err, result) return Promise.reject(err) } + + function snakeCaseKeys (acceptedQuerystring, snakeCase, querystring, warnings) { + var target = {} + var keys = Object.keys(querystring) + for (var i = 0, len = keys.length; i < len; i++) { + var key = keys[i] + target[snakeCase[key] || key] = querystring[key] + if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) { + warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter') + } + } + return target + } } // It's unlikely that a user needs all of our APIs, diff --git a/test/unit/events.test.js b/test/unit/events.test.js index 1312de932..7e5e11d69 100644 --- a/test/unit/events.test.js +++ b/test/unit/events.test.js @@ -53,15 +53,7 @@ test('Should emit a request event when a request is performed', t => { 'Content-Length': '0' } }, - options: { - ignore: null, - requestTimeout: null, - maxRetries: null, - asStream: false, - headers: null, - compression: false, - warnings: null - }, + options: {}, id: 1 }, connection: { @@ -114,15 +106,7 @@ test('Should emit a response event in case of a successful response', t => { 'Content-Length': '0' } }, - options: { - ignore: null, - requestTimeout: null, - maxRetries: null, - asStream: false, - headers: null, - compression: false, - warnings: null - }, + options: {}, id: 1 }, connection: { @@ -174,13 +158,7 @@ test('Should emit a response event with the error set', t => { } }, options: { - ignore: null, - requestTimeout: 500, - maxRetries: null, - asStream: false, - headers: null, - compression: false, - warnings: null + requestTimeout: 500 }, id: 1 },