From e3a25659798e90ec19e99866c272e51b7415cee4 Mon Sep 17 00:00:00 2001
From: mark <markharrop@yahoo.com>
Date: Thu, 3 May 2018 10:49:20 +0100
Subject: [PATCH 1/2] :bug: ensure required etl-toolkit env is set

---
 CHANGELOG.md                      | 4 ++++
 app/lib/config.js                 | 2 +-
 app/lib/smartEtl.js               | 2 ++
 docker-compose-tests.yml          | 2 ++
 package.json                      | 2 +-
 rancher-config/docker-compose.yml | 1 +
 6 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2471924..f91e69e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+0.8.0 / 2018-05-04
+==================
+- Add require enviroment var check for OUTPUT_FILE, update rancher config
+
 0.8.0 / 2018-05-01
 ==================
 - Refresh all records nightly to ensure removed/added records are picked up
diff --git a/app/lib/config.js b/app/lib/config.js
index 819c1c9..4c935ad 100644
--- a/app/lib/config.js
+++ b/app/lib/config.js
@@ -4,7 +4,7 @@ module.exports = {
   containerName: process.env.CONTAINER_NAME || 'etl-output',
   orgApiUrl: 'https://api.nhs.uk/organisations',
   outputDir: './output',
-  outputFile: process.env.OUTPUT_FILE || 'pharmacy-data',
+  outputFile: process.env.OUTPUT_FILE,
   syndicationApiUrl: 'https://v1.syndication.nhschoices.nhs.uk/organisations/pharmacies',
   version,
 };
diff --git a/app/lib/smartEtl.js b/app/lib/smartEtl.js
index 02ddd5b..d1d0f0b 100644
--- a/app/lib/smartEtl.js
+++ b/app/lib/smartEtl.js
@@ -1,4 +1,5 @@
 const moment = require('moment');
+const requireEnv = require('require-environment-variables');
 
 const etlStore = require('etl-toolkit').etlStore;
 const getModifiedOdsCodes = require('./actions/getModifiedOdsCodes');
@@ -16,6 +17,7 @@ let dataService;
 let startMoment;
 let lastRunDate;
 
+requireEnv(['OUTPUT_FILE']);
 etlStore.setIdKey(RECORD_KEY);
 
 function clearState() {
diff --git a/docker-compose-tests.yml b/docker-compose-tests.yml
index 2de708c..80a8996 100644
--- a/docker-compose-tests.yml
+++ b/docker-compose-tests.yml
@@ -11,6 +11,7 @@ services:
       - pharmacy-etl-test-node_modules:/code/node_modules
     environment:
       NODE_ENV: development
+      OUTPUT_FILE: test-pharmacy-data
 
   test-ci:
     extends:
@@ -21,6 +22,7 @@ services:
       - pharmacy-etl-test-node_modules:/code/node_modules
     environment:
       COVERALLS_REPO_TOKEN: ${COVERALLS_REPO_TOKEN}
+      OUTPUT_FILE: ci-pharmacy-data
       NODE_ENV: development
       TRAVIS: ${TRAVIS}
       TRAVIS_BRANCH: ${TRAVIS_BRANCH}
diff --git a/package.json b/package.json
index 110862a..29b7889 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pharmacy-data-etl",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "ETL to extract data from Syndication/Organisations and store as JSON",
   "main": "app.js",
   "scripts": {
diff --git a/rancher-config/docker-compose.yml b/rancher-config/docker-compose.yml
index 4e79240..58b455c 100644
--- a/rancher-config/docker-compose.yml
+++ b/rancher-config/docker-compose.yml
@@ -8,6 +8,7 @@ services:
       SYNDICATION_API_KEY: ${SYNDICATION_API_KEY}
       DISABLE_SCHEDULER: ${DISABLE_SCHEDULER}
       ETL_SCHEDULE: ${ETL_SCHEDULE}
+      OUTPUT_FILE: pharmacy-data
       NODE_ENV: production
     labels:
       io.rancher.container.pull_image: always

From 78cce20fbbe90b2ef621f6a5b3d485662dd7008e Mon Sep 17 00:00:00 2001
From: mark <markharrop@yahoo.com>
Date: Thu, 3 May 2018 11:46:27 +0100
Subject: [PATCH 2/2] :eyes: correct version in change log

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f91e69e..32d35f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-0.8.0 / 2018-05-04
+0.8.1 / 2018-05-04
 ==================
 - Add require enviroment var check for OUTPUT_FILE, update rancher config