etcd-tools 0.3.0 → 0.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Yzc0YWVjZTY0ODdhOTA1NGE4YTAyMGI2MDk4NDc2YzVkYzk0ZWYwYg==
+    ZTY1MTRhNTAzNzM3MjJhOGE4OWQ4NDE3ODlhNjlhMWQ2NTM2ZjY3NA==
   data.tar.gz: !binary |-
-    M2JjMWVhOGIzZGRjMjMwOGYzODQ2ZmVkNTYzNjRhNGFkOTViOGY0Zg==
+    YTc4M2EzYThmM2E2ZTMwZjFkZDdjYjRjN2YyMjk5ZTU3MDUwZWY0MQ==
 SHA512:
   metadata.gz: !binary |-
-    NTc3MTExOGFjY2M1NGM5YWM5NzVhYzcyYTAxZjgwMzQ1NDYzODEzYmZhNDdm
-    MWViYmZjMDE0NmJlZGIxNTUxN2Q1Yzc1ZWRhMDI0MDI3NWQyZmI3MDlmNzdh
-    ZGIzN2Y0NzNhZGUzNzk1NDg3YThmZTI4Yzk3MGZhOWFkYTc0NDk=
+    Nzk1YTA0MThlNWM5NjU3ZTkwZDljODVkYzEwNGJkY2RlM2U5N2MzODIxNzIw
+    ZjJmZGY2NTViYjlkZWU2N2ZmMDIyMTQ2OWMzMjAzMTViOTc4ZGRkYjI0YzIz
+    MTFlNGMxYTMxN2NmYjA5Yjg1Zjg4N2EwYWU2ZGMxYzQyZTc4NTM=
   data.tar.gz: !binary |-
-    NTQ2NzE2NmM3NjU2ZGNhOGVjYTVjYTcyMzkyYTk2ODFiYjNhZmFiYmRhOGY0
-    OWZhZTk0Y2E3OTM5MDkxYThkOTNiODEyYjhiOTE0YmQ4ZWRjN2RkMThhNDFj
-    MTNmNTUyZGE2ZmQzMWE4OTJiNzJiNWEzNzFhNjQzMzZkMWY3ZDk=
+    NmEyM2MyMGQ4NDhhMGYwMWU3YTRjZGUxOGQwYzA0NGFiZTlkNThlNjJjZmEx
+    ZWE0OTRhYmI2YWJmYTA4YWUyN2E1YjkxYTExMTk2ODM3MTIxNmFiMDFlMWZi
+    ZWE5NDk0ZjhmZjcxMTIxMzhlNTgwMGNhM2NkZDIyNjdkNTY4NzU=

data/lib/etcd-tools/cli/etcd2yaml.rb

@@ -11,7 +11,7 @@ module EtcdTools
         @options = Hash.new
 
         @options[:url] = ENV['ETCDCTL_ENDPOINT']
-        @options[:url] ||= "http://127.0.0.1:4001"
+        @options[:url] ||= "http://127.0.0.1:2379"
         @options[:root_path] = "/config"
 
         OptionParser.new do |opts|
@@ -26,9 +26,6 @@ module EtcdTools
           opts.on("-r", "--root-path PATH", "root PATH of ETCD tree to extract the data from [DEFAULT: /config]") do |param|
             @options[:root_path] = param
           end
-          opts.on("-v", "--verbose", "run verbosely") do |param|
-            @options[:verbose] = param
-          end
           opts.on_tail("-h", "--help", "show usage") do |param|
             puts opts;
             exit! 0
@@ -41,14 +38,13 @@ module EtcdTools
 
         begin
           @etcd = etcd_connect @options[:url]
-        rescue Exception => e
-          $stderr.puts "Failed to connect to ETCD!"
-          $stderr.puts e.message
+        rescue EtcdTools::ClusterConnectError
+          $stderr.puts "Failed to connect to ETCD cluster"
           exit! 1
         end
 
         begin
