Make getUrl.noAuth use getUrl. Fix elasticsearch and kibana ports in serverConfig.js.
This commit is contained in:
parent
d01db9334b
commit
854489353c
2 changed files with 6 additions and 4 deletions
|
@ -10,13 +10,13 @@ module.exports = {
|
|||
kibana: {
|
||||
protocol: process.env.TEST_UI_KIBANA_PROTOCOL || 'http',
|
||||
hostname: process.env.TEST_UI_KIBANA_HOSTNAME || 'localhost',
|
||||
port: parseInt(process.env.TEST_UI_KIBANA_PORT, 10) || 5601,
|
||||
port: parseInt(process.env.TEST_UI_KIBANA_PORT, 10) || 5620,
|
||||
auth: 'user:notsecure'
|
||||
},
|
||||
elasticsearch: {
|
||||
protocol: process.env.TEST_UI_ES_PROTOCOL || 'http',
|
||||
hostname: process.env.TEST_UI_ES_HOSTNAME || 'localhost',
|
||||
port: parseInt(process.env.TEST_UI_ES_PORT, 10) || 9200,
|
||||
port: parseInt(process.env.TEST_UI_ES_PORT, 10) || 9220,
|
||||
auth: 'admin:notsecure'
|
||||
}
|
||||
},
|
||||
|
|
|
@ -26,6 +26,8 @@ function getUrl(config, app) {
|
|||
};
|
||||
|
||||
getUrl.noAuth = function getUrlNoAuth(config, app) {
|
||||
var configUrl = _.pick(config, function (val, param) { return param !== 'auth'; });
|
||||
return url.format(_.assign(configUrl, app));
|
||||
config = _.pick(config, function (val, param) {
|
||||
return param !== 'auth';
|
||||
});
|
||||
return getUrl(config, app);
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue