etcd-discovery 0.1.5 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e88aa106512adc7611e367d928d282c360340adc
-  data.tar.gz: f0b5f71eee7989887cc20710958c156e6826b077
+  metadata.gz: 894c96cbadf49bdddf6f499c50be5f8bd68ef95f
+  data.tar.gz: 7df1a2709784aaaea0838d36186f75aec034875c
 SHA512:
-  metadata.gz: dc991580a31c81665586b8e3b99e1118d3e3ace0c9002967fe3fd8723de61e0ed700a8eb0965e0ae7a0360e6810ed1b76e8ecf776ca331ca02b2f6377dfd14a9
-  data.tar.gz: ed999908f71f93a9695cc73061bb6f4cdce2496bbf47a682cf4b6957636db9ab5c321af2f148c4637c4530bb2bd2565cb7d8995825c10e64d19267f8f767f908
+  metadata.gz: 6f67fd59fe7ecf4c7301d60f5263be4a2a1304be7b06d6716bd85e289d6a6c52e45b4fb385fd26e4163cc0b5ae1f6bc5a70a926077b34d582e457ee376a2c248
+  data.tar.gz: 1316ad6bf0935b9d9958017c1e3c8c3c16b32dd22067ff8daa4ca51db024b34f3fc7dd28d827c3e9b76e1290851b935b29232bf89a8b524a4babb0dea41cf686

data/lib/etcd-discovery.rb

@@ -27,6 +27,6 @@ module EtcdDiscovery
   end
 
   def self.register(service, host)
-    Service.register(service, host)
+    Registration.register(service, host)
   end
 end

data/lib/etcd-discovery/host.rb

@@ -37,6 +37,28 @@ module EtcdDiscovery
       end
     end
 
+    def to_private_uri(schemes = ["https", "http"])
+      a = attributes
+      if a['private_hostname'].empty?
+        return self.to_uri(schemes)
+      end
+      schemes = [schemes] if !schemes.is_a?(Array)
+      scheme = schemes.select{ |s|
+        !a['private_ports'][s].nil?
+      }.first
+
+      if a['user'].empty?
+        URI("#{scheme}://#{a['private_hostname']}:#{a['private_ports'][scheme]}")
+      else
+        URI("#{scheme}://#{a['user']}:#{a['password']}@#{a['private_hostname']}:#{a['private_ports'][scheme]}")
+      end
+    end
+
+    def set_credentials(user, password)
+      @attributes['user'] = user
+      @attributes['password'] = password
+    end
+
     def to_s
       self.to_uri.to_s
     end

data/lib/etcd-discovery/registrar.rb

@@ -1,3 +1,5 @@
+require 'securerandom'
+
 module EtcdDiscovery
   class InvalidStateError < StandardError
     def initialize(current, expected)
@@ -13,21 +15,27 @@ module EtcdDiscovery
   class Registrar
     attr_reader :state
     attr_reader :thread
+    attr_reader :watcher
     attr_reader :host
+    attr_reader :service
+    attr_reader :user
+    attr_reader :password
 
     def initialize(service, host)
       @logger = Logger.new($stdout)
 
       if host.is_a? Hash
-        @host = Host.new host
+        @host = Host.new host.merge('service_name' => service, 'uuid' => SecureRandom.uuid)
       elsif host.is_a? EtcdDiscovery::Host
         @host = host
       else
         raise TypeError, "host should be a Hash or a Etcd::Host, is a #{host.class}"
       end
 
-      @service = service
+      @service = EtcdDiscovery::Service.new service_params
       @state = :new
+      @user     = @host.attributes['user']
+      @password = @host.attributes['password']
     end
 
     def register
@@ -37,13 +45,33 @@ module EtcdDiscovery
       end
 
       @state = :started
-      value = @host.to_json
 
+      service_value = @service.to_json
+
+      # Do not start credentials synchro if the service is not public or has no credentials
+      if @service.attributes['public'] && (@service.attributes['user'].present? || @service.attributes['password'].present?)
+        @watcher = Thread.new {
+          @logger.warn "Watcher #{@service.attributes['name']} started"
+          index = 0
+          while @state == :started
+            resp = client.watch service_key, {index: index}
+            value = JSON.parse resp.node.value
+            @user = value['user']
+            @password = value['password']
+            @host.set_credentials user, password
+            @service.set_credentials user, password
+            index = resp.etcd_index
+          end
+        }
+      end
+
+      client.set(service_key, value: service_value)
       @thread = Thread.new {
         @logger.warn "Register '#{@service}' started"
         while @state == :started
+          value = @host.to_json
           begin
-            client.set(key, value: value, ttl: config.register_ttl)
+            client.set(host_key, value: value, ttl: config.register_ttl)
           rescue => e
             @logger.warn "Fail to set #{key}: #{e}, #{e.message}, #{e.class}"
           end
@@ -51,7 +79,9 @@ module EtcdDiscovery
         end
         @logger.warn "Register '#{@service}' stopped"
       }
