cluster-discovery 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52dee8af31d3c92628213fc8dc3466aff557c9a1
-  data.tar.gz: 0d3d7aef4253ee018c4be0f05c8b08fba9a24a88
+  metadata.gz: 8bc378c4cea55580f914d99730999d212c649c0e
+  data.tar.gz: 2368efc51ec94b712f63fe64bd1a4cb242f01aa8
 SHA512:
-  metadata.gz: 74624cd578d290a6023685cd4161272640fd8de962877cbe4941838218c62a462d2e5bcc5c7045ca00ed8aeef53beaa0453ffc9bebe1c57f3b019abc450c366e
-  data.tar.gz: 90b73cbcdb2f4c9af9eb5b5c1f404267966bcc27946c0f058ece3b00c9ed48a9826a6e19d7dfea2f30a3a3e560bcf235de70853c2d1ef22dd31ccfd40e1331fd
+  metadata.gz: 8259e0e3c2ebc5ba75c46ba85b7f78d0036e211ae521e9e81534966014b32f690001d7b8e7acccffc8be00a1ba9e1e3e281d5ad7df3331c2a4ab18d590889ebd
+  data.tar.gz: 49503b54d04f0319b9a331c71a96a6991b0cc46252de9bb58c052e89e251c49bfe27166a1fbff12a94abc349979fd9c31bc3386adf037c89e7ca7286d6896ddf

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cluster-discovery (0.0.0)
+    cluster-discovery (0.0.1)
       aws-sdk (~> 2.2)
       diplomat (~> 0.15)
 

data/README.md

@@ -58,7 +58,9 @@ instances.map(&:instance_id)
 
 ### Consul
 
-To discover cluster instances using Consul use something like the following example. The keys `consul_url` and `consul_service` are required, `leader` and `tags` are optional.
+To discover cluster instances using Consul use something like the following example. The keys `consul_url` and `consul_service` are required, `leader`, `tags`, and `health` are optional.
+
+By default this will only return nodes passing all health checks.  To change this behavior set `healthy` to `false`.
 
 ```ruby
 instances = Cluster::Discovery.discover(
@@ -66,7 +68,8 @@ instances = Cluster::Discovery.discover(
   consul_url: 'http://my.consul.cluster:8500',
   consul_service: 'redis',
   leader: true,
-  tags: 'master')
+  tags: 'master',
+  health: true)
 instances.map(&:Address)
 ```
 

data/Rakefile

@@ -41,11 +41,11 @@ end
 
 task :refresh_fixtures do
   register_service(id: '1', ip: '192.168.10.10', tag: 'master', status: 'passing')
-  register_service(id: '2', ip: '192.168.10.11', tag: 'slave', status: 'passing')
-  register_service(id: '3', ip: '192.168.10.12', tag: 'master', status: 'passing')
+  register_service(id: '2', ip: '192.168.10.11', tag: 'slave', status: 'warning')
+  register_service(id: '3', ip: '192.168.10.12', tag: 'master', status: 'critical')
   register_service(id: '4', ip: '192.168.10.13', tag: 'slave', status: 'passing')
-  register_service(id: '5', ip: '192.168.10.14', tag: 'master', status: 'passing')
-  register_service(id: '6', ip: '192.168.10.15', tag: 'slave', status: 'passing')
+  register_service(id: '5', ip: '192.168.10.14', tag: 'master', status: 'warning')
+  register_service(id: '6', ip: '192.168.10.15', tag: 'slave', status: 'critical')
 end
 
 task default: [:spec, :rubocop]

data/lib/cluster/discovery/consul.rb

@@ -16,14 +16,55 @@ module Cluster
       # @param [Boolean] leader: (false) Fetch :all or or :first(the leader)
       # @param [Array] tags: ([]) List of tags to limit discovery by
       # @return [Struct] Object representing the Node in the service
-      def discover(consul_service:, leader: false, tags: [])
+      def discover(consul_service:, leader: false, tags: [], healthy: true)
         scope, options = build_extra_opts(leader: leader, tags: tags)
         nodes = Diplomat::Service.get(
           consul_service,
           scope,
           options
         )
-        [nodes].flatten
+        nodes = [nodes]
+        nodes.flatten!
+
+        nodes = discover_health_nodes(nodes, consul_service) if healthy
+        nodes
+      end
+
+      def discover_health_nodes(nodes, consul_service)
+        nodes = filtered_healthy_nodes(nodes.map(&:Address), consul_service)
+        nodes = nodes_passing_checks(nodes)
+        service_response(nodes)
+      end
+
+      def filtered_healthy_nodes(node_list, consul_service)
+        Diplomat::Health.service(consul_service).delete_if do |service|
+          !node_list.include?(service['Node']['Address'])
+        end
+      end
+
+      def nodes_passing_checks(nodes)
+        nodes.delete_if do |node|
+          node['Checks'].any? { |check| check['Status'] != 'passing' }
+        end
+      end
+
+      def service_response(nodes) # rubocop:disable Metrics/MethodLength
+        nodes.map do |node|
+          n = node['Node']
+          s = node['Service']
+          OpenStruct.new(
+            Node: n['Node'],
+            Address: n['Address'],
+            ServiceID: s['ID'],
+            ServiceName: s['Service'],
+            ServiceTags: s['Tags'],
+            ServiceAddress: s['Address'],
+            ServicePort: s['Port'],
+            Checks: node['Checks'],
+            _Node: node['Node'],
+            _Service: node['Service']
+          )
+        end
       end
 
       # Build args for Diplomat::Service.get
@@ -44,3 +85,4 @@ module Cluster
 end
 
 require 'diplomat'
+require 'ostruct'

data/spec/cassettes/Cluster_Discovery/_discover/can_discover_nodes/discovery_with_consul.yml

@@ -21,18 +21,59 @@ http_interactions:
       Content-Type:
       - application/json
       X-Consul-Index:
-      - '156'
+      - '278'
       X-Consul-Knownleader:
       - 'true'
       X-Consul-Lastcontact:
       - '0'
       Date:
-      - Tue, 19 Jan 2016 17:09:23 GMT
+      - Tue, 19 Jan 2016 18:54:27 GMT
       Content-Length:
       - '499'
     body:
       encoding: UTF-8
       string: '[{"Node":"foobar1","Address":"192.168.10.10","ServiceID":"redis1","ServiceName":"redis","ServiceTags":["master","v1"],"ServiceAddress":"127.0.0.1","ServicePort":8000},{"Node":"foobar5","Address":"192.168.10.14","ServiceID":"redis5","ServiceName":"redis","ServiceTags":["master","v1"],"ServiceAddress":"127.0.0.1","ServicePort":8000},{"Node":"foobar3","Address":"192.168.10.12","ServiceID":"redis3","ServiceName":"redis","ServiceTags":["master","v1"],"ServiceAddress":"127.0.0.1","ServicePort":8000}]'
     http_version: 
-  recorded_at: Tue, 19 Jan 2016 17:09:22 GMT
+  recorded_at: Tue, 19 Jan 2016 18:54:27 GMT
+- request:
+    method: get
+    uri: http://172.28.128.104:8500/v1/health/service/redis
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Faraday v0.9.2
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - application/json
+      X-Consul-Index:
+      - '278'
+      X-Consul-Knownleader:
+      - 'true'
+      X-Consul-Lastcontact:
+      - '0'
+      Date:
+      - Tue, 19 Jan 2016 18:54:27 GMT
+      Transfer-Encoding:
+      - chunked
+    body:
+      encoding: UTF-8
+      string: '[{"Node":{"Node":"foobar1","Address":"192.168.10.10"},"Service":{"ID":"redis1","Service":"redis","Tags":["master","v1"],"Address":"127.0.0.1","Port":8000},"Checks":[{"Node":"foobar1","CheckID":"service:redis1","Name":"Redis
+        health check","Status":"passing","Notes":"Script based health check","Output":"","ServiceID":"redis1","ServiceName":"redis"}]},{"Node":{"Node":"foobar2","Address":"192.168.10.11"},"Service":{"ID":"redis2","Service":"redis","Tags":["slave","v1"],"Address":"127.0.0.1","Port":8000},"Checks":[{"Node":"foobar2","CheckID":"service:redis1","Name":"Redis
+        health check","Status":"warning","Notes":"Script based health check","Output":"","ServiceID":"redis2","ServiceName":"redis"}]},{"Node":{"Node":"foobar3","Address":"192.168.10.12"},"Service":{"ID":"redis3","Service":"redis","Tags":["master","v1"],"Address":"127.0.0.1","Port":8000},"Checks":[{"Node":"foobar3","CheckID":"service:redis1","Name":"Redis
+        health check","Status":"critical","Notes":"Script based health check","Output":"","ServiceID":"redis3","ServiceName":"redis"}]},{"Node":{"Node":"foobar4","Address":"192.168.10.13"},"Service":{"ID":"redis4","Service":"redis","Tags":["slave","v1"],"Address":"127.0.0.1","Port":8000},"Checks":[{"Node":"foobar4","CheckID":"service:redis1","Name":"Redis
+        health check","Status":"passing","Notes":"Script based health check","Output":"","ServiceID":"redis4","ServiceName":"redis"}]},{"Node":{"Node":"foobar5","Address":"192.168.10.14"},"Service":{"ID":"redis5","Service":"redis","Tags":["master","v1"],"Address":"127.0.0.1","Port":8000},"Checks":[{"Node":"foobar5","CheckID":"service:redis1","Name":"Redis
+        health check","Status":"warning","Notes":"Script based health check","Output":"","ServiceID":"redis5","ServiceName":"redis"}]},{"Node":{"Node":"foobar6","Address":"192.168.10.15"},"Service":{"ID":"redis6","Service":"redis","Tags":["slave","v1"],"Address":"127.0.0.1","Port":8000},"Checks":[{"Node":"foobar6","CheckID":"service:redis1","Name":"Redis
+        health check","Status":"critical","Notes":"Script based health check","Output":"","ServiceID":"redis6","ServiceName":"redis"}]}]'
+    http_version: 
+  recorded_at: Tue, 19 Jan 2016 18:54:27 GMT
 recorded_with: VCR 3.0.1

data/spec/cassettes/Cluster_Discovery_Consul/_discover/can_discover_all_nodes/can_discover_nodes_with_tags.yml

@@ -21,18 +21,18 @@ http_interactions:
       Content-Type:
       - application/json
       X-Consul-Index:
-      - '161'
+      - '278'
       X-Consul-Knownleader:
       - 'true'
       X-Consul-Lastcontact:
       - '0'
       Date:
-      - Tue, 19 Jan 2016 17:10:41 GMT
+      - Tue, 19 Jan 2016 18:54:27 GMT
       Content-Length:
       - '499'
     body:
       encoding: UTF-8
       string: '[{"Node":"foobar1","Address":"192.168.10.10","ServiceID":"redis1","ServiceName":"redis","ServiceTags":["master","v1"],"ServiceAddress":"127.0.0.1","ServicePort":8000},{"Node":"foobar5","Address":"192.168.10.14","ServiceID":"redis5","ServiceName":"redis","ServiceTags":["master","v1"],"ServiceAddress":"127.0.0.1","ServicePort":8000},{"Node":"foobar3","Address":"192.168.10.12","ServiceID":"redis3","ServiceName":"redis","ServiceTags":["master","v1"],"ServiceAddress":"127.0.0.1","ServicePort":8000}]'
     http_version: 
-  recorded_at: Tue, 19 Jan 2016 17:10:41 GMT
+  recorded_at: Tue, 19 Jan 2016 18:54:26 GMT
 recorded_with: VCR 3.0.1

data/spec/cassettes/Cluster_Discovery_Consul/_discover/can_discover_all_nodes/can_discover_nodes_with_tags_and_health.yml

@@ -0,0 +1,79 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://172.28.128.104:8500/v1/catalog/service/redis?tag=master
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Faraday v0.9.2
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - application/json
+      X-Consul-Index:
+      - '278'
+      X-Consul-Knownleader:
+      - 'true'
+      X-Consul-Lastcontact:
+      - '0'
+      Date:
+      - Tue, 19 Jan 2016 18:54:27 GMT
+      Content-Length:
+      - '499'
+    body:
+      encoding: UTF-8
+      string: '[{"Node":"foobar1","Address":"192.168.10.10","ServiceID":"redis1","ServiceName":"redis","ServiceTags":["master","v1"],"ServiceAddress":"127.0.0.1","ServicePort":8000},{"Node":"foobar5","Address":"192.168.10.14","ServiceID":"redis5","ServiceName":"redis","ServiceTags":["master","v1"],"ServiceAddress":"127.0.0.1","ServicePort":8000},{"Node":"foobar3","Address":"192.168.10.12","ServiceID":"redis3","ServiceName":"redis","ServiceTags":["master","v1"],"ServiceAddress":"127.0.0.1","ServicePort":8000}]'
+    http_version: 
+  recorded_at: Tue, 19 Jan 2016 18:54:27 GMT
+- request:
+    method: get
+    uri: http://172.28.128.104:8500/v1/health/service/redis
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Faraday v0.9.2
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - application/json
+      X-Consul-Index:
+      - '278'
+      X-Consul-Knownleader:
+      - 'true'
+      X-Consul-Lastcontact:
+      - '0'
+      Date:
+      - Tue, 19 Jan 2016 18:54:27 GMT
+      Transfer-Encoding:
+      - chunked
+    body:
+      encoding: UTF-8
+      string: '[{"Node":{"Node":"foobar1","Address":"192.168.10.10"},"Service":{"ID":"redis1","Service":"redis","Tags":["master","v1"],"Address":"127.0.0.1","Port":8000},"Checks":[{"Node":"foobar1","CheckID":"service:redis1","Name":"Redis
+        health check","Status":"passing","Notes":"Script based health check","Output":"","ServiceID":"redis1","ServiceName":"redis"}]},{"Node":{"Node":"foobar2","Address":"192.168.10.11"},"Service":{"ID":"redis2","Service":"redis","Tags":["slave","v1"],"Address":"127.0.0.1","Port":8000},"Checks":[{"Node":"foobar2","CheckID":"service:redis1","Name":"Redis
+        health check","Status":"warning","Notes":"Script based health check","Output":"","ServiceID":"redis2","ServiceName":"redis"}]},{"Node":{"Node":"foobar3","Address":"192.168.10.12"},"Service":{"ID":"redis3","Service":"redis","Tags":["master","v1"],"Address":"127.0.0.1","Port":8000},"Checks":[{"Node":"foobar3","CheckID":"service:redis1","Name":"Redis
+        health check","Status":"critical","Notes":"Script based health check","Output":"","ServiceID":"redis3","ServiceName":"redis"}]},{"Node":{"Node":"foobar4","Address":"192.168.10.13"},"Service":{"ID":"redis4","Service":"redis","Tags":["slave","v1"],"Address":"127.0.0.1","Port":8000},"Checks":[{"Node":"foobar4","CheckID":"service:redis1","Name":"Redis
+        health check","Status":"passing","Notes":"Script based health check","Output":"","ServiceID":"redis4","ServiceName":"redis"}]},{"Node":{"Node":"foobar5","Address":"192.168.10.14"},"Service":{"ID":"redis5","Service":"redis","Tags":["master","v1"],"Address":"127.0.0.1","Port":8000},"Checks":[{"Node":"foobar5","CheckID":"service:redis1","Name":"Redis
+        health check","Status":"warning","Notes":"Script based health check","Output":"","ServiceID":"redis5","ServiceName":"redis"}]},{"Node":{"Node":"foobar6","Address":"192.168.10.15"},"Service":{"ID":"redis6","Service":"redis","Tags":["slave","v1"],"Address":"127.0.0.1","Port":8000},"Checks":[{"Node":"foobar6","CheckID":"service:redis1","Name":"Redis
+        health check","Status":"critical","Notes":"Script based health check","Output":"","ServiceID":"redis6","ServiceName":"redis"}]}]'
+    http_version: 
+  recorded_at: Tue, 19 Jan 2016 18:54:27 GMT
+recorded_with: VCR 3.0.1

data/spec/cassettes/Cluster_Discovery_Consul/_discover/can_discover_all_nodes/can_discover_nodes_without_tags.yml

