Merge pull request #210 from 18F/develop

Database Fixes

Author: XavierMetichecchia

.circleci/config.yml

@@ -46,10 +46,12 @@ jobs:
               sed -i 's@NEW_RELIC_APP_NAME="analytics-reporter-api"@NEW_RELIC_APP_NAME="analytics-reporter-api-develop"@g' entrypoint.sh
 
       - run:
-          name: Delete Knexfile.js and drop sufffix on Knexfile.js.cloudgov
+          name: Delete Config.js and drop sufffix on Config.js.cloudgov
           command: |
+              rm ./src/config.js
+              mv ./src/config.js.cloudgov ./src/config.js
               rm knexfile.js
-              mv knexfile.js.cloudgov knexfile.js
+              mv knexfile.js.cloudgov knexfile.js 
 
       - run:   
           name: Install CF CLI

src/config.js.cloudgov

@@ -0,0 +1,17 @@
+const knexfile = require('../knexfile');
+const VCAP_SERVICES_JSON = JSON.parse(process.env.VCAP_SERVICES);
+
+module.exports = {
+  api_data_gov_secret: process.env.API_DATA_GOV_SECRET,
+  port: process.env.PORT || 4444,
+  postgres: {
+    host : VCAP_SERVICES_JSON["aws-rds"][0]["credentials"]["host"], 
+    user : VCAP_SERVICES_JSON["aws-rds"][0]["credentials"]["username"], 
+    password : VCAP_SERVICES_JSON["aws-rds"][0]["credentials"]["password"],  
+    database : VCAP_SERVICES_JSON["aws-rds"][0]["credentials"]["db_name"], 
+    port: 5432,
+    ssl : true
+ },
+  log_level: process.env.LOG_LEVEL || 'info'
+};
+