tg-redbird 1.2.0-rc → 1.3.0

package/README.md

@@ -274,33 +274,6 @@ docker(redbird).register("stable.api.com", 'company/api:v2.*');
 docker(redbird).register("preview.api.com", 'company/api:v[3-9].*');
 ```
 
-## etcd backend
-Redbird can use [node-etcd](https://github.com/stianeikeland/node-etcd) to automatically create proxy records from an etcd cluster. Configuration
-is accomplished by passing an array of [options](https://github.com/stianeikeland/node-etcd#constructor-options), plus the hosts and path variables,
-which define which etcd cluster hosts, and which directory within those hosts, that Redbird should poll for updates.
-
-```js
-var redbird = require('redbird')({
-  port:8080
-});
-
-var options = {
-  hosts: ['localhost:2379'], // REQUIRED - you must define array of cluster hosts
-	path: ['redbird'], // OPTIONAL - path to etcd keys
-	... // OPTIONAL - pass in node-etcd connection options
-}
-require('redbird').etcd(redbird,options);
-```
-etcd records can be created in one of two ways, either as a target destination pair:
-```/redbird/example.com			"8.8.8.8"```
-or by passing a JSON object containing multiple hosts, and Redbird options:
-```
-/redbird/derek.com				{ "hosts" : ["10.10.10.10", "11.11.11.11"]}
-/redbird/johnathan.com    { "ssl" : true }
-/redbird/jeff.com         { "docker" : "alpine/alpine:latest" }
-```
-
-
 ## Cluster support
 Redbird supports automatic node cluster generation. To use, just specify the number
 of processes that you want Redbird to use in the options object. Redbird will automatically

package/index.js

@@ -2,4 +2,3 @@
 'use strict';
 module.exports = require('./lib/proxy');
 module.exports.docker = require('./lib/docker');
-module.exports.etcd = require('./lib/etcd-backend');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tg-redbird",
-  "version": "1.2.0-rc",
+  "version": "1.3.0",
   "description": "A reverse proxy with support for dynamic tables",
   "main": "index.js",
   "scripts": {
@@ -36,7 +36,6 @@
     "le-store-certbot": "^2.2.3",
     "lodash": "^4.17.15",
     "lru-cache": "^5.1.1",
-    "node-etcd": "^7.0.0",
     "object-hash": "^1.3.1",
     "pino": "^5.15.0",
     "safetimeout": "^0.1.2",

package/lib/etcd-backend.js

@@ -1,90 +0,0 @@
-/*eslint-env node */
-'use strict';
-
-/**
-	Redbird ETCD Module
-	This module handles automatic proxy registration via etcd
-*/
-var Etcd = require('node-etcd');
-
-function ETCDModule(redbird, options) {
-  if (!(this instanceof ETCDModule)) {
-    return new ETCDModule(redbird, options);
-  }
-
-  // Create Redbird Instance and Log
-  this.redbird = redbird;
-  var log = redbird.log;
-  var _this = this;
-
-  // Create node-etcd Instance
-  this.etcd = new Etcd(options.hosts, options.ssloptions);
-  this.etcd_dir = typeof options.path !== 'undefined' ? options.path : 'redbird';
-
-  // Create directory if not created
-  this.etcd.get(this.etcd_dir, function (err, body, header) {
-    if (err && err.errorCode == 100) {
-      _this.etcd.mkdir(_this.etcd_dir, function (err) {
-        if (err) {
-          log.error(err, 'etcd backend error');
-        } else {
-          createWatcher();
-        }
-      });
-    } else if (!err && body.node.dir) {
-      createWatcher();
-    } else {
-      log.error(err, 'etcd backend error');
-    }
-  });
-
-  // Helper function to check if values contain settings
-  function IsJsonString(str) {
-    try {
-      JSON.parse(str);
-    } catch (e) {
-      return false;
-    }
-    return true;
-  }
-
-  // Helper function to pretify etcd directory strings
-  function removeEtcDir(str) {
-    return str.replace(_this.etcd_dir, '').replace(/^\/+|\/+$/g, '');
-  }
-
-  function createWatcher() {
-    // Watch etcd directory
-    _this.watcher = _this.etcd.watcher(_this.etcd_dir, null, { recursive: true });
-
-    // On Add/Update
-    _this.watcher.on('change', function (body, headers) {
-      if (body.node.key && body.node.value && !IsJsonString(body.node.value)) {
-        _this.redbird.register(removeEtcDir(body.node.key), body.node.value);
-      } else if (body.node.key && body.node.value && IsJsonString(body.node.value)) {
-        var config = JSON.parse(body.node.value);
-        if (typeof config.docker !== 'undefined') {
-          require('../')
-            .docker(_this.redbird)
-            .register(body.node.key, body.node.value.docker, body.node.value);
-        } else {
-          _this.redbird.register(removeEtcDir(body.node.key), config.hosts, config);
-        }
-      }
-    });
-
-    // On Delete
-    _this.watcher.on('delete', function (body, headers) {
-      if (body.node.key) {
-        _this.redbird.unregister(removeEtcDir(body.node.key));
-      }
-    });
-
-    // Handle Errors
-    _this.watcher.on('error', function (err) {
-      log.error(err, 'etcd backend error');
-    });
-  }
-}
-
-module.exports = ETCDModule;