@@ -21,18 +21,18 @@ http_interactions:
       Content-Type:
       - application/json
       X-Consul-Index:
-      - '161'
+      - '278'
       X-Consul-Knownleader:
       - 'true'
       X-Consul-Lastcontact:
       - '0'
       Date:
-      - Tue, 19 Jan 2016 17:10:41 GMT
+      - Tue, 19 Jan 2016 18:54:27 GMT
       Content-Length:
       - '994'
     body:
       encoding: UTF-8
       string: '[{"Node":"foobar1","Address":"192.168.10.10","ServiceID":"redis1","ServiceName":"redis","ServiceTags":["master","v1"],"ServiceAddress":"127.0.0.1","ServicePort":8000},{"Node":"foobar2","Address":"192.168.10.11","ServiceID":"redis2","ServiceName":"redis","ServiceTags":["slave","v1"],"ServiceAddress":"127.0.0.1","ServicePort":8000},{"Node":"foobar3","Address":"192.168.10.12","ServiceID":"redis3","ServiceName":"redis","ServiceTags":["master","v1"],"ServiceAddress":"127.0.0.1","ServicePort":8000},{"Node":"foobar4","Address":"192.168.10.13","ServiceID":"redis4","ServiceName":"redis","ServiceTags":["slave","v1"],"ServiceAddress":"127.0.0.1","ServicePort":8000},{"Node":"foobar5","Address":"192.168.10.14","ServiceID":"redis5","ServiceName":"redis","ServiceTags":["master","v1"],"ServiceAddress":"127.0.0.1","ServicePort":8000},{"Node":"foobar6","Address":"192.168.10.15","ServiceID":"redis6","ServiceName":"redis","ServiceTags":["slave","v1"],"ServiceAddress":"127.0.0.1","ServicePort":8000}]'
     http_version: 
-  recorded_at: Tue, 19 Jan 2016 17:10:41 GMT
+  recorded_at: Tue, 19 Jan 2016 18:54:26 GMT
 recorded_with: VCR 3.0.1

data/spec/cassettes/Cluster_Discovery_Consul/_discover/can_discover_all_nodes/can_discover_nodes_without_tags_and_health.yml

@@ -0,0 +1,79 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://172.28.128.104:8500/v1/catalog/service/redis
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Faraday v0.9.2
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - application/json
+      X-Consul-Index:
+      - '278'
+      X-Consul-Knownleader:
+      - 'true'
+      X-Consul-Lastcontact:
+      - '0'
+      Date:
+      - Tue, 19 Jan 2016 18:54:27 GMT
+      Content-Length:
+      - '994'
+    body:
+      encoding: UTF-8
+      string: '[{"Node":"foobar1","Address":"192.168.10.10","ServiceID":"redis1","ServiceName":"redis","ServiceTags":["master","v1"],"ServiceAddress":"127.0.0.1","ServicePort":8000},{"Node":"foobar2","Address":"192.168.10.11","ServiceID":"redis2","ServiceName":"redis","ServiceTags":["slave","v1"],"ServiceAddress":"127.0.0.1","ServicePort":8000},{"Node":"foobar3","Address":"192.168.10.12","ServiceID":"redis3","ServiceName":"redis","ServiceTags":["master","v1"],"ServiceAddress":"127.0.0.1","ServicePort":8000},{"Node":"foobar4","Address":"192.168.10.13","ServiceID":"redis4","ServiceName":"redis","ServiceTags":["slave","v1"],"ServiceAddress":"127.0.0.1","ServicePort":8000},{"Node":"foobar5","Address":"192.168.10.14","ServiceID":"redis5","ServiceName":"redis","ServiceTags":["master","v1"],"ServiceAddress":"127.0.0.1","ServicePort":8000},{"Node":"foobar6","Address":"192.168.10.15","ServiceID":"redis6","ServiceName":"redis","ServiceTags":["slave","v1"],"ServiceAddress":"127.0.0.1","ServicePort":8000}]'
+    http_version: 
+  recorded_at: Tue, 19 Jan 2016 18:54:26 GMT
+- request:
+    method: get
+    uri: http://172.28.128.104:8500/v1/health/service/redis
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Faraday v0.9.2
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - application/json
+      X-Consul-Index:
+      - '278'
+      X-Consul-Knownleader:
+      - 'true'
+      X-Consul-Lastcontact:
+      - '0'
+      Date:
+      - Tue, 19 Jan 2016 18:54:27 GMT
+      Transfer-Encoding:
+      - chunked
+    body:
+      encoding: UTF-8
+      string: '[{"Node":{"Node":"foobar1","Address":"192.168.10.10"},"Service":{"ID":"redis1","Service":"redis","Tags":["master","v1"],"Address":"127.0.0.1","Port":8000},"Checks":[{"Node":"foobar1","CheckID":"service:redis1","Name":"Redis
+        health check","Status":"passing","Notes":"Script based health check","Output":"","ServiceID":"redis1","ServiceName":"redis"}]},{"Node":{"Node":"foobar2","Address":"192.168.10.11"},"Service":{"ID":"redis2","Service":"redis","Tags":["slave","v1"],"Address":"127.0.0.1","Port":8000},"Checks":[{"Node":"foobar2","CheckID":"service:redis1","Name":"Redis
+        health check","Status":"warning","Notes":"Script based health check","Output":"","ServiceID":"redis2","ServiceName":"redis"}]},{"Node":{"Node":"foobar3","Address":"192.168.10.12"},"Service":{"ID":"redis3","Service":"redis","Tags":["master","v1"],"Address":"127.0.0.1","Port":8000},"Checks":[{"Node":"foobar3","CheckID":"service:redis1","Name":"Redis
+        health check","Status":"critical","Notes":"Script based health check","Output":"","ServiceID":"redis3","ServiceName":"redis"}]},{"Node":{"Node":"foobar4","Address":"192.168.10.13"},"Service":{"ID":"redis4","Service":"redis","Tags":["slave","v1"],"Address":"127.0.0.1","Port":8000},"Checks":[{"Node":"foobar4","CheckID":"service:redis1","Name":"Redis
+        health check","Status":"passing","Notes":"Script based health check","Output":"","ServiceID":"redis4","ServiceName":"redis"}]},{"Node":{"Node":"foobar5","Address":"192.168.10.14"},"Service":{"ID":"redis5","Service":"redis","Tags":["master","v1"],"Address":"127.0.0.1","Port":8000},"Checks":[{"Node":"foobar5","CheckID":"service:redis1","Name":"Redis
+        health check","Status":"warning","Notes":"Script based health check","Output":"","ServiceID":"redis5","ServiceName":"redis"}]},{"Node":{"Node":"foobar6","Address":"192.168.10.15"},"Service":{"ID":"redis6","Service":"redis","Tags":["slave","v1"],"Address":"127.0.0.1","Port":8000},"Checks":[{"Node":"foobar6","CheckID":"service:redis1","Name":"Redis
+        health check","Status":"critical","Notes":"Script based health check","Output":"","ServiceID":"redis6","ServiceName":"redis"}]}]'
+    http_version: 
+  recorded_at: Tue, 19 Jan 2016 18:54:26 GMT
+recorded_with: VCR 3.0.1

