Rework environmental variables for database

Author: Xavier Metichecchia

.circleci/config.yml

@@ -35,16 +35,22 @@ jobs:
           command: |
               sed -i 's@name: analytics-reporter-api@name: analytics-reporter-api-develop@g' manifest.yml
               sed -i 's@- analytics-reporter-database@- analytics-reporter-database-develop@g' manifest.yml
-              cat manifest.yml      
       - run:
           name: Run sed on entrypoint.sh when deploying to develop
           command: |
               sed -i 's@NEW_RELIC_APP_NAME="analytics-reporter-api"@NEW_RELIC_APP_NAME="analytics-reporter-api-develop"@g' entrypoint.sh
 
+      - run:
+          name: Delete Knewfile.js and drop sufffix on Knexfile.js.cloudgov
+          command: |
+              rm knexfile.js
+              mv knexfile.js.cloudgov knexfile.js
+
       - run:   
           name: Install CF CLI
           command: |
-            sudo wget --user-agent "Mozilla" -q -O - https://packages.cloudfoundry.org/debian/cli.cloudfoundry.org.key | sudo apt-key add - && sudo echo "deb https://packages.cloudfoundry.org/debian stable main" | sudo tee /etc/apt/sources.list.d/cloudfoundry-cli.list && sudo apt-get update && sudo apt-get -y install cf8-cli curl 
+              sudo curl -v -L -o cf8-cli-installer_8.7.4_x86-64.deb 'https://packages.cloudfoundry.org/stable?release=debian64&version=8.7.4'
+              sudo dpkg -i cf8-cli-installer_8.7.4_x86-64.deb
       
       - run:
           name: deploy
@@ -53,8 +59,6 @@ jobs:
               # Log into cloud.gov
               cf api api.fr.cloud.gov
               cf login -u $CF_USERNAME_DEV -p $CF_PASSWORD_DEV -o gsa-opp-analytics -s analytics-dev
-              pwd
-              ls -l
               cat manifest.yml
               cf push -f "./manifest.yml"
               cf logout

entrypoint.sh

@@ -1,11 +1,6 @@
-#!/bin/sh
-#Set Postgres env vars from VCAP_SERVICES
-export POSTGRES_DATABASE=$(echo $VCAP_SERVICES | jq -r '."aws-rds"[].credentials.db_name')
-export POSTGRES_HOST=$(echo $VCAP_SERVICES | jq -r '."aws-rds"[].credentials.host')
-export POSTGRES_PASSWORD=$(echo $VCAP_SERVICES | jq -r '."aws-rds"[].credentials.password')
-export POSTGRES_USER=$(echo $VCAP_SERVICES | jq -r '."aws-rds"[].credentials.username')
-
-
-#This line will get sed replaced based on the environment/branch
+#!/bin/bash
 export NEW_RELIC_APP_NAME="analytics-reporter-api"
 export NODE_ENV="test"
+export PATH="$PATH:/home/vcap/deps/0/bin"
+node deploy/cron.js
+

knexfile.js.cloudgov

@@ -0,0 +1,35 @@
+module.exports = {
+  development: {
+    client: 'postgresql',
+    connection: {
+      database: 'analytics-reporter'
+    }
+  },
+  production: {
+    client: 'postgresql',
+    connection: {
+      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"], 
+
+    },
+    pool: {
+      min: 2,
+      max: 10
+    },
+    migrations: {
+      tableName: 'knex_migrations'
+    }
+  },
+  test: {
+    client: 'postgresql',
+    connection: {
+      user: process.env.CIRCLECI ? 'postgres' : undefined,
+      database: 'analytics-api-test'
+    },
+    migrations: {
+      tableName: 'knex_migrations'
+    }
+  }
+};

manifest.yml

@@ -1,10 +1,10 @@
----
 applications:
-  - name: analytics-reporter-api
-    buildpack: https://github.com/cloudfoundry/nodejs-buildpack
-    memory: 128M
-    instances: 2
-    command: "chmod +x ./entrypoint.sh && ./entrypoint.sh && npm start"
-    services:
-    - analytics-reporter-database
-    stack: cflinuxfs4
+- name: analytics-reporter-api
+  instances: 1
+  memory: 128M
+  buildpacks:
+      - nodejs_buildpack
+  command: "chmod +x ./entrypoint.sh && ./entrypoint.sh"
+  services:
+  - analytics-reporter-database
+  stack: cflinuxfs4