diplomat 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2dd54168c7c65cea06154d8f9e4ba3e69bab7c04
-  data.tar.gz: 42f4033666bbe21e3ee2e47008d544be6dd573d4
+  metadata.gz: aa373c2ee15ea4f0c80e90974a66f6dad2e76988
+  data.tar.gz: e890be6e209330f3c4363dc7645c67fbe5fbbca2
 SHA512:
-  metadata.gz: ef4255c1bfd8befb00b543d681bbdfb10c757941b6beda2bf42e582574537198ccf16496ef79e2fd80ac7db9e6225b44c95d4196b49dcd887744ee505489985e
-  data.tar.gz: 46854909ad71908ccb8de42fefb8b97c9be1889011f830d7180d9fd01b11e0ec0cb39b869ea389754d88dc74e0723e0acece5330c0edde8bd24a2fcab3162dad
+  metadata.gz: 5105013dcf052dbd3041b5e3aeb8a5b5c8c94e3f8e75b89c5735a0e1ef1d0425c7eb535ad77c28995ede0ca0a45154f9606d090dcec8e76a9cf67b5f65c9348c
+  data.tar.gz: 438f5e8dc09e5b5010b044169757d0bb1ce685fc15ae32d90e6ae037504715faab0afa1e2a0564449bd7b276c1885ed04f6c0fbc5ec74eedfb18d92041ebe51a

data/README.md

@@ -65,6 +65,12 @@ foo = Diplomat::Kv.get('foo')
 # => "bar"
 ```
 
+Or retrieve a value from another datacenter:
+```ruby
+foo = Diplomat::Kv.get('foo', :dc => 'dc-west')
+# => "baz"
+```
+
 You can also retrieve values recursively:
 
 ```ruby
@@ -84,7 +90,7 @@ Looking up a service is easy as pie:
 
 ```ruby
 foo_service = Diplomat::Service.get('foo')
-# => #<OpenStruct Node="hotel", Address="1.2.3.4", ServiceID="hotel_foo", ServiceName="foo", ServiceTags=["foo"], ServicePort=5432> 
+# => #<OpenStruct Node="hotel", Address="1.2.3.4", ServiceID="hotel_foo", ServiceName="foo", ServiceTags=["foo"], ServicePort=5432>
 ```
 Or if you have multiple nodes per service:
 
@@ -93,6 +99,23 @@ foo_service = Diplomat::Service.get('foo', :all)
 # => [#<OpenStruct Node="hotel", Address="1.2.3.4", ServiceID="hotel_foo", ServiceName="foo", ServiceTags=["foo"], ServicePort=5432>,#<OpenStruct Node="indigo", Address="1.2.3.5", ServiceID="indigo_foo", ServiceName="foo", ServiceTags=["foo"], ServicePort=5432>]
 ```
 
+Or if you want to find services for a particular datacenter
+
+```ruby
+foo_service = Diplomat::Service.get('foo', :all, { :dc => 'My_Datacenter'})
+# => [#<OpenStruct Node="hotel", Address="1.2.3.4", ServiceID="hotel_foo", ServiceName="foo", ServiceTags=["foo"], ServicePort=5432>,#<OpenStruct Node="indigo", Address="1.2.3.5", ServiceID="indigo_foo", ServiceName="foo", ServiceTags=["foo"], ServicePort=5432>]
+```
+
+### Datacenters
+
+Getting a list of datacenters is quite simple and gives you the option to extract all services out of
+all accessible datacenters if you need to.
+
+```ruby
+datacenters = Diplomat::Datacenter.get()
+# => ["DC1", "DC2"]
+```
+
 ### Sessions
 
 Creating a session:
@@ -179,7 +202,7 @@ You can create a custom configuration using the following syntax:
 ```ruby
 Diplomat.configure do |config|
   # Set up a custom Consul URL
-  config.url = "localhost:8888"
+  config.url = "http://localhost:8888"
   # Set up a custom Faraday Middleware
   config.middleware = MyCustomMiddleware
   # Connect into consul with custom access token (ACL)

data/lib/diplomat.rb

@@ -21,7 +21,7 @@ module Diplomat
   self.root_path = File.expand_path "..", __FILE__
   self.lib_path = File.expand_path "../diplomat", __FILE__
 
-  require_libs "configuration", "rest_client", "kv", "service", "members", "check", "health", "session", "lock", "error", "event"
+  require_libs "configuration", "rest_client", "kv", "datacenter", "service", "members", "check", "health", "session", "lock", "error", "event"
   self.configuration ||= Diplomat::Configuration.new
 
   class << self
@@ -45,4 +45,4 @@ module Diplomat
       Diplomat::Kv.new.send(name, *args, &block)
     end
   end
-end
+end

data/lib/diplomat/datacenter.rb

@@ -0,0 +1,27 @@
+require 'base64'
+require 'faraday'
+
+module Diplomat
+  class Datacenter < Diplomat::RestClient
+
+    @access_methods = [ :get ]
+
+    # Get an array of all avaliable datacenters accessible by the local consul agent
+    # @param meta [Hash] output structure containing header information about the request (index)
+    # @return [OpenStruct] all datacenters avaliable to this consul agent
+    def get meta=nil
+
+      url = ["/v1/catalog/datacenters"]
+
+      ret = @conn.get concat_url url
+
+      if meta and ret.headers
+        meta[:index] = ret.headers["x-consul-index"]
+        meta[:knownleader] = ret.headers["x-consul-knownleader"]
+        meta[:lastcontact] = ret.headers["x-consul-lastcontact"]
+      end
+      return JSON.parse(ret.body)
+    end
+
+  end
+end

data/lib/diplomat/error.rb

@@ -1,5 +1,6 @@
 module Diplomat
   class KeyNotFound < StandardError; end
+  class PathNotFound < StandardError; end
   class KeyAlreadyExists < StandardError; end
   class EventNotFound < StandardError; end
   class EventAlreadyExists < StandardError; end

data/lib/diplomat/kv.rb

@@ -10,6 +10,7 @@ module Diplomat
     # @param key [String] the key
     # @param options [Hash] the query params
     # @option options [String] :consistency The read consistency type
+    # @option options [String] :dc Target datacenter
     # @param not_found [Symbol] behaviour if the key doesn't exist;
     #   :reject with exception, :return degenerate value, or :wait for it to appear
     # @param found [Symbol] behaviour if the key does exist;
@@ -39,6 +40,7 @@ module Diplomat
       url += recurse_get(@options)
       url += check_acl_token
       url += use_consistency(@options)
+      url += dc(@options)
 
       # 404s OK using this connection
       raw = @conn_no_err.get concat_url url
@@ -81,6 +83,7 @@ module Diplomat
     # @param value [String] the value
     # @param options [Hash] the query params
     # @option options [Integer] :cas The modify index
+    # @option options [String] :dc Target datacenter
     # @return [Bool] Success or failure of the write (can fail in c-a-s mode)
     def put key, value, options=nil
       @options = options
@@ -88,6 +91,7 @@ module Diplomat
         url = ["/v1/kv/#{key}"]
         url += check_acl_token
         url += use_cas(@options)
+        url += dc(@options)
         req.url concat_url url
         req.body = value
       end
@@ -100,11 +104,15 @@ module Diplomat
 
     # Delete a value by its key
     # @param key [String] the key
+    # @param options [Hash] the query params
+    # @option options [String] :dc Target datacenter
     # @return [OpenStruct]
-    def delete key
+    def delete key, options=nil
       @key = key
+      @options = options
       url = ["/v1/kv/#{@key}"]
       url += check_acl_token
+      url += dc(@options)
       @raw = @conn.delete concat_url url
     end
 
@@ -125,5 +133,9 @@ module Diplomat
     def recurse_get(options)
       if options && options[:recurse] then ['recurse'] else [] end
     end
+
+    def dc(options)
+      if options && options[:dc] then use_named_parameter("dc", options[:dc]) else [] end
+    end
   end
 end

data/lib/diplomat/rest_client.rb

@@ -80,11 +80,12 @@ module Diplomat
         @value = @raw.first["Value"]
         @value = Base64.decode64(@value) unless @value.nil?
       else
-        @value = @raw.map do |e|
-          {
+        @value = @raw.reduce([]) do |acc, e|
+          acc << {
             :key => e["Key"],
-            :value => (Base64.decode64(e["Value"]) unless e["Value"].nil?)
-          }
+            :value => Base64.decode64(e["Value"])
+          } unless e["Value"].nil?
+          acc
         end
       end
     end

data/lib/diplomat/service.rb

@@ -3,7 +3,7 @@ require 'faraday'
 
 module Diplomat
   class Service < Diplomat::RestClient
-    
+
     @access_methods = [ :get, :register, :deregister ]
 
     # Get a service by it's key
@@ -19,7 +19,13 @@ module Diplomat
       url << use_named_parameter('index', options[:index]) if options and options[:index]
       url << use_named_parameter('dc', options[:dc]) if options and options[:dc]
 
-      ret = @conn.get concat_url url
+      # If the request fails, it's probably due to a bad path
+      # so return a PathNotFound error.
+      begin
+        ret = @conn.get concat_url url
+      rescue Faraday::ClientError
+        raise Diplomat::PathNotFound
+      end
 
       if meta and ret.headers
         meta[:index] = ret.headers["x-consul-index"]

data/lib/diplomat/session.rb

@@ -44,7 +44,7 @@ module Diplomat
     
     def renew id
       raw = @conn.put do |req|
-        req.url = "/v1/session/renew/#{id}"
+        req.url "/v1/session/renew/#{id}"
       end
       JSON.parse(raw.body)
     end

data/lib/diplomat/version.rb

@@ -1,3 +1,3 @@
 module Diplomat
-  VERSION = "0.12.0"
+  VERSION = "0.13.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diplomat
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - John Hamelink
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-30 00:00:00.000000000 Z
+date: 2015-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -179,6 +179,7 @@ files:
 - lib/diplomat.rb
 - lib/diplomat/check.rb
 - lib/diplomat/configuration.rb
+- lib/diplomat/datacenter.rb
 - lib/diplomat/error.rb
 - lib/diplomat/event.rb
 - lib/diplomat/health.rb
@@ -209,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Diplomat is a simple wrapper for Consul