data/spec/cassettes/Cluster_Discovery_Consul/_discover/can_discover_leader_node/can_discover_nodes_with_tags.yml

@@ -21,18 +21,18 @@ http_interactions:
       Content-Type:
       - application/json
       X-Consul-Index:
-      - '161'
+      - '278'
       X-Consul-Knownleader:
       - 'true'
       X-Consul-Lastcontact:
       - '0'
       Date:
-      - Tue, 19 Jan 2016 17:10:41 GMT
+      - Tue, 19 Jan 2016 18:54:27 GMT
       Content-Length:
       - '499'
     body:
       encoding: UTF-8
       string: '[{"Node":"foobar1","Address":"192.168.10.10","ServiceID":"redis1","ServiceName":"redis","ServiceTags":["master","v1"],"ServiceAddress":"127.0.0.1","ServicePort":8000},{"Node":"foobar5","Address":"192.168.10.14","ServiceID":"redis5","ServiceName":"redis","ServiceTags":["master","v1"],"ServiceAddress":"127.0.0.1","ServicePort":8000},{"Node":"foobar3","Address":"192.168.10.12","ServiceID":"redis3","ServiceName":"redis","ServiceTags":["master","v1"],"ServiceAddress":"127.0.0.1","ServicePort":8000}]'
     http_version: 
-  recorded_at: Tue, 19 Jan 2016 17:10:41 GMT
+  recorded_at: Tue, 19 Jan 2016 18:54:26 GMT
 recorded_with: VCR 3.0.1

data/spec/cassettes/Cluster_Discovery_Consul/_discover/can_discover_leader_node/can_discover_nodes_with_tags_and_health.yml

