Skip to content

Make config work with es8 by migrating to @elastic/elasticsearch #141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
michaelkirk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make config work with es8 by migrating to @elastic/elasticsearch #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 1 addition & 13 deletions config/defaults.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,7 @@
{
"esclient": {
"apiVersion": "7.x",
"keepAlive": true,
"requestTimeout": "120000",
"hosts": [{
"env": "development",
"protocol": "http",
"host": "localhost",
"port": 9200
}],
"log": [{
"type": "stdio",
"json": false,
"level": [ "error", "warning" ]
}]
"nodes": ["http://localhost:9200"]
},
"elasticsearch": {
"settings": {
Expand Down
15 changes: 1 addition & 14 deletions config/env.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,6 @@
{
"esclient": {
"hosts": [
{
"env": "production",
"protocol": "http",
"host": "localhost",
"port": 9200
},
{
"env": "production",
"protocol": "http",
"host": "localhost",
"port": 9300
}
]
"nodes": ["http://localhost:9200", "http://localhost:9300"]
},
"imports": {
"geonames": {
Expand Down
19 changes: 1 addition & 18 deletions test/expected-deep.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,7 @@
{
"esclient": {
"apiVersion": "7.x",
"keepAlive": true,
"requestTimeout": "120000",
"hosts": [{
"env": "production",
"protocol": "http",
"host": "localhost",
"port": 9200
},{
"env": "production",
"protocol": "http",
"host": "localhost",
"port": 9300
}],
"log": [{
"type": "stdio",
"json": false,
"level": [ "error", "warning" ]
}]
"nodes": ["http://localhost:9200", "http://localhost:9300"]
},
"elasticsearch": {
"settings": {
Expand Down
16 changes: 8 additions & 8 deletions test/generate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ module.exports.generate.development = function(test) {
t.equal(typeof config, 'object', 'valid function');
t.deepEqual(c, defaults, 'defaults');
t.equal(typeof c.esclient, 'object', 'valid property');
t.equal(Object.keys(c.esclient).length, 5, 'copied all default properties');
t.equal(c.esclient.hosts.length, 1, 'defaults');
t.equal(Object.keys(c.esclient).length, 2, 'copied all default properties');
t.equal(c.esclient.nodes.length, 1, 'defaults');
t.end();

// reset localpath
Expand All @@ -37,7 +37,7 @@ module.exports.generate.production = function(test) {
t.notDeepEqual(c, defaults, 'valid function');
t.equal(typeof c.esclient, 'object', 'valid property');
t.equal(Object.keys(c.esclient).length, 1, 'deleted all default properties');
t.equal(c.esclient.hosts.length, 2, 'shallow merge');
t.equal(c.esclient.nodes.length, 2, 'shallow merge');
t.end();

// unset the PELIAS_CONFIG env var
Expand All @@ -52,8 +52,8 @@ module.exports.generate.production = function(test) {
t.equal(typeof config, 'object', 'valid function');
t.notDeepEqual(c, defaults, 'valid function');
t.equal(typeof c.esclient, 'object', 'valid property');
t.equal(Object.keys(c.esclient).length, 5, 'keep all default properties');
t.equal(c.esclient.hosts.length, 2, 'deep merge should set two hosts');
t.equal(Object.keys(c.esclient).length, 2, 'keep all default properties');
t.equal(c.esclient.nodes.length, 2, 'deep merge should set two nodes');
t.end();

// unset the PELIAS_CONFIG env var
Expand All @@ -68,8 +68,8 @@ module.exports.generate.production = function(test) {
t.equal(typeof config, 'object', 'valid function');
t.notDeepEqual(c, defaults, 'valid function');
t.equal(typeof c.esclient, 'object', 'valid property');
t.equal(Object.keys(c.esclient).length, 5, 'keep all default properties');
t.equal(c.esclient.hosts.length, 2, 'deep merge should set two hosts');
t.equal(Object.keys(c.esclient).length, 2, 'keep all default properties');
t.equal(c.esclient.nodes.length, 2, 'deep merge should set two nodes');
t.end();

// unset the PELIAS_CONFIG env var
Expand Down Expand Up @@ -103,7 +103,7 @@ module.exports.generate.local = function(test) {
t.equal(typeof config, 'object', 'valid function');
t.notDeepEqual(c, defaults, 'valid function');
t.equal(typeof c.esclient, 'object', 'valid property');
t.equal(Object.keys(c.esclient).length, 5, 'keep all default properties');
t.equal(Object.keys(c.esclient).length, 2, 'keep all default properties');
t.equal(c.interpolation.client.adapter, 'http', 'interpolation client');
t.equal(c.interpolation.client.host, 'http://localhost:9999', 'interpolation client');
t.equal(c.imports.geonames.datapath, '/media/hdd', 'local paths');
Expand Down