Adds support for connecting to password-protected Redis.

Author: Simon Prickett

README.md

@@ -27,7 +27,7 @@ $ npm install
 The application uses a configuration file, `config.json` to specify the port that it listens 
 on plus some logging parameters and how it connects to a database.  
 
-The supplied `config.json` file is already set up to use Redis on localhost port 6379.  Change these values if your Redis instance is on another host or port.
+The supplied `config.json` file is already set up to use Redis on localhost port 6379.  Change these values if your Redis instance is on another host or port, or requires a password to connect.
 
 ```
 {
@@ -40,6 +40,7 @@ The supplied `config.json` file is already set up to use Redis on localhost port
     "redis": {
       "host": "localhost",
       "port": 6379,
+      "password": null,
       "keyPrefix": "ru102js"
     }
   }

config.json

@@ -8,6 +8,7 @@
     "redis": {
       "host": "localhost",
       "port": 6379,
+      "password": null,
       "keyPrefix": "ru102js"
     }
   }

src/daos/impl/redis/redis_client.js

@@ -11,10 +11,16 @@ bluebird.promisifyAll(redis);
 
 // Create a client and connect to Redis using configuration
 // from config.json.
-const client = redis.createClient({
+const clientConfig = {
   host: config.get('dataStores.redis.host'),
   port: config.get('dataStores.redis.port'),
-});
+};
+
+if (config.get('dataStores.redis.password')) {
+  clientConfig.password = config.get('dataStores.redis.password');
+}
+
+const client = redis.createClient(clientConfig);
 
 // This is a catch all basic error handler.
 client.on('error', error => console.log(error));

tests/basic.test.js

@@ -1,13 +1,10 @@
-const redis = require('redis');
-const bluebird = require('bluebird');
+const config = require('better-config');
 
-bluebird.promisifyAll(redis);
+config.set('../config.json');
 
-const client = redis.createClient({
-  host: 'localhost',
-  port: 6379,
-  // password: 'password',
-});
+const redis = require('../src/daos/impl/redis/redis_client');
+
+const client = redis.getClient();
 
 const testSuiteName = 'Basic';
 

tests/capacity_dao_redis_impl.test.js

@@ -1,4 +1,7 @@
 const config = require('better-config');
+
+config.set('../config.json');
+
 const redis = require('../src/daos/impl/redis/redis_client');
 const redisCapacityDAO = require('../src/daos/impl/redis/capacity_dao_redis_impl');
 const keyGenerator = require('../src/daos/impl/redis/redis_key_generator');
@@ -7,7 +10,6 @@ const testSuiteName = 'capacity_dao_redis_impl';
 
 const testKeyPrefix = `test:${testSuiteName}`;
 
-config.set('../config.json');
 keyGenerator.setPrefix(testKeyPrefix);
 const client = redis.getClient();
 

tests/compare_and_update_script.test.js

@@ -1,3 +1,7 @@
+const config = require('better-config');
+
+config.set('../config.json');
+
 const redis = require('../src/daos/impl/redis/redis_client');
 const compareAndUpdateScript = require('../src/daos/impl/redis/scripts/compare_and_update_script');
 

tests/data_types.test.js

@@ -1,13 +1,10 @@
-const redis = require('redis');
-const bluebird = require('bluebird');
+const config = require('better-config');
 
-bluebird.promisifyAll(redis);
+config.set('../config.json');
 
-const client = redis.createClient({
-  host: 'localhost',
-  port: 6379,
-  // password: 'password',
-});
+const redis = require('../src/daos/impl/redis/redis_client');
+
+const client = redis.getClient();
 
 const testSuiteName = 'data_types';
 const testKeyName = `${testSuiteName}:test`;

tests/feed_dao_redis_impl.test.js

@@ -1,4 +1,7 @@
 const config = require('better-config');
+
+config.set('../config.json');
+
 const redis = require('../src/daos/impl/redis/redis_client');
 const redisFeedDAO = require('../src/daos/impl/redis/feed_dao_redis_impl');
 const keyGenerator = require('../src/daos/impl/redis/redis_key_generator');
@@ -7,7 +10,6 @@ const testSuiteName = 'feed_dao_redis_impl';
 
 const testKeyPrefix = `test:${testSuiteName}`;
 
-config.set('../config.json');
 keyGenerator.setPrefix(testKeyPrefix);
 const client = redis.getClient();
 

tests/hello.test.js

@@ -1,13 +1,10 @@
-const redis = require('redis');
-const bluebird = require('bluebird');
+const config = require('better-config');
 
-bluebird.promisifyAll(redis);
+config.set('../config.json');
 
-const client = redis.createClient({
-  host: 'localhost',
-  port: 6379,
-  // password: 'password',
-});
+const redis = require('../src/daos/impl/redis/redis_client');
+
+const client = redis.getClient();
 
 const testSuiteName = 'Hello';
 const testKey = 'hello';

tests/lua.test.js

@@ -1,3 +1,7 @@
+const config = require('better-config');
+
+config.set('../config.json');
+
 const redis = require('../src/daos/impl/redis/redis_client');
 const updateIfLowestScript = require('../src/daos/impl/redis/scripts/update_if_lowest_script');