@@ -0,0 +1,79 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://172.28.128.104:8500/v1/catalog/service/redis?tag=master
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Faraday v0.9.2
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - application/json
+      X-Consul-Index:
+      - '278'
+      X-Consul-Knownleader:
+      - 'true'
+      X-Consul-Lastcontact:
+      - '0'
+      Date:
+      - Tue, 19 Jan 2016 18:54:27 GMT
+      Content-Length:
+      - '499'
+    body:
+      encoding: UTF-8
+      string: '[{"Node":"foobar1","Address":"192.168.10.10","ServiceID":"redis1","ServiceName":"redis","ServiceTags":["master","v1"],"ServiceAddress":"127.0.0.1","ServicePort":8000},{"Node":"foobar5","Address":"192.168.10.14","ServiceID":"redis5","ServiceName":"redis","ServiceTags":["master","v1"],"ServiceAddress":"127.0.0.1","ServicePort":8000},{"Node":"foobar3","Address":"192.168.10.12","ServiceID":"redis3","ServiceName":"redis","ServiceTags":["master","v1"],"ServiceAddress":"127.0.0.1","ServicePort":8000}]'
+    http_version: 
+  recorded_at: Tue, 19 Jan 2016 18:54:26 GMT
+- request:
+    method: get
+    uri: http://172.28.128.104:8500/v1/health/service/redis
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Faraday v0.9.2
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - application/json
+      X-Consul-Index:
+      - '278'
+      X-Consul-Knownleader:
+      - 'true'
+      X-Consul-Lastcontact:
+      - '0'
+      Date:
+      - Tue, 19 Jan 2016 18:54:27 GMT
+      Transfer-Encoding:
+      - chunked
+    body:
+      encoding: UTF-8
+      string: '[{"Node":{"Node":"foobar1","Address":"192.168.10.10"},"Service":{"ID":"redis1","Service":"redis","Tags":["master","v1"],"Address":"127.0.0.1","Port":8000},"Checks":[{"Node":"foobar1","CheckID":"service:redis1","Name":"Redis
+        health check","Status":"passing","Notes":"Script based health check","Output":"","ServiceID":"redis1","ServiceName":"redis"}]},{"Node":{"Node":"foobar2","Address":"192.168.10.11"},"Service":{"ID":"redis2","Service":"redis","Tags":["slave","v1"],"Address":"127.0.0.1","Port":8000},"Checks":[{"Node":"foobar2","CheckID":"service:redis1","Name":"Redis
+        health check","Status":"warning","Notes":"Script based health check","Output":"","ServiceID":"redis2","ServiceName":"redis"}]},{"Node":{"Node":"foobar3","Address":"192.168.10.12"},"Service":{"ID":"redis3","Service":"redis","Tags":["master","v1"],"Address":"127.0.0.1","Port":8000},"Checks":[{"Node":"foobar3","CheckID":"service:redis1","Name":"Redis
+        health check","Status":"critical","Notes":"Script based health check","Output":"","ServiceID":"redis3","ServiceName":"redis"}]},{"Node":{"Node":"foobar4","Address":"192.168.10.13"},"Service":{"ID":"redis4","Service":"redis","Tags":["slave","v1"],"Address":"127.0.0.1","Port":8000},"Checks":[{"Node":"foobar4","CheckID":"service:redis1","Name":"Redis
+        health check","Status":"passing","Notes":"Script based health check","Output":"","ServiceID":"redis4","ServiceName":"redis"}]},{"Node":{"Node":"foobar5","Address":"192.168.10.14"},"Service":{"ID":"redis5","Service":"redis","Tags":["master","v1"],"Address":"127.0.0.1","Port":8000},"Checks":[{"Node":"foobar5","CheckID":"service:redis1","Name":"Redis
+        health check","Status":"warning","Notes":"Script based health check","Output":"","ServiceID":"redis5","ServiceName":"redis"}]},{"Node":{"Node":"foobar6","Address":"192.168.10.15"},"Service":{"ID":"redis6","Service":"redis","Tags":["slave","v1"],"Address":"127.0.0.1","Port":8000},"Checks":[{"Node":"foobar6","CheckID":"service:redis1","Name":"Redis
+        health check","Status":"critical","Notes":"Script based health check","Output":"","ServiceID":"redis6","ServiceName":"redis"}]}]'
+    http_version: 
+  recorded_at: Tue, 19 Jan 2016 18:54:26 GMT
+recorded_with: VCR 3.0.1

data/spec/cassettes/Cluster_Discovery_Consul/_discover/can_discover_leader_node/can_discover_nodes_without_tags.yml

@@ -21,18 +21,18 @@ http_interactions:
       Content-Type:
       - application/json
       X-Consul-Index:
-      - '161'
+      - '278'
       X-Consul-Knownleader:
       - 'true'
       X-Consul-Lastcontact:
       - '0'
       Date:
-      - Tue, 19 Jan 2016 17:10:41 GMT
+      - Tue, 19 Jan 2016 18:54:26 GMT
       Content-Length:
       - '994'
     body:
       encoding: UTF-8
       string: '[{"Node":"foobar1","Address":"192.168.10.10","ServiceID":"redis1","ServiceName":"redis","ServiceTags":["master","v1"],"ServiceAddress":"127.0.0.1","ServicePort":8000},{"Node":"foobar2","Address":"192.168.10.11","ServiceID":"redis2","ServiceName":"redis","ServiceTags":["slave","v1"],"ServiceAddress":"127.0.0.1","ServicePort":8000},{"Node":"foobar3","Address":"192.168.10.12","ServiceID":"redis3","ServiceName":"redis","ServiceTags":["master","v1"],"ServiceAddress":"127.0.0.1","ServicePort":8000},{"Node":"foobar4","Address":"192.168.10.13","ServiceID":"redis4","ServiceName":"redis","ServiceTags":["slave","v1"],"ServiceAddress":"127.0.0.1","ServicePort":8000},{"Node":"foobar5","Address":"192.168.10.14","ServiceID":"redis5","ServiceName":"redis","ServiceTags":["master","v1"],"ServiceAddress":"127.0.0.1","ServicePort":8000},{"Node":"foobar6","Address":"192.168.10.15","ServiceID":"redis6","ServiceName":"redis","ServiceTags":["slave","v1"],"ServiceAddress":"127.0.0.1","ServicePort":8000}]'
     http_version: 
-  recorded_at: Tue, 19 Jan 2016 17:10:41 GMT
+  recorded_at: Tue, 19 Jan 2016 18:54:26 GMT
 recorded_with: VCR 3.0.1

data/spec/cassettes/Cluster_Discovery_Consul/_discover/can_discover_leader_node/can_discover_nodes_without_tags_and_health.yml

