lib/etcd/client.rb in etcd-0.2.4 vs lib/etcd/client.rb in etcd-0.3.0

@@ -14,27 +14,33 @@
   # This is the central ruby class for Etcd. It provides methods for all
   # etcd api calls. It also provides few additional methods beyond the core
   # etcd api, like Etcd::Client#lock and Etcd::Client#eternal_watch, they
   # are defined in separate modules and included in this class
   class Client
-
     extend Forwardable
 
     HTTP_REDIRECT = ->(r) { r.is_a? Net::HTTPRedirection }
     HTTP_SUCCESS = ->(r) { r.is_a? Net::HTTPSuccess }
     HTTP_CLIENT_ERROR = ->(r) { r.is_a? Net::HTTPClientError }
 
     include Stats
     include Keys
 
-    Config = Struct.new(:use_ssl, :verify_mode, :read_timeout, :ssl_key, :ca_file,
-                        :user_name, :password, :allow_redirect, :ssl_cert)
+    Config = Struct.new(
+      :use_ssl,
+      :verify_mode,
+      :read_timeout,
+      :ssl_key,
+      :ca_file,
+      :user_name,
+      :password,
+      :ssl_cert
+    )
 
     def_delegators :@config, :use_ssl, :verify_mode, :read_timeout
-    def_delegators :@config, :user_name, :password, :allow_redirect
+    def_delegators :@config, :user_name, :password
 
-
     attr_reader :host, :port, :http, :config
 
     ##
     # Creates an Etcd::Client object. It accepts a hash +opts+ as argument
     #
@@ -46,16 +52,19 @@
     def initialize(opts = {})
       @host = opts[:host] || '127.0.0.1'
       @port = opts[:port] || 4001
       @config = Config.new
       @config.read_timeout = opts[:read_timeout] || 60
-      @config.allow_redirect = opts.key?(:allow_redirect) ? opts[:allow_redirect] : true
       @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.allow_redirect = opts.key?(:allow_redirect) ? opts[:allow_redirect] : true
+      @config.ca_file = opts.key?(:ca_file) ? opts[:ca_file] : nil
+      # Provide a OpenSSL X509 cert here and not the path. See README
+      @config.ssl_cert = opts.key?(:ssl_cert) ? opts[:ssl_cert] : nil
+      # Provide the key (content) and not just the filename here.
+      @config.ssl_key = opts.key?(:ssl_key) ? opts[:ssl_key] : nil
       yield @config if block_given?
     end
     # rubocop:enable CyclomaticComplexity
 
     # Returns the etcd api version that will be used for across API methods
@@ -66,18 +75,13 @@
     # Returns the etcd daemon version
     def version
       api_execute('/version', :get).body
     end
 
-    # Returns array of all machines in the cluster
-    def machines
-      api_execute(version_prefix + '/machines', :get).body.split(',').map(&:strip)
-    end
-
     # Get the current leader
     def leader
-      api_execute(version_prefix + '/leader', :get).body.strip
+      api_execute(version_prefix + '/stats/leader', :get).body.strip
     end
 
     # This method sends api request to etcd server.
     #
     # This method has following parameters as argument
@@ -97,54 +101,43 @@
       when :delete
         req = build_http_request(Net::HTTP::Delete, path, params)
       else
         fail "Unknown http action: #{method}"
       end
-      timeout = options[:timeout] || @read_timeout
       http = Net::HTTP.new(host, port)
-      http.read_timeout = timeout
+      http.read_timeout = options[:timeout] || read_timeout
       setup_https(http)
       req.basic_auth(user_name, password) if [user_name, password].all?
       Log.debug("Invoking: '#{req.class}' against '#{path}")
       res = http.request(req)
       Log.debug("Response code: #{res.code}")
-      process_http_request(res, req, params)
+      Log.debug("Response body: #{res.body}")
+      process_http_request(res)
     end
 
     def setup_https(http)
       http.use_ssl = use_ssl
       http.verify_mode = verify_mode
-      unless config.ssl_cert.nil?
+      if config.ssl_cert
         Log.debug('Setting up ssl cert')
         http.cert = config.ssl_cert
       end
-      unless config.ssl_key.nil?
+      if config.ssl_key
         Log.debug('Setting up ssl key')
         http.key = config.ssl_key
       end
-      unless config.ca_file.nil?
+      if config.ca_file
         Log.debug('Setting up ssl ca file to :' + config.ca_file)
         http.ca_file = config.ca_file
       end
     end
 
-    # need to ahve original request to process the response when it redirects
-    def process_http_request(res, req = nil, params = nil)
+    # need to have original request to process the response when it redirects
+    def process_http_request(res)
       case res
       when HTTP_SUCCESS
         Log.debug('Http success')
         res
-      when HTTP_REDIRECT
-        if allow_redirect
-          uri = URI(res['location'])
-          @host = uri.host
-          @port = uri.port
-          Log.debug("Http redirect, setting new host to: #{@host}:#{@port}, and retrying")
-          api_execute(uri.path, req.method.downcase.to_sym, params: params)
-        else
-          Log.debug('Http redirect not allowed')
-          res.error!
-        end
       when HTTP_CLIENT_ERROR
         fail Error.from_http_response(res)
       else
         Log.debug('Http error')
         Log.debug(res.body)