-      self
+
+
+      return self
     end
 
     def stop
@@ -70,8 +100,25 @@ module EtcdDiscovery
       EtcdDiscovery.config
     end
 
-    def key
-      "/services/#{@service}/#{@host.attributes['name']}"
+    def host_key
+      "/services/#{@service.attributes['name']}/#{@host.attributes['uuid']}"
+    end
+
+    def service_key
+      "/services_infos/#{@service.attributes['name']}"
+    end
+
+    def service_params
+      params = {
+        'name' =>     host.attributes['service_name'],
+        'critical' => host.attributes['critical'],
+        'user' =>     host.attributes['user'],
+        'password' => host.attributes['password'],
+        'public' =>   host.attributes['public']
+      }
+      params['hostname'] = host.attributes['name']if params['public']
+      params['ports'] = host.attributes['ports']  if params['public']
+      return params
     end
   end
 end

data/lib/etcd-discovery/registration.rb

@@ -0,0 +1,7 @@
+module EtcdDiscovery
+  class Registration
+    def self.register(service, host)
+      EtcdDiscovery::Registrar.new(service, host).register
+    end
+  end
+end

data/lib/etcd-discovery/service.rb

@@ -3,19 +3,40 @@ module EtcdDiscovery
   end
 
   class Service
+    attr_accessor :attributes
+
+    def initialize(arg)
+      if arg.is_a? Etcd::Node
+        @attributes = JSON.parse arg.value
+      elsif arg.is_a? Hash
+        @attributes = arg
+      else
+        raise TypeError, "requires a Etcd::Node or a Hash, not a #{arg.class}"
+      end
+    end
+
     def self.get(service)
       raise TypeError, "service should be a String, is a #{service.class}" unless service.is_a? String
 
       client = EtcdDiscovery.config.client
       begin
-        node = client.get("/services/#{service}", recursive: true)
+        service = client.get("/services_infos/#{service}")
+        return self.new service.node
+      rescue Etcd::KeyNotFound
+        return self.new name: 'service'
+      end
+    end
+
+    def all
+      client = EtcdDiscovery.config.client
+      begin
+        node = client.get("/services/#{attributes['name']}", recursive: true).node
       rescue Etcd::KeyNotFound
-        raise ServiceNotFound, service
+        raise ServiceNotFound, attributes['name']
       end
       if node.children.length == 0
-        raise ServiceNotFound, service
+        raise ServiceNotFound, attributes['name']
       end
-
       hosts = []
       node.children.each do |c|
         hosts << Host.new(c)
@@ -23,8 +44,32 @@ module EtcdDiscovery
       return hosts
     end
 
-    def self.register(service, host)
-      EtcdDiscovery::Registrar.new(service, host).register
+    def one
+      all.sample
+    end
+
+    def to_uri(schemes = ["https", "http"])
+      a = attributes
+      return one.to_uri(schemes) unless a['public']
+
+      schemes = [schemes] if !schemes.is_a?(Array)
+      scheme = schemes.select{|s|
+        !a['ports'][s].nil?
+      }.first
+      if a['user'].empty?
+        URI("#{scheme}://#{a['hostname']}:#{a['ports'][scheme]}")
+      else
+        URI("#{scheme}://#{a['user']}:#{a['password']}@#{a['hostname']}:#{a['ports'][scheme]}")
+      end
+    end
+
+    def to_json
+      attributes.to_json
+    end
+
+    def set_credentials(user, password)
+      @attributes['user'] = user
+      @attributes['password'] = password
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etcd-discovery
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 1.0.1
 platform: ruby
 authors:
 - Léo Unbekandt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-02 00:00:00.000000000 Z
+date: 2017-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: etcd
@@ -35,6 +35,7 @@ files:
 - lib/etcd-discovery/config.rb
 - lib/etcd-discovery/host.rb
 - lib/etcd-discovery/registrar.rb
+- lib/etcd-discovery/registration.rb
 - lib/etcd-discovery/service.rb
 - spec/etcd-discovery/registrar_spec.rb
 - spec/spec_helper.rb
@@ -58,9 +59,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Service discovery based on etcd
 test_files: []
-has_rdoc: