Merge pull request #7356 from ycombinator/gh-7353

If there is no upgradeable config, create a new one

src/plugins/elasticsearch/lib/__tests__/is_upgradeable.js

@@ -41,6 +41,7 @@ describe('plugins/elasticsearch', function () {
     upgradeDoc('4.0.0-rc1', '4.0.0', true);
     upgradeDoc('4.0.0-rc1-snapshot', '4.0.0', false);
     upgradeDoc('4.1.0-rc1-snapshot', '4.1.0-rc1', false);
+    upgradeDoc('5.0.0-alpha1', '5.0.0', false);
 
     it('should handle missing _id field', function () {
       let doc = {

src/plugins/elasticsearch/lib/__tests__/upgrade_config.js

@@ -91,10 +91,18 @@ describe('plugins/elasticsearch', function () {
       });
     });
 
-    it('should resolve with undefined if the nothing is upgradeable', function () {
-      const response = { hits: { hits: [ { _id: '4.0.1-beta1' }, { _id: '4.0.0-snapshot1' } ] } };
+    it('should create new config if the nothing is upgradeable', function () {
+      get.withArgs('pkg.buildNum').returns(9833);
+      client.create.returns(Promise.resolve());
+      const response = { hits: { hits: [ { _id: '4.0.1-alpha3' }, { _id: '4.0.1-beta1' }, { _id: '4.0.0-snapshot1' } ] } };
       return upgrade(response).then(function (resp) {
-        expect(resp).to.be(undefined);
+        sinon.assert.calledOnce(client.create);
+        const params = client.create.args[0][0];
+        expect(params).to.have.property('body');
+        expect(params.body).to.have.property('buildNum', 9833);
+        expect(params).to.have.property('index', '.my-kibana');
+        expect(params).to.have.property('type', 'config');
+        expect(params).to.have.property('id', '4.0.1');
       });
     });
 

src/plugins/elasticsearch/lib/is_upgradeable.js

@@ -3,7 +3,7 @@ const rcVersionRegex = /(\d+\.\d+\.\d+)\-rc(\d+)/i;
 
 module.exports = function (server, doc) {
   const config = server.config();
-  if (/beta|snapshot/i.test(doc._id)) return false;
+  if (/alpha|beta|snapshot/i.test(doc._id)) return false;
   if (!doc._id) return false;
   if (doc._id === config.get('pkg.version')) return false;
 

src/plugins/elasticsearch/lib/upgrade_config.js

@@ -9,17 +9,21 @@ module.exports = function (server) {
   const client = server.plugins.elasticsearch.client;
   const config = server.config();
 
+  function createNewConfig() {
+    return client.create({
+      index: config.get('kibana.index'),
+      type: 'config',
+      body: { buildNum: config.get('pkg.buildNum') },
+      id: config.get('pkg.version')
+    });
+  }
+
   return function (response) {
     const newConfig = {};
 
     // Check to see if there are any doc. If not then we set the build number and id
     if (response.hits.hits.length === 0) {
-      return client.create({
-        index: config.get('kibana.index'),
-        type: 'config',
-        body: { buildNum: config.get('pkg.buildNum') },
-        id: config.get('pkg.version')
-      });
+      return createNewConfig();
     }
 
     // if we already have a the current version in the index then we need to stop
@@ -30,9 +34,11 @@ module.exports = function (server) {
     if (devConfig) return Promise.resolve();
 
     // Look for upgradeable configs. If none of them are upgradeable
-    // then resolve with null.
+    // then create a new one.
     const body = _.find(response.hits.hits, isUpgradeable.bind(null, server));
-    if (!body) return Promise.resolve();
+    if (!body) {
+      return createNewConfig();
+    }
 
     // if the build number is still the template string (which it wil be in development)
     // then we need to set it to the max interger. Otherwise we will set it to the build num