-          hash = etcd2hash @etcd, @options[:root_path]
+          hash = @etcd.get_hash @options[:root_path]
           puts YAML.dump hash
         rescue Exception => e
           $stderr.puts "Import failed"

data/lib/etcd-tools/cli/etcd_erb.rb

@@ -11,13 +11,13 @@ module EtcdTools
         @options = Hash.new
 
         @options[:url] = ENV['ETCDCTL_ENDPOINT']
-        @options[:url] ||= "http://127.0.0.1:4001"
+        @options[:url] ||= "http://127.0.0.1:2379"
 
         OptionParser.new do |opts|
           opts.banner = "Applies variables from ETCD onto ERB template\n\nUsage: #{$0} [OPTIONS] < template.erb > outfile"
           opts.separator ""
           opts.separator "Connection options:"
-          opts.on("-u", "--url URL", "URL endpoint of the ETCD service (ETCDCTL_ENDPOINT envvar also applies) [DEFAULT: http://127.0.0.1:4001]") do |param|
+          opts.on("-u", "--url URL", "URL endpoint of the ETCD service (ETCDCTL_ENDPOINT envvar also applies) [DEFAULT: http://127.0.0.1:2379]") do |param|
             @options[:url] = param
           end
           opts.separator ""
@@ -34,9 +34,8 @@ module EtcdTools
 
         begin
           @etcd = etcd_connect @options[:url]
-        rescue Exception => e
-          $stderr.puts "Failed to connect to ETCD!"
-          $stderr.puts e.message
+        rescue EtcdTools::ClusterConnectError
+          $stderr.puts "Failed to connect to ETCD cluster"
           exit! 1
         end
 

data/lib/etcd-tools/cli/yaml2etcd.rb

@@ -11,7 +11,7 @@ module EtcdTools
         @options = Hash.new
 
         @options[:url] = ENV['ETCDCTL_ENDPOINT']
-        @options[:url] ||= "http://127.0.0.1:4001"
+        @options[:url] ||= "http://127.0.0.1:2379"
         @options[:root_path] = "/config"
 
         OptionParser.new do |opts|
@@ -26,9 +26,6 @@ module EtcdTools
           opts.on("-r", "--root-path PATH", "root PATH of ETCD tree to inject the data [DEFAULT: /config]") do |param|
             @options[:root_path] = param
           end
-          opts.on("-v", "--verbose", "run verbosely") do |param|
-            @options[:verbose] = param
-          end
           opts.on_tail("-h", "--help", "show usage") do |param|
             puts opts;
             exit! 0
@@ -49,20 +46,19 @@ module EtcdTools
 
         begin
           @etcd = etcd_connect @options[:url]
-        rescue Exception => e
-          $stderr.puts "Failed to connect to ETCD!"
-          $stderr.puts e.message
+        rescue EtcdTools::ClusterConnectError
+          $stderr.puts "Failed to connect to ETCD cluster"
           exit! 1
         end
 
         begin
-          hash2etcd @etcd, @hash, @options[:root_path]
-          puts "OK"
+          @etcd.set_hash(@hash, @options[:root_path])
         rescue Exception => e
           $stderr.puts "Import failed"
           $stderr.puts e.message
           exit! 1
         end
+        puts "OK"
       end
 
     end

data/lib/etcd-tools/erb.rb

@@ -25,20 +25,20 @@ module EtcdTools
     end
 
     def value path
