update apis and add 1.7

CHANGELOG.md

@@ -1,5 +1,8 @@
 # elasticsearch-js changelog
 
+## 6.0 (unreleased)
+ - Added apiVersion `"1.7"`, which is now the default
+
 ## 5.0 (Jun 9 2015)
  - Added apiVersion `"1.6"`, which is now the default
 

docs/api_methods.asciidoc

@@ -1,5 +1,5 @@
 [[api-reference]]
-== 1.6 API
+== 1.7 API
 
 
 NOTE: This is currently the default API, but in upcomming versions that will change. We recommend setting the `apiVersion` config param when you instantiate your client to make sure that the API does not change unexpectedly.

grunt/config/esvm.js

@@ -4,7 +4,7 @@ var fromRoot = require('path').join.bind(null, __dirname, '..', '..');
 
 var release = process.env.ES_RELEASE;
 var ref = process.env.ES_REF;
-var port = parseFloat(_.get(process.env, 'ES_PORT', 9200));
+var port = parseFloat(_.get(process.env, 'ES_PORT', 9400));
 
 var Version = require('../../scripts/Version');
 var versionedOpts = [

package.json

@@ -20,6 +20,7 @@
       "pattern": "specified in test/unit/coverage.js"
     },
     "supported_es_branches": [
+      "1.7",
       "1.6",
       "1.5",
       "1.4",
@@ -33,7 +34,7 @@
       "master",
       "1.x"
     ],
-    "default_api_branch": "1.6"
+    "default_api_branch": "1.7"
   },
   "devDependencies": {
     "aliasify": "~1.2.4",

src/lib/apis/browser_index.js

@@ -1,5 +1,5 @@
 module.exports = {
+  '1.7': require('./1_7'),
   '1.6': require('./1_6'),
-  '1.5': require('./1_5'),
-  '1.4': require('./1_4')
+  '1.5': require('./1_5')
 };

src/lib/apis/index.js

@@ -1,6 +1,7 @@
 module.exports = {
   'master': require('./master'),
   '1.x': require('./1_x'),
+  '1.7': require('./1_7'),
   '1.6': require('./1_6'),
   '1.5': require('./1_5'),
   '1.4': require('./1_4'),

src/lib/apis/master.js

@@ -24,6 +24,7 @@ api._namespaces = ['cat', 'cluster', 'indices', 'nodes', 'snapshot'];
  * @param {String} params.routing - Specific routing value
  * @param {Date, Number} params.timeout - Explicit operation timeout
  * @param {String} params.type - Default document type for items which don't provide one
+ * @param {String, String[], Boolean} params.fields - Default comma-separated list of fields to return in the response for updates
  * @param {String} params.index - Default index for items which don't provide one
  */
 api.bulk = ca({
@@ -47,6 +48,9 @@ api.bulk = ca({
     },
     type: {
       type: 'string'
+    },
+    fields: {
+      type: 'list'
     }
   },
   urls: [
@@ -4440,7 +4444,6 @@ api.nodes.prototype.info = ca({
             'process',
             'jvm',
             'thread_pool',
-            'network',
             'transport',
             'http',
             'plugins'
@@ -4467,7 +4470,6 @@ api.nodes.prototype.info = ca({
             'process',
             'jvm',
             'thread_pool',
-            'network',
             'transport',
             'http',
             'plugins'
@@ -4545,7 +4547,6 @@ api.nodes.prototype.stats = ca({
             'http',
             'indices',
             'jvm',
-            'network',
             'os',
             'process',
             'thread_pool',
@@ -4591,7 +4592,6 @@ api.nodes.prototype.stats = ca({
             'http',
             'indices',
             'jvm',
-            'network',
             'os',
             'process',
             'thread_pool',
@@ -4612,7 +4612,6 @@ api.nodes.prototype.stats = ca({
             'http',
             'indices',
             'jvm',
-            'network',
             'os',
             'process',
             'thread_pool',
@@ -4663,7 +4662,6 @@ api.nodes.prototype.stats = ca({
             'http',
             'indices',
             'jvm',
-            'network',
             'os',
             'process',
             'thread_pool',

src/lib/client.js

@@ -66,7 +66,7 @@ function Client(config) {
   }
 
 
-  EsApiClient.prototype = _.funcEnum(config, 'apiVersion', Client.apis, '1.6');
+  EsApiClient.prototype = _.funcEnum(config, 'apiVersion', Client.apis, '1.7');
   if (!config.sniffEndpoint && EsApiClient.prototype === Client.apis['0.90']) {
     config.sniffEndpoint = '/_cluster/nodes';
   }