Merge pull request #58 from acorncom/strip-heroku-username

Strip Heroku-style usernames from config url

Author: ghedamat

lib/redis.js

@@ -8,7 +8,7 @@ module.exports = CoreObject.extend({
     var redisLib     = lib;
 
     if (options.url) {
-      redisOptions = options.url;
+      redisOptions = this._stripUsernameFromConfigUrl(options.url);
     } else {
       redisOptions = {
         host: options.host,
@@ -211,5 +211,16 @@ module.exports = CoreObject.extend({
         }
       });
     });
+  },
+
+  _stripUsernameFromConfigUrl: function(configUrl) {
+    var regex = /redis:\/\/(\w+):(\w+)(.*)/;
+    var matches = configUrl.match(regex);
+
+    if (matches) {
+      configUrl = 'redis://:' + matches[2] + matches[3];
+    }
+
+    return configUrl;
   }
 });

tests/unit/index-nodetest.js

@@ -95,6 +95,58 @@ describe('redis plugin', function() {
       assert.equal(redisLib.createdClient.options.database, 4);
     });
 
+    describe('handles redis urls appropriately', function() {
+      it('handles pre-stripped urls without a username', function () {
+
+        var plugin = subject.createDeployPlugin({
+          name: 'redis'
+        });
+
+        var redisLib = new FakeRedis();
+
+        var context = {
+          ui: mockUi,
+          project: stubProject,
+          config: {
+            redis: {
+              url: 'redis://:[email protected]:6379/4'
+            }
+          },
+          _redisLib: redisLib
+        };
+        plugin.beforeHook(context);
+        plugin.configure(context);
+        plugin.readConfig('redisDeployClient');
+
+        assert.equal(redisLib.createdClient.options, 'redis://:[email protected]:6379/4');
+      });
+
+      it('strips Redis username from a Heroku url to work with our upstream redis library', function () {
+
+        var plugin = subject.createDeployPlugin({
+          name: 'redis'
+        });
+
+        var redisLib = new FakeRedis();
+
+        var context = {
+          ui: mockUi,
+          project: stubProject,
+          config: {
+            redis: {
+              url: 'redis://username:[email protected]:6379/4'
+            }
+          },
+          _redisLib: redisLib
+        };
+        plugin.beforeHook(context);
+        plugin.configure(context);
+        plugin.readConfig('redisDeployClient');
+
+        assert.equal(redisLib.createdClient.options, 'redis://:[email protected]:6379/4');
+      });
+    });
+
     describe('resolving port from the pipeline', function() {
       it('uses the config data if it already exists', function() {
         var plugin = subject.createDeployPlugin({