diff --git a/src/fixtures/config_upgrade_from_4.0.0_to_4.0.1-snapshot.json b/src/fixtures/config_upgrade_from_4.0.0_to_4.0.1-snapshot.json index 30990d109cad1..8767232dcdc1c 100644 --- a/src/fixtures/config_upgrade_from_4.0.0_to_4.0.1-snapshot.json +++ b/src/fixtures/config_upgrade_from_4.0.0_to_4.0.1-snapshot.json @@ -13,7 +13,7 @@ { "_index": ".kibana", "_type": "config", - "_id": "4.0.1-snapshot", + "_id": "4.0.1-SNAPSHOT", "_score": 1, "_source": { "buildNum": 5921, diff --git a/src/plugins/elasticsearch/lib/__tests__/is_upgradeable.js b/src/plugins/elasticsearch/lib/__tests__/is_upgradeable.js index ea9bfc07f6e37..b393b049370d6 100644 --- a/src/plugins/elasticsearch/lib/__tests__/is_upgradeable.js +++ b/src/plugins/elasticsearch/lib/__tests__/is_upgradeable.js @@ -40,8 +40,8 @@ describe('plugins/elasticsearch', function () { upgradeDoc('4.0.0-rc2', '4.0.2', true); upgradeDoc('4.0.1', '4.1.0-rc', true); 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('4.0.0-rc1-SNAPSHOT', '4.0.0', false); + upgradeDoc('4.1.0-rc1-SNAPSHOT', '4.1.0-rc1', false); it('should handle missing _id field', function () { let doc = { diff --git a/src/plugins/elasticsearch/lib/__tests__/upgrade_config.js b/src/plugins/elasticsearch/lib/__tests__/upgrade_config.js index debe242ee8919..9a9d72ff32c2b 100644 --- a/src/plugins/elasticsearch/lib/__tests__/upgrade_config.js +++ b/src/plugins/elasticsearch/lib/__tests__/upgrade_config.js @@ -92,7 +92,7 @@ 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' } ] } }; + const response = { hits: { hits: [ { _id: '4.0.1-beta1' }, { _id: '4.0.0-SNAPSHOT1' } ] } }; return upgrade(response).then(function (resp) { expect(resp).to.be(undefined); }); diff --git a/src/plugins/elasticsearch/lib/__tests__/version_satisfies.js b/src/plugins/elasticsearch/lib/__tests__/version_satisfies.js index 20438a445d887..c97e32d81992c 100644 --- a/src/plugins/elasticsearch/lib/__tests__/version_satisfies.js +++ b/src/plugins/elasticsearch/lib/__tests__/version_satisfies.js @@ -21,9 +21,9 @@ const versionChecks = [ ['2.0.1', '^2.0.0', true], ['2.1.1', '^2.1.0', true], ['2.2.0', '^2.1.0', true], - ['3.0.0-snapshot', '^2.1.0', false], + ['3.0.0-SNAPSHOT', '^2.1.0', false], ['3.0.0', '^2.1.0', false], - ['2.10.20-snapshot', '^2.10.20', true], + ['2.10.20-SNAPSHOT', '^2.10.20', true], ['2.10.999', '^2.10.20', true], ]; diff --git a/tasks/config/build.js b/tasks/config/build.js index c1778cd4dbf8e..2cceff4957bbe 100644 --- a/tasks/config/build.js +++ b/tasks/config/build.js @@ -11,5 +11,5 @@ export default (grunt) => { }; function buildVersion(isRelease, version) { - return isRelease ? version : `${version}-snapshot`; + return isRelease ? version : `${version}-SNAPSHOT`; }