@@ -0,0 +1,79 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://172.28.128.104:8500/v1/catalog/service/redis
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Faraday v0.9.2
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - application/json
+      X-Consul-Index:
+      - '278'
+      X-Consul-Knownleader:
+      - 'true'
+      X-Consul-Lastcontact:
+      - '0'
+      Date:
+      - Tue, 19 Jan 2016 18:55:39 GMT
+      Content-Length:
+      - '994'
+    body:
+      encoding: UTF-8
+      string: '[{"Node":"foobar1","Address":"192.168.10.10","ServiceID":"redis1","ServiceName":"redis","ServiceTags":["master","v1"],"ServiceAddress":"127.0.0.1","ServicePort":8000},{"Node":"foobar2","Address":"192.168.10.11","ServiceID":"redis2","ServiceName":"redis","ServiceTags":["slave","v1"],"ServiceAddress":"127.0.0.1","ServicePort":8000},{"Node":"foobar3","Address":"192.168.10.12","ServiceID":"redis3","ServiceName":"redis","ServiceTags":["master","v1"],"ServiceAddress":"127.0.0.1","ServicePort":8000},{"Node":"foobar4","Address":"192.168.10.13","ServiceID":"redis4","ServiceName":"redis","ServiceTags":["slave","v1"],"ServiceAddress":"127.0.0.1","ServicePort":8000},{"Node":"foobar5","Address":"192.168.10.14","ServiceID":"redis5","ServiceName":"redis","ServiceTags":["master","v1"],"ServiceAddress":"127.0.0.1","ServicePort":8000},{"Node":"foobar6","Address":"192.168.10.15","ServiceID":"redis6","ServiceName":"redis","ServiceTags":["slave","v1"],"ServiceAddress":"127.0.0.1","ServicePort":8000}]'
+    http_version: 
+  recorded_at: Tue, 19 Jan 2016 18:55:39 GMT
+- request:
+    method: get
+    uri: http://172.28.128.104:8500/v1/health/service/redis
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Faraday v0.9.2
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - application/json
+      X-Consul-Index:
+      - '278'
+      X-Consul-Knownleader:
+      - 'true'
+      X-Consul-Lastcontact:
+      - '0'
+      Date:
+      - Tue, 19 Jan 2016 18:55:39 GMT
+      Transfer-Encoding:
+      - chunked
+    body:
+      encoding: UTF-8
+      string: '[{"Node":{"Node":"foobar1","Address":"192.168.10.10"},"Service":{"ID":"redis1","Service":"redis","Tags":["master","v1"],"Address":"127.0.0.1","Port":8000},"Checks":[{"Node":"foobar1","CheckID":"service:redis1","Name":"Redis
+        health check","Status":"passing","Notes":"Script based health check","Output":"","ServiceID":"redis1","ServiceName":"redis"}]},{"Node":{"Node":"foobar2","Address":"192.168.10.11"},"Service":{"ID":"redis2","Service":"redis","Tags":["slave","v1"],"Address":"127.0.0.1","Port":8000},"Checks":[{"Node":"foobar2","CheckID":"service:redis1","Name":"Redis
+        health check","Status":"warning","Notes":"Script based health check","Output":"","ServiceID":"redis2","ServiceName":"redis"}]},{"Node":{"Node":"foobar3","Address":"192.168.10.12"},"Service":{"ID":"redis3","Service":"redis","Tags":["master","v1"],"Address":"127.0.0.1","Port":8000},"Checks":[{"Node":"foobar3","CheckID":"service:redis1","Name":"Redis
+        health check","Status":"critical","Notes":"Script based health check","Output":"","ServiceID":"redis3","ServiceName":"redis"}]},{"Node":{"Node":"foobar4","Address":"192.168.10.13"},"Service":{"ID":"redis4","Service":"redis","Tags":["slave","v1"],"Address":"127.0.0.1","Port":8000},"Checks":[{"Node":"foobar4","CheckID":"service:redis1","Name":"Redis
+        health check","Status":"passing","Notes":"Script based health check","Output":"","ServiceID":"redis4","ServiceName":"redis"}]},{"Node":{"Node":"foobar5","Address":"192.168.10.14"},"Service":{"ID":"redis5","Service":"redis","Tags":["master","v1"],"Address":"127.0.0.1","Port":8000},"Checks":[{"Node":"foobar5","CheckID":"service:redis1","Name":"Redis
+        health check","Status":"warning","Notes":"Script based health check","Output":"","ServiceID":"redis5","ServiceName":"redis"}]},{"Node":{"Node":"foobar6","Address":"192.168.10.15"},"Service":{"ID":"redis6","Service":"redis","Tags":["slave","v1"],"Address":"127.0.0.1","Port":8000},"Checks":[{"Node":"foobar6","CheckID":"service:redis1","Name":"Redis
+        health check","Status":"critical","Notes":"Script based health check","Output":"","ServiceID":"redis6","ServiceName":"redis"}]}]'
+    http_version: 
+  recorded_at: Tue, 19 Jan 2016 18:55:39 GMT
+recorded_with: VCR 3.0.1

data/spec/lib/cluster/discovery/consul_spec.rb

@@ -77,42 +77,84 @@ describe 'Cluster::Discovery::Consul' do
       obj.map(&:Address)
     end
 
-    let(:consul_notags_leader) do
+    let(:consul_notags_leader_health) do
       map_resp(@consul.discover(consul_service: 'redis', leader: true))
     end
 
-    let(:consul_notags_noleader) do
+    let(:consul_notags_noleader_health) do
       map_resp(@consul.discover(consul_service: 'redis'))
     end
 
-    let(:consul_tags_leader) do
+    let(:consul_tags_leader_health) do
       map_resp(@consul.discover(
                  consul_service: 'redis',
                  leader: true,
                  tags: 'master'))
     end
 
-    let(:consul_tags_noleader) do
+    let(:consul_tags_noleader_health) do
       map_resp(@consul.discover(consul_service: 'redis', tags: 'master'))
     end
 
