diff options
author | Alex Shatov <alexs@att.com> | 2017-09-15 13:52:31 -0400 |
---|---|---|
committer | Alex Shatov <alexs@att.com> | 2017-09-15 13:52:31 -0400 |
commit | b511ff360603599c43e066722d3902a55fac3f6d (patch) | |
tree | 7caa5c8ceb51568b444f0bd4ed9158fe92e8355e /lib/config.js | |
parent | 3486bd1a77a8a3f198de171fda34c102406a26ea (diff) |
4.2.0 - added the policy-update handling
* API version 4.1.0 - added /policy, /swagger-ui
* new: policy update with queuing of execute-operations
* more data on info - branch+commit-datetime
* expecting consul ip to be in /etc/hosts
* added swagger-ui and added policy to *API.yaml
* common logging - more audits and metrics records
- directly in promise_request
Change-Id: I7d32f34100a16b5b7293ed5afe67f5c8c3098495
Issue-Id: DCAEGEN2-62
Signed-off-by: Alex Shatov <alexs@att.com>
Diffstat (limited to 'lib/config.js')
-rw-r--r-- | lib/config.js | 91 |
1 files changed, 48 insertions, 43 deletions
diff --git a/lib/config.js b/lib/config.js index 4429247..e44e9b5 100644 --- a/lib/config.js +++ b/lib/config.js @@ -1,16 +1,16 @@ /* -Copyright(c) 2017 AT&T Intellectual Property. All rights reserved. +Copyright(c) 2017 AT&T Intellectual Property. All rights reserved. -Licensed under the Apache License, Version 2.0 (the "License"); +Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 -Unless required by applicable law or agreed to in writing, +Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. +CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ @@ -18,11 +18,11 @@ See the License for the specific language governing permissions and limitations * Dispatcher configuration * Configuration may come from environment variables, a value in a Consul key-value store, or defaults, * in that order of precedence. - * + * * The address of the Consul host is passed in an environment variable called CONSUL_HOST. * If present, the configuration value in the key-value store is a UTF-8 serialization of a JSON object. - * - * + * + * * -------------------------------------------------------------------------------------- * | JSON property | Environment variable | Required? | Default | * -------------------------------------------------------------------------------------- @@ -51,7 +51,7 @@ See the License for the specific language governing permissions and limitations * {"admin" : "admin123", "other" : "other123"}, then any incoming HTTP requests must use * Basic authentication and supply "admin" as a user name with "admin123" as the password or * supply "other" as the user name with "other123" as the password. - * + * * The dispatcher will attempt to run using TLS (i.e., as an HTTPS server) if a certificate * file in pkcs12 format is stored at etc/cert/cert and a file containing the corresponding * passphrase is stored at etc/cert/pass. These files can be made available to the container @@ -65,6 +65,7 @@ const consul = require("./consul"); const SSL_CERT_FILE = "etc/cert/cert"; const SSL_PASS_FILE = "etc/cert/pass"; +const PACKAGE_JSON_FILE = "./package.json"; const CONFIG_KEY = "deployment_handler"; /* Configuration is stored under the name "deployment_handler" */ const CM_NAME = "cloudify_manager"; @@ -82,25 +83,23 @@ const DEFAULT_LOG_LEVEL = "INFO"; /* Check configuration for completeness */ const findMissingConfig = function(cfg) { const requiredProps = ['logLevel', 'listenHost', 'listenPort', 'cloudify.url', 'inventory.url']; - return requiredProps.filter(function(p){return !utils.hasProperty(cfg,p);}); + return requiredProps.filter(function(p){return !utils.hasProperty(cfg,p);}); }; /* Fetch configuration */ -const getConfig = function (configStoreAddress) { - const ch = consul({url: configStoreAddress}); - return ch.getKey(CONFIG_KEY) +const getConfig = function() { + return consul.getKey(CONFIG_KEY) .then(function(res) { return res || {}; }) .catch(function(err) { - throw err; + throw err; }); }; /* Get a service host:port */ -const getService = function (configStoreAddress, serviceName) { - const ch = consul({url: configStoreAddress}); - return ch.getService(serviceName) +const getService = function (serviceName) { + return consul.getService(serviceName) .then(function(res) { if (res.length > 0) { return res[0]; @@ -128,86 +127,92 @@ const getFileContents = function(path) { /* Check for a TLS cert file and passphrase */ const getTLSCredentials = function() { var ssl = {}; - + /* Get the passphrase */ return getFileContents(SSL_PASS_FILE) .then(function(phrase) { ssl.passphrase = phrase.toString('utf8').trim(); - + /* Get the cert */ return getFileContents(SSL_CERT_FILE); }) - + .then(function(cert) { - ssl.pfx = cert; /* Keep cert contents as a Buffer */ + ssl.pfx = cert; /* Keep cert contents as a Buffer */ return ssl; }) - + .catch(function(err) { - return {}; + return {}; }); } - -exports.configure = function(configStoreAddress) { +exports.configure = function() { var config = {}; - - /* Construct a URL for Consul, assuming HTTP and the default Consul port */ - const configStoreURL = 'http://' + configStoreAddress + ':8500'; - + /* Get configuration from configuration store */ - return getConfig(configStoreURL) + return getFileContents(PACKAGE_JSON_FILE) + .then(function(package_json) { + package_json = JSON.parse((package_json || "{}").toString('utf8')); + + config.name = package_json.name; + config.description = package_json.description; + config.version = package_json.version || ""; + const ver = require('../version'); + config.branch = ver.branch || ""; + config.commit = ver.commit || ""; + config.commit_datetime = ver.commit_datetime || ""; + + return getConfig(); + }) .then (function(cfg) { + Object.assign(config, cfg); - config = cfg; - /* Override values with environment variables and set defaults as needed */ config.listenPort = process.env.LISTEN_PORT || cfg.listenPort || DEFAULT_LISTEN_PORT; config.listenHost = process.env.LISTEN_HOST || cfg.listenHost || DEFAULT_LISTEN_HOST; config.logLevel = process.env.LOG_LEVEL || cfg.logLevel || DEFAULT_LOG_LEVEL; - + config.cloudify = config.cloudify || {}; config.cloudify.protocol = process.env.CLOUDIFY_PROTOCOL || (cfg.cloudify && cfg.cloudify.protocol) || DEFAULT_CLOUDIFY_PROTOCOL; if ((cfg.cloudify && cfg.cloudify.user) || process.env.CLOUDIFY_USER) { config.cloudify.user = process.env.CLOUDIFY_USER || cfg.cloudify.user; config.cloudify.password = process.env.CLOUDIFY_PASSWORD || cfg.cloudify.password || ""; } - + config.inventory = config.inventory || {}; config.inventory.protocol = process.env.INVENTORY_PROTOCOL || (cfg.inventory && cfg.inventory.protocol) || DEFAULT_INVENTORY_PROTOCOL; - if ((cfg.inventory && cfg.inventory.user)|| process.env.INVENTORY_USER) { + if ((cfg.inventory && cfg.inventory.user)|| process.env.INVENTORY_USER) { config.inventory.user = process.env.INVENTORY_USER || cfg.inventory.user; config.inventory.password = process.env.INVENTORY_PASSWORD || cfg.inventory.password || ""; } /* Get service information for Cloudify Manager */ - return getService(configStoreURL, CM_NAME); + return getService(CM_NAME); }) - + .then(function(cmService) { - config.cloudify.url = config.cloudify.protocol +"://" + cmService.address + ":" + cmService.port + CM_API_PATH; - + /* Get service information for inventory */ - return getService(configStoreURL, INV_NAME); + return getService(INV_NAME); }) - + .then(function(invService) { config.inventory.url = config.inventory.protocol + "://" + invService.address + ":" + invService.port + INV_API_PATH; - + /* Get TLS credentials, if they exist */ return getTLSCredentials(); }) .then(function(tls) { config.ssl = tls; - + /* Check for missing required configuration parameters */ const missing = findMissingConfig(config); if (missing.length > 0) { throw new Error ("Required configuration elements missing: " + missing.join(',')); config = null; } - return config; }); }; |