-      @etcd.get('/' + path.sub(/^\//, '')).value
+      @etcd.get('/' + path.sub(%r{^/+}, '')).value
     end
 
     def keys path
-      path.sub!(/^\//, '')
+      path.sub!(%r{^/+}, '')
       if @etcd.get('/' + path).directory?
-        return @etcd.get('/' + path).children.map { |key| key.key }
+        return @etcd.get('/' + path).children.map(&:key)
       else
         return []
       end
     end
 
     def hash path
-      etcd2hash @etcd, path
+      @etcd.get_hash path
     rescue
       {}
     end

data/lib/etcd-tools/etcd.rb

@@ -2,44 +2,19 @@ require 'etcd'
 require 'etcd-tools/mixins'
 
 module EtcdTools
+  class ClusterConnectError < Exception
+  end
+
   module Etcd
-    def etcd_connect(url)
-      (host, port) = url.gsub(/^https?:\/\//, '').gsub(/\/$/, '').split(':')
-      etcd = ::Etcd.client(host: host, port: port)
-      begin
-        etcd.version
+    def etcd_connect(url, timeout = 2)
+      url = url.split(',')
+      url.each do |u|
+        (host, port) = u.gsub(/^https?:\/\//, '').gsub(/\/$/, '').split(':')
+        etcd = ::Etcd.client(host: host, port: port, read_timeout: timeout)
+        next unless etcd.healthy?
         return etcd
-      rescue Exception => e
-        raise e #fixme
-      end
-    end
-
-    def hash2etcd(etcd, hash, path = '')
-      hash.each do |key, value|
-        path = "" if path == '/'
-        etcd_key = path + '/' + key.to_s
-        if value.class == Hash
-          hash2etcd(etcd, value, etcd_key)
-        else
-          etcd.set(etcd_key, value: value)
-        end
-      end
-    rescue Exception => e
-      raise e #fixme
-    end
-
-    def etcd2hash(etcd, path = '')
-      h = {}
-      etcd.get(path).children.each do |child|
-        if etcd.get(child.key).directory?
-          h[child.key.split('/').last.to_s] = etcd2hash etcd, child.key
-        else
-          h[child.key.split('/').last.to_s] = child.value
-        end
       end
-      return Hash[h.sort]
-    rescue Exception => e
-      return nil
+      raise EtcdTools::ClusterConnectError
     end
   end
 end

data/lib/etcd-tools/mixins/etcd.rb

@@ -0,0 +1,108 @@
+require 'etcd'
+require 'etcd/client'
+
+module Etcd
+  class Client
+
+    attr_reader :cluster
+
+    def initialize(opts = {})
+      @cluster = opts[:cluster] || [{ host: '127.0.0.1', port: 2379 }]
+      if !opts[:host].nil? || !opts[:port].nil?
+        @cluster = [{ host: opts[:host], port: opts[:port] }]
+      end
+      @config = Config.new
+      @config.read_timeout = opts[:read_timeout] || 10
+      @config.use_ssl = opts[:use_ssl] || false
+      @config.verify_mode = opts.key?(:verify_mode) ? opts[:verify_mode] : OpenSSL::SSL::VERIFY_PEER
+      @config.user_name = opts[:user_name] || nil
+      @config.password = opts[:password] || nil
+      @config.ca_file = opts.key?(:ca_file) ? opts[:ca_file] : nil
+      @config.ssl_cert = opts.key?(:ssl_cert) ? opts[:ssl_cert] : nil
+      @config.ssl_key = opts.key?(:ssl_key) ? opts[:ssl_key] : nil
+      yield @config if block_given?
+    end
+
+    def api_execute(path, method, options = {})
+      params = options[:params]
+      case  method
+      when :get
+        req = build_http_request(Net::HTTP::Get, path, params)
+      when :post
+        req = build_http_request(Net::HTTP::Post, path, nil, params)
+      when :put
+        req = build_http_request(Net::HTTP::Put, path, nil, params)
+      when :delete
+        req = build_http_request(Net::HTTP::Delete, path, params)
+      else
+        fail "Unknown http action: #{method}"
+      end
+      req.basic_auth(user_name, password) if [user_name, password].all?
+      cluster_http_request(req, options)
+    end
+
+    def cluster_http_request(req, options={})
+      cluster.each do |member|
+        http = build_http_object(member[:host], member[:port], options)
+        begin
+          Log.debug("Invoking: '#{req.class}' against '#{member[:host]}:#{member[:port]}' -> '#{req.path}'")
+          res = http.request(req)
+          Log.debug("Response code: #{res.code}")
+          Log.debug("Response body: #{res.body}")
+          return process_http_request(res)
+        rescue Timeout::Error
+          Log.debug("Timeout")
+          next
+        end
+        fail
+      end
+    end
+
+    def build_http_object(host, port, options={})
+      http = Net::HTTP.new(host, port)
+      http.read_timeout = options[:timeout] || read_timeout
+      http.open_timeout = options[:timeout] || read_timeout # <- can't modify Config constant with specific option
+      setup_https(http)
+      http
+    end
+
+    def set_hash(hash, path = '')
+      hash.each do |key, value|
+        path = "" if path == '/'
+        etcd_key = path + '/' + key.to_s
+        if value.class == Hash
+          set_hash(value, etcd_key)
+        else
+          set(etcd_key, value: value)
+        end
+      end
+    rescue Exception => e
+      raise e #fixme
+    end
+
+    def get_hash(path = '')
+      h = {}
+      get(path).children.each do |child|
+        if get(child.key).directory?
+          h[child.key.split('/').last.to_s] = get_hash child.key
+        else
+          h[child.key.split('/').last.to_s] = child.value
+        end
+      end
+      return Hash[h.sort]
+    rescue Exception => e
+      raise e
+    end
+
+    def members
+      members = JSON.parse(api_execute(version_prefix + '/members', :get).body)['members']
+      Hash[members.map{|member| [ member['id'], member.tap { |h| h.delete('id') }]}]
+    end
+
+    def healthy?
+      JSON.parse(api_execute('/health', :get).body)['health'] == 'true'
+    rescue
+      false
+    end
+  end
+end

data/lib/etcd-tools/mixins/hash.rb

@@ -0,0 +1,6 @@
+class Hash
+  def deep_merge(second)
+    merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2 }
+    self.merge(second, &merger)
+  end
+end

data/lib/etcd-tools/mixins.rb

@@ -1,19 +1,2 @@
-class Hash
-  def deep_merge(second)
-    merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2 }
-    self.merge(second, &merger)
-  end
-end
-
-module Etcd
-  class Client
-    def members
-      members = JSON.parse(api_execute(version_prefix + '/members', :get, timeout: 10).body)['members']
-      Hash[members.map{|member| [ member['id'], member.tap { |h| h.delete('id') }]}]
-    end
-
-    def healthy?
-      JSON.parse(api_execute('/health', :get, timeout: 3).body)['health'] == 'true'
-    end
-  end
-end
+require 'etcd-tools/mixins/hash.rb'
+require 'etcd-tools/mixins/etcd.rb'

data/lib/etcd-tools.rb

@@ -1,3 +1,4 @@
+require 'etcd'
 require 'etcd-tools/mixins'
 
 module EtcdTools

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etcd-tools
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Radek 'blufor' Slavicinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-20 00:00:00.000000000 Z
+date: 2016-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: etcd
@@ -30,12 +30,12 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.0
-description: A set of handful command-line utils for ETCD
+description: A set of handful command-line utils for ETCD + lib extensions
 email: radek.slavicinsky@gmail.com
 executables:
+- etcd2yaml
 - etcd-erb
 - yaml2etcd
-- etcd2yaml
 extensions: []
 extra_rdoc_files: []
 files:
@@ -49,6 +49,8 @@ files:
 - lib/etcd-tools/erb.rb
 - lib/etcd-tools/etcd.rb
 - lib/etcd-tools/mixins.rb
+- lib/etcd-tools/mixins/etcd.rb
+- lib/etcd-tools/mixins/hash.rb
 homepage: https://github.com/blufor/etcd-tools
 licenses:
 - GPLv2