Move all environment variables into one file

Author: c-w

config.js

@@ -0,0 +1,6 @@
+module.exports = {
+    featuresConnectionString: process.env.FEATURES_CONNECTION_STRING,
+    osmFile: process.env.OSM_FILE,
+    leveldbDir: process.env.LEVELDB_DIR,
+    port: process.env.PORT,
+};

server.js

@@ -8,6 +8,7 @@ const express = require('express'),
       log = common.services.log("featureService/server"),
       morgan = require('morgan'),
       server = require('http').createServer(app),
+      config = require('./config'),
       services = require('./services'),
       controllers = require('./controllers');
 
@@ -26,8 +27,8 @@ services.init(function(err) {
         process.exit(1);
     }
 
-    server.listen(process.env.PORT);
-    log.info('feature server listening on port: ' + process.env.PORT);
+    server.listen(config.port);
+    log.info('feature server listening on port: ' + config.port);
 });
 
 module.exports = server;

services/postgres.js

@@ -3,17 +3,16 @@ const pg = require('pg'),
       querystring = require('querystring'),
       HttpStatus = require('http-status-codes'),
       common = require('service-utils'),
+      config = require('../config'),
       ServiceError = common.utils.ServiceError,
       url = require('url');
 
 function init(callback) {
-    const connectionString = process.env.FEATURES_CONNECTION_STRING;
-
-    if (!connectionString) {
+    if (!config.featuresConnectionString) {
         return callback(new ServiceError(HttpStatus.INTERNAL_SERVER_ERROR, "Environment not set up to connect to DB"));
     }
 
-    const params = url.parse(connectionString);
+    const params = url.parse(config.featuresConnectionString);
     const query = querystring.parse(params.query);
     const auth = params.auth.split(':');
 

test/functional/features.js

@@ -3,10 +3,11 @@
 const assert = require('assert'),
       app = require('../../server'),
       fixtures = require('../fixtures'),
+      config = require('../../config'),
       HttpStatus = require('http-status-codes'),
       request = require('request');
 
-const featuresEndpoint = 'http://localhost:' + process.env.PORT + '/features';
+const featuresEndpoint = 'http://localhost:' + config.port + '/features';
 
 describe('features endpoint', function() {
     it('can get features within a boundingBox and layer', function(done) {

tools/importNaturalFeatures.js

@@ -2,6 +2,7 @@
 
 let pbf2json = require('pbf2json'),
     services = require('../services'),
+    config = require('../config'),
     through = require('through2'),
     Tile = require('geotile');
 
@@ -40,7 +41,7 @@ const FEATURE_TAGS = [
 ];
 
 let config = {
-    file: process.env.OSM_FILE,
+    file: config.osmFile,
     tags: FEATURE_TAGS
 };
 

tools/obsolete/importFeatures.js

@@ -2,6 +2,7 @@
 
 var pbf2json = require('pbf2json'),
     through = require('through2'),
+    config = require('../../config'),
     services = require('./services');
 
 let featureTags = [
@@ -14,9 +15,9 @@ let featureTags = [
 ];
 
 let config = {
-    file: process.env.OSM_FILE,
+    file: config.osmFile,
     tags: featureTags,
-    leveldb: process.env.LEVELDB_DIR
+    leveldb: config.leveldbDir
 };
 
 let count = 0;