+    let(:consul_notags_leader_nohealth) do
+      map_resp(@consul.discover(
+                 consul_service: 'redis',
+                 leader: true,
+                 healthy: false))
+    end
+
+    let(:consul_notags_noleader_nohealth) do
+      map_resp(@consul.discover(consul_service: 'redis', healthy: false))
+    end
+
+    let(:consul_tags_leader_nohealth) do
+      map_resp(@consul.discover(
+                 consul_service: 'redis',
+                 leader: true,
+                 tags: 'master',
+                 healthy: false))
+    end
+
+    let(:consul_tags_noleader_nohealth) do
+      map_resp(@consul.discover(
+                 consul_service: 'redis',
+                 tags: 'master',
+                 healthy: false))
+    end
+
     context 'can discover leader node' do
       it 'can discover nodes without tags' do
-        expect(consul_notags_leader.first).to eq('192.168.10.10')
+        expect(consul_notags_leader_nohealth.first).to eq('192.168.10.10')
+      end
+
+      it 'can discover nodes without tags and health' do
+        expect(consul_notags_leader_health.first).to eq('192.168.10.10')
       end
 
       it 'can discover nodes with tags' do
-        expect(consul_tags_leader.first).to eq('192.168.10.10')
+        expect(consul_tags_leader_nohealth.first).to eq('192.168.10.10')
+      end
+
+      it 'can discover nodes with tags and health' do
+        expect(consul_tags_leader_health.first).to eq('192.168.10.10')
       end
     end
 
     context 'can discover all nodes' do
       it 'can discover nodes without tags' do
-        expect(consul_notags_noleader.first).to eq('192.168.10.10')
+        expect(consul_notags_noleader_nohealth.last).to eq('192.168.10.15')
+      end
+
+      it 'can discover nodes without tags and health' do
+        expect(consul_notags_noleader_health.last).to eq('192.168.10.13')
       end
 
       it 'can discover nodes with tags' do
-        expect(consul_tags_noleader.length).to eq(3)
+        expect(consul_tags_noleader_nohealth.length).to eq(3)
+      end
+
+      it 'can discover nodes with tags and health' do
+        expect(consul_tags_noleader_health.length).to eq(1)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cluster-discovery
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Andrew Thompson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-19 00:00:00.000000000 Z
+date: 2016-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,9 +94,13 @@ files:
 - lib/cluster/discovery/version.rb
 - spec/cassettes/Cluster_Discovery/_discover/can_discover_nodes/discovery_with_consul.yml
 - spec/cassettes/Cluster_Discovery_Consul/_discover/can_discover_all_nodes/can_discover_nodes_with_tags.yml
+- spec/cassettes/Cluster_Discovery_Consul/_discover/can_discover_all_nodes/can_discover_nodes_with_tags_and_health.yml
 - spec/cassettes/Cluster_Discovery_Consul/_discover/can_discover_all_nodes/can_discover_nodes_without_tags.yml
+- spec/cassettes/Cluster_Discovery_Consul/_discover/can_discover_all_nodes/can_discover_nodes_without_tags_and_health.yml
 - spec/cassettes/Cluster_Discovery_Consul/_discover/can_discover_leader_node/can_discover_nodes_with_tags.yml
+- spec/cassettes/Cluster_Discovery_Consul/_discover/can_discover_leader_node/can_discover_nodes_with_tags_and_health.yml
 - spec/cassettes/Cluster_Discovery_Consul/_discover/can_discover_leader_node/can_discover_nodes_without_tags.yml
+- spec/cassettes/Cluster_Discovery_Consul/_discover/can_discover_leader_node/can_discover_nodes_without_tags_and_health.yml
 - spec/cassettes/Cluster_Discovery_EC2_AutoScaling/_discover/can_reuse_the_tag_provider/can_find_instances_by_aws_auto_scaling_group.yml
 - spec/cassettes/Cluster_Discovery_EC2_Tag/_discover/passing_aws_region_arg/can_find_instances_by_tag.yml
 - spec/lib/cluster/discovery/consul_spec.rb
@@ -124,16 +128,20 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Cluster Discovery Library
 test_files:
 - spec/cassettes/Cluster_Discovery/_discover/can_discover_nodes/discovery_with_consul.yml
 - spec/cassettes/Cluster_Discovery_Consul/_discover/can_discover_all_nodes/can_discover_nodes_with_tags.yml
+- spec/cassettes/Cluster_Discovery_Consul/_discover/can_discover_all_nodes/can_discover_nodes_with_tags_and_health.yml
 - spec/cassettes/Cluster_Discovery_Consul/_discover/can_discover_all_nodes/can_discover_nodes_without_tags.yml
+- spec/cassettes/Cluster_Discovery_Consul/_discover/can_discover_all_nodes/can_discover_nodes_without_tags_and_health.yml
 - spec/cassettes/Cluster_Discovery_Consul/_discover/can_discover_leader_node/can_discover_nodes_with_tags.yml
+- spec/cassettes/Cluster_Discovery_Consul/_discover/can_discover_leader_node/can_discover_nodes_with_tags_and_health.yml
 - spec/cassettes/Cluster_Discovery_Consul/_discover/can_discover_leader_node/can_discover_nodes_without_tags.yml
+- spec/cassettes/Cluster_Discovery_Consul/_discover/can_discover_leader_node/can_discover_nodes_without_tags_and_health.yml
 - spec/cassettes/Cluster_Discovery_EC2_AutoScaling/_discover/can_reuse_the_tag_provider/can_find_instances_by_aws_auto_scaling_group.yml
 - spec/cassettes/Cluster_Discovery_EC2_Tag/_discover/passing_aws_region_arg/can_find_instances_by_tag.yml
 - spec/lib/cluster/discovery/consul_spec.rb