etcdv3 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30310caddc0edd306f6c292f980628a01e9555c6
-  data.tar.gz: 602d665808709503255bb941b604482ca5a0b91e
+  metadata.gz: ee9b93afa5a82fab266b356a684bd201168046ae
+  data.tar.gz: 9b47ef6e8dd0d1caf32ec0b8453d55f771142e56
 SHA512:
-  metadata.gz: 9d2dd95400f50f1a185593659d5651f9607b20fadd6f9bf712cb85e8a8832f735ef71a6b52dd7acaa76e46e43139a3ffa1031c8c5c34b10ef9dfd26e834eba7a
-  data.tar.gz: a26775aba02b2b2a7f3244544362cf33cfcdfd748196d3fedee1721357dbf2b2dd73e985db6dd7424ca4c11af48588ecd9a14c07a4a90266bafaebbbac5d8794
+  metadata.gz: bf58b24446932842b4984452443fdc71b38610f8764d74875ef6bf6ef66fb8e85db268686c1546b4f8fe49414e19225b68477787177282a0ccf94cb1276a2c17
+  data.tar.gz: 4b1facb0dbc8a96bc1462a5053e96db38ffa781609048a19b742490f3dd0dc0e53983e2788164a96470c2ab3ea4a42fae469c698e134e89703f30cdd3c3fae0a

data/.travis.yml

@@ -1,12 +1,11 @@
 language: ruby
 rvm:
-  - 2.4.0
+  - 2.4.1
   - 2.2
-  - 2.0
 
 env:
   global:
-    - ETCD_VERSION=v3.1.6
+    - ETCD_VERSION=v3.2.0
 
 install:
     - bundle install

data/README.md

@@ -3,8 +3,6 @@
 
 Ruby client for Etcd V3
 
-**Warning: This is under active development and should be considered unstable**
-
 ## Getting Started
 
 [RubyDocs](http://www.rubydoc.info/gems/etcdv3)
@@ -20,17 +18,22 @@ gem install etcdv3
 require 'etcdv3'
 
 # Insecure connection
-conn = Etcdv3.new(url: 'http://127.0.0.1:2379')
+conn = Etcdv3.new(endpoints: 'http://127.0.0.1:2379, http://127.0.0.1:2389, http://127.0.0.1:2399')
 
 # Secure connection using default certificates
-conn = Etcdv3.new(url: 'https://hostname:port')
+conn = Etcdv3.new(endpoints: 'https://hostname:port')
 
 # Secure connection with Auth
-conn = Etcdv3.new(url: 'https://hostname:port', user: 'root', password: 'mysecretpassword')
+conn = Etcdv3.new(endpoints: 'https://hostname:port', user: 'root', password: 'mysecretpassword')
 
-# Secure connection specifying own certificates
+# Secure connection specifying custom certificates
 # Coming soon...
+
 ```
+**High Availability**
+
+In the event of a failure, the client will work to restore connectivity by cycling through the specified endpoints until a connection can be established.  With that being said, it is encouraged to specify multiple endpoints when available.
+
 
 ## Adding, Fetching and Deleting Keys
 ```ruby
@@ -122,7 +125,7 @@ Transactions provide an easy way to process multiple requests in a single transa
 _Note: You cannot modify the same key multiple times within a single transaction._
 
 ```ruby
-# https://github.com/davissp14/etcdv3-ruby/blob/txns/lib/etcdv3/kv/transaction.rb
+# https://github.com/davissp14/etcdv3-ruby/blob/master/lib/etcdv3/kv/transaction.rb
 conn.transaction do |txn|
   txn.compare = [
     # Is the value of 'target_key' equal to 'compare_value'
@@ -130,13 +133,13 @@ conn.transaction do |txn|
     # Is the version of 'target_key' greater than 10
     txn.version('target_key', :greater, 10)
   ]
-  
+
   txn.success = [
     txn.put('txn1', 'success')
   ]
-  
+
   txn.failure = [
-    txn.put('txn1', 'failed')
+    txn.put('txn1', 'failed', lease: lease_id)
   ]
 end
 ```
@@ -166,3 +169,12 @@ conn.alarm_list
 # Deactivate ALL active Alarms
 conn.alarm_deactivate
 ```
+
+```ruby
+# Example
+conn = Etcdv3.new(endpoints: 'http://127.0.0.1:2379, http://127.0.0.1:2389, http://127.0.0.1:2399')
+```
+
+## Contributing
+
+If you're looking to get involved, [Fork the project](https://github.com/davissp14/etcdv3-ruby) and send pull requests.

data/etcdv3.gemspec

@@ -14,7 +14,6 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
 
-  s.add_dependency("grpc", "1.2.5")
-  s.add_dependency("faraday", "0.11.0")
+  s.add_dependency("grpc", "1.6.0")
   s.add_development_dependency("rspec")
 end

data/lib/etcdv3/connection.rb

@@ -0,0 +1,51 @@
+class Etcdv3
+  class Connection
+
+    HANDLERS = {
+      auth: Etcdv3::Auth,
+      kv: Etcdv3::KV,
+      maintenance: Etcdv3::Maintenance,
+      lease: Etcdv3::Lease,
+      watch: Etcdv3::Watch
+    }
+
+    attr_reader :endpoint, :hostname, :handlers, :credentials
+
+    def initialize(url, metadata={})
+      @endpoint = URI(url)
+      @hostname = "#{@endpoint.hostname}:#{@endpoint.port}"
+      @credentials = resolve_credentials
+      @handlers = handler_map(metadata)
+    end
+
+    def call(stub, method, method_args=[])
+      @handlers.fetch(stub).send(method, *method_args)
+    end
+
+    def refresh_metadata(metadata)
+      @handlers = handler_map(metadata)
+    end
+
+    private
+
+    def handler_map(metadata={})
+      Hash[
+        HANDLERS.map do |key, klass|
+          [key, klass.new("#{@hostname}", @credentials, metadata)]
+        end
+      ]
+    end
+
+    def resolve_credentials
+      case @endpoint.scheme
+      when 'http'
+        :this_channel_is_insecure
+      when 'https'
+        # Use default certs for now.
+        GRPC::Core::ChannelCredentials.new
+      else
+        raise "Unknown scheme: #{@endpoint.scheme}"
+      end
+    end
+  end
+end

data/lib/etcdv3/connection_wrapper.rb

@@ -0,0 +1,55 @@
+class Etcdv3
+  class ConnectionWrapper
+
+    attr_accessor :connection, :endpoints, :user, :password, :token
+
+    def initialize(endpoints)
+      @user, @password, @token = nil, nil, nil
+      @endpoints = endpoints.map{|endpoint| Etcdv3::Connection.new(endpoint) }
+      @connection = @endpoints.first
+    end
+
+    def handle(stub, method, method_args=[], retries: 1)
+      @connection.call(stub, method, method_args)
+
+    rescue GRPC::Unavailable, GRPC::Core::CallError => exception
+      $stderr.puts("Failed to connect to endpoint '#{@connection.hostname}'")
+      if @endpoints.size > 1
+        rotate_connection_endpoint
+        $stderr.puts("Failover event triggered. Failing over to '#{@connection.hostname}'")
+        return handle(stub, method, method_args)
+      else
+        return handle(stub, method, method_args)
+      end
+    rescue GRPC::Unauthenticated => exception
+      # Regenerate token in the event it expires.
+      if exception.details == 'etcdserver: invalid auth token'
+        if retries > 0
+          authenticate(@user, @password)
+          return handle(stub, method, method_args, retries: retries - 1)
+        end
+      end
+      raise exception
+    end
+
+    def clear_authentication
+      @user, @password, @token = nil, nil, nil
+      @connection.refresh_metadata({})
+    end
+
+    # Authenticate using specified user and password..
+    def authenticate(user, password)
+      @token = handle(:auth, 'generate_token', [user, password])
+      @user, @password = user, password
+      @connection.refresh_metadata(token: @token)
+    end
+
+    # Simple failover mechanism that rotates the connection endpoints in an
+    # attempt to recover connectivity.
+    def rotate_connection_endpoint
+      @endpoints.rotate!
+      @connection = @endpoints.first
+      @connection.refresh_metadata(token: @token) if @token
+    end
+  end
+end

data/lib/etcdv3/kv/requests.rb

@@ -1,6 +1,20 @@
 class Etcdv3::KV
   module Requests
 
+    SORT_TARGET = {
+      key: 0,
+      version: 1,
+      create: 2,
+      mod: 3,
+      value: 4
+    }
+
+    SORT_ORDER = {
+      none: 0,
+      ascend: 1,
+      descend: 2
+    }
+
     def get_request(key, opts)
       opts[:sort_order] = SORT_ORDER[opts[:sort_order]] \
         if opts[:sort_order]

data/lib/etcdv3/kv/transaction.rb

@@ -36,9 +36,9 @@ class Etcdv3::KV
 
     # Request Operations
 
-    # txn.put('my', 'key')
-    def put(key, value)
-      put_request(key, value)
+    # txn.put('my', 'key', lease_id: 1)
+    def put(key, value, lease=nil)
+      put_request(key, value, lease)
     end
 
     # txn.get('key')

data/lib/etcdv3/kv.rb

@@ -3,20 +3,6 @@ class Etcdv3
   class KV
     include Etcdv3::KV::Requests
 
-    SORT_TARGET = {
-      key: 0,
-      version: 1,
-      create: 2,
-      mod: 3,
-      value: 4
-    }
-
-    SORT_ORDER = {
-      none: 0,
-      ascend: 1,
-      descend: 2
-    }
-
     def initialize(hostname, credentials, metadata={})
       @stub = Etcdserverpb::KV::Stub.new(hostname, credentials)
       @metadata = metadata

data/lib/etcdv3/version.rb

@@ -1,3 +1,3 @@
 class Etcdv3
-  VERSION = '0.6.0'.freeze
+  VERSION = '0.7.0'.freeze
 end

data/lib/etcdv3.rb

@@ -1,4 +1,3 @@
-
 require 'grpc'
 require 'uri'
 
@@ -10,89 +9,58 @@ require 'etcdv3/kv'
 require 'etcdv3/maintenance'
 require 'etcdv3/lease'
 require 'etcdv3/watch'
-
-require 'etcdv3/request'
+require 'etcdv3/connection'
+require 'etcdv3/connection_wrapper'
 
 class Etcdv3
+  extend Forwardable
+  def_delegators :@conn, :user, :password, :token, :endpoints, :authenticate
 
-  attr_reader :credentials, :options
-
-  def uri
-    URI(@options[:url])
-  end
-
-  def scheme
-    uri.scheme
-  end
-
-  def port
-    uri.port
-  end
-
-  def hostname
-    uri.hostname
-  end
-
-  def user
-    request.user
-  end
-
-  def password
-    request.password
-  end
-
-  def token
-    request.token
-  end
+  attr_reader :conn, :options
 
   def initialize(options = {})
     @options = options
-    @credentials = resolve_credentials
-    authenticate(options[:user], options[:password]) unless options[:user].nil?
+    @conn = ConnectionWrapper.new(sanitized_endpoints)
+    warn "WARNING: `url` is deprecated. Please use `endpoints` instead." if @options.key?(:url)
+    authenticate(@options[:user], @options[:password]) if @options.key?(:user)
   end
 
   # Version of Etcd running on member
   def version
-    request.handle(:maintenance, 'member_status').version
+    @conn.handle(:maintenance, 'member_status').version
   end
 
   # Store size in bytes.
   def db_size
-    request.handle(:maintenance, 'member_status').dbSize
+    @conn.handle(:maintenance, 'member_status').dbSize
   end
 
   # Cluster leader id
   def leader_id
-    request.handle(:maintenance, 'member_status').leader
+    @conn.handle(:maintenance, 'member_status').leader
   end
 
   # List active alarms
   def alarm_list
-    request.handle(:maintenance, 'alarms', [:get, leader_id])
+    @conn.handle(:maintenance, 'alarms', [:get, leader_id])
   end
 
   # Disarm alarms on a specified member.
   def alarm_deactivate
-    request.handle(:maintenance, 'alarms', [:deactivate, leader_id])
-  end
-
-  # Authenticate using specified user and password.
-  # On successful authentication, an auth token will be assigned to the request instance.
-  def authenticate(user, password)
-    request.authenticate(user, password)
+    @conn.handle(:maintenance, 'alarms', [:deactivate, leader_id])
   end
 
   # Enables authentication.
   def auth_enable
-    request.handle(:auth, 'auth_enable')
+    @conn.handle(:auth, 'auth_enable')
     true
   end
 
   # Disables authentication.
   # This will clear any active auth / token data.
   def auth_disable
-    request.handle(:auth, 'auth_disable')
-    request(reset: true)
+    @conn.handle(:auth, 'auth_disable')
+    @conn.clear_authentication
     true
   end
 
@@ -110,123 +78,110 @@ class Etcdv3
   # optional :min_create_revision - integer
   # optional :max_create_revision - integer
   def get(key, opts={})
-    request.handle(:kv, 'get', [key, opts])
+    @conn.handle(:kv, 'get', [key, opts])
   end
 
   # Inserts a new key.
   def put(key, value, lease_id: nil)
-    request.handle(:kv, 'put', [key, value, lease_id])
+    @conn.handle(:kv, 'put', [key, value, lease_id])
   end
 
   # Deletes a specified key
   def del(key, range_end: '')
-    request.handle(:kv, 'del', [key, range_end])
+    @conn.handle(:kv, 'del', [key, range_end])
   end
 
   # Grant a lease with a specified TTL
   def lease_grant(ttl)
-    request.handle(:lease, 'lease_grant', [ttl])
+    @conn.handle(:lease, 'lease_grant', [ttl])
   end
 
   # Revokes lease and delete all attached keys
   def lease_revoke(id)
-    request.handle(:lease, 'lease_revoke', [id])
+    @conn.handle(:lease, 'lease_revoke', [id])
   end
 
   # Returns information regarding the current state of the lease
   def lease_ttl(id)
-    request.handle(:lease, 'lease_ttl', [id])
+    @conn.handle(:lease, 'lease_ttl', [id])
   end
 
   # List all roles.
   def role_list
-    request.handle(:auth, 'role_list')
+    @conn.handle(:auth, 'role_list')
   end
 
   # Add role with specified name.
   def role_add(name)
-    request.handle(:auth, 'role_add', [name])
+    @conn.handle(:auth, 'role_add', [name])
   end
 
   # Fetches a specified role.
   def role_get(name)
-    request.handle(:auth, 'role_get', [name])
+    @conn.handle(:auth, 'role_get', [name])
   end
 
   # Delete role.
   def role_delete(name)
-    request.handle(:auth, 'role_delete', [name])
+    @conn.handle(:auth, 'role_delete', [name])
   end
 
   # Grants a new permission to an existing role.
   def role_grant_permission(name, permission, key, range_end='')
-    request.handle(:auth, 'role_grant_permission', [name, permission, key, range_end])
+    @conn.handle(:auth, 'role_grant_permission', [name, permission, key, range_end])
   end
 
   def role_revoke_permission(name, permission, key, range_end='')
-    request.handle(:auth, 'role_revoke_permission', [name, permission, key, range_end])
+    @conn.handle(:auth, 'role_revoke_permission', [name, permission, key, range_end])
   end
 
   # Fetch specified user
   def user_get(user)
-    request.handle(:auth, 'user_get', [user])
+    @conn.handle(:auth, 'user_get', [user])
   end
 
   # Creates new user.
   def user_add(user, password)
-    request.handle(:auth, 'user_add', [user, password])
+    @conn.handle(:auth, 'user_add', [user, password])
   end
 
   # Delete specified user.
   def user_delete(user)
-    request.handle(:auth, 'user_delete', [user])
+    @conn.handle(:auth, 'user_delete', [user])
   end
 
   # Changes the specified users password.
   def user_change_password(user, new_password)
-    request.handle(:auth, 'user_change_password', [user, new_password])
+    @conn.handle(:auth, 'user_change_password', [user, new_password])
   end
 
   # List all users.
   def user_list
-    request.handle(:auth, 'user_list')
+    @conn.handle(:auth, 'user_list')
   end
 
   # Grants role to an existing user.
   def user_grant_role(user, role)
-    request.handle(:auth, 'user_grant_role', [user, role])
+    @conn.handle(:auth, 'user_grant_role', [user, role])
   end
 
   # Revokes role from a specified user.
   def user_revoke_role(user, role)
-    request.handle(:auth, 'user_revoke_role', [user, role])
+    @conn.handle(:auth, 'user_revoke_role', [user, role])
   end
 
   # Watches for changes on a specified key range.
   def watch(key, range_end: '', &block)
-    request.handle(:watch, 'watch', [key, range_end, block])
+    @conn.handle(:watch, 'watch', [key, range_end, block])
   end
 
   def transaction(&block)
-    request.handle(:kv, 'transaction', [block])
+    @conn.handle(:kv, 'transaction', [block])
   end
 
   private
 
-  def request(reset: false)
-    return @request if @request && !reset
-    @request = Request.new("#{hostname}:#{port}", @credentials)
-  end
-
-  def resolve_credentials
-    case scheme
-    when 'http'
-      :this_channel_is_insecure
-    when 'https'
-      # Use default certs for now.
-      GRPC::Core::ChannelCredentials.new
-    else
-      raise "Unknown scheme: #{scheme}"
-    end
+  def sanitized_endpoints
+    (@options[:endpoints] || @options[:url]).split(',').map(&:strip)
   end
 end

data/spec/etcdv3/connection_spec.rb

@@ -0,0 +1,49 @@
+require 'spec_helper'
+
+describe Etcdv3::Connection do
+
+  describe '#initialize - without metadata' do
+    subject { Etcdv3::Connection.new('http://localhost:2379') }
+
+    it { is_expected.to have_attributes(endpoint: URI('http://localhost:2379')) }
+    it { is_expected.to have_attributes(credentials: :this_channel_is_insecure) }
+    it { is_expected.to have_attributes(hostname: 'localhost:2379') }
+
+    [:kv, :maintenance, :lease, :watch, :auth].each do |handler|
+      let(:handler_stub) { subject.handlers[handler].instance_variable_get(:@stub) }
+      let(:handler_metadata) { subject.handlers[handler].instance_variable_get(:@metadata) }
+      it 'sets hostname' do
+        expect(handler_stub.instance_variable_get(:@host)).to eq('localhost:2379')
+      end
+      it 'sets token' do
+        expect(handler_metadata[:token]).to be_nil
+      end
+    end
+  end
+
+  describe '#initialize - with metadata' do
+    subject { Etcdv3::Connection.new('http://localhost:2379', token: 'token123') }
+
+    [:kv, :maintenance, :lease, :watch, :auth].each do |handler|
+      let(:handler_stub) { subject.handlers[handler].instance_variable_get(:@stub) }
+      let(:handler_metadata) { subject.handlers[handler].instance_variable_get(:@metadata) }
+      it 'sets hostname' do
+        expect(handler_stub.instance_variable_get(:@host)).to eq('localhost:2379')
+      end
+      it 'sets token' do
+        expect(handler_metadata[:token]).to eq('token123')
+      end
+    end
+  end
+
+  describe '#refresh_metadata' do
+    subject { Etcdv3::Connection.new('http://localhost:2379', token: 'token123') }
+    before { subject.refresh_metadata(token: 'newtoken') }
+    [:kv, :maintenance, :lease, :watch, :auth].each do |handler|
+      let(:handler_metadata) { subject.handlers[handler].instance_variable_get(:@metadata) }
+      it 'rebuilds handlers with new token' do
+        expect(handler_metadata[:token]).to eq('newtoken')
+      end
+    end
+  end
+end

data/spec/etcdv3/connection_wrapper_spec.rb

@@ -0,0 +1,76 @@
+require 'spec_helper'
+
+describe Etcdv3::ConnectionWrapper do
+  let(:conn) { local_connection }
+  let(:endpoints) { ['http://localhost:2379', 'http://localhost:2389'] }
+
+  describe '#initialize' do
+    subject { Etcdv3::ConnectionWrapper.new(endpoints) }
+    it { is_expected.to have_attributes(user: nil, password: nil, token: nil) }
+    it 'sets hostnames in correct order' do
+      expect(subject.endpoints.map(&:hostname)).to eq(['localhost:2379', 'localhost:2389'])
+    end
+    it 'stubs connection with the correct hostname' do
+      expect(subject.connection.hostname).to eq('localhost:2379')
+    end
+  end
+
+  describe "#rotate_connection_endpoint" do
+    subject { Etcdv3::ConnectionWrapper.new(endpoints) }
+    before do
+      subject.rotate_connection_endpoint
+    end
+    it 'sets hostnames in correct order' do
+      expect(subject.endpoints.map(&:hostname)).to eq(['localhost:2389', 'localhost:2379'])
+    end
+    it 'sets correct hostname' do
+      expect(subject.connection.hostname).to eq('localhost:2389')
+    end
+  end
+
+  describe "Failover Simulation" do
+    let(:modified_conn) { local_connection("http://localhost:2369, http://localhost:2379") }
+    context 'without auth' do
+      # Set primary endpoint to a non-existing etcd endpoint
+      subject { modified_conn.get('boom') }
+      it { is_expected.to be_an_instance_of(Etcdserverpb::RangeResponse) }
+    end
+    context 'with auth' do
+      before do
+        # Establish connection with auth using real endpoint.
+        modified_conn.send(:conn).rotate_connection_endpoint
+        modified_conn.user_add('root', 'pass')
+        modified_conn.user_grant_role('root', 'root')
+        modified_conn.auth_enable
+        modified_conn.authenticate('root', 'pass')
+        # Rotate connections so we initiate connection using bad endpoint
+        modified_conn.send(:conn).rotate_connection_endpoint
+      end
+      after do
+        modified_conn.auth_disable
+        modified_conn.user_delete('root')
+      end
+      subject { modified_conn.get('boom') }
+      it { is_expected.to be_an_instance_of(Etcdserverpb::RangeResponse) }
+    end
+  end
+
+  describe "GRPC::Unauthenticated recovery" do
+    let(:wrapper) { conn.send(:conn) }
+    let(:connection) { wrapper.connection }
+    before do
+      conn.user_add('root', 'pass')
+      conn.user_grant_role('root', 'root')
+      conn.auth_enable
+      conn.authenticate('root', 'pass')
+      wrapper.token = "thiswontwork"
+      connection.refresh_metadata(token: "thiswontwork")
+    end
+    after do
+      conn.auth_disable
+      conn.user_delete('root')
+    end
+    subject { conn.user_get('root') }
+    it { is_expected.to be_an_instance_of(Etcdserverpb::AuthUserGetResponse) }
+  end
+end

data/spec/etcdv3_spec.rb

@@ -8,9 +8,6 @@ describe Etcdv3 do
     describe '#initialize' do
       context 'without auth' do
         subject { conn }
-        it { is_expected.to have_attributes(scheme: 'http') }
-        it { is_expected.to have_attributes(hostname: '127.0.0.1') }
-        it { is_expected.to have_attributes(credentials: :this_channel_is_insecure) }
         it { is_expected.to have_attributes(token: nil) }
         it { is_expected.to have_attributes(user: nil) }
         it { is_expected.to have_attributes(password: nil) }
@@ -238,53 +235,149 @@ describe Etcdv3 do
       end
 
       context 'auth disabled' do
+        before do
+          conn.user_add('root', 'root')
+          conn.auth_disable
+        end
+        after do
+          conn.user_delete('root')
+        end
         it 'raises error' do
-          expect { conn.authenticate('root', 'root') }.to raise_error(GRPC::InvalidArgument)
+          expect { conn.authenticate('root', 'root') }.to raise_error(GRPC::FailedPrecondition)
         end
       end
     end
 
     describe '#transaction' do
-      context 'success' do
+      describe 'txn.value' do
         before { conn.put('txn', 'value') }
         after { conn.del('txn') }
-        subject do
-          conn.transaction do |txn|
-            txn.compare = [ txn.value('txn', :equal, 'value') ]
-            txn.success = [ txn.put('txn-test', 'success') ]
-            txn.failure = [ txn.put('txn-test', 'failed') ]
+        context 'success' do
+          subject! do
+            conn.transaction do |txn|
+              txn.compare = [ txn.value('txn', :equal, 'value') ]
+              txn.success = [ txn.put('txn-test', 'success') ]
+              txn.failure = [ txn.put('txn-test', 'failed') ]
+            end
+          end
+          it 'sets correct key' do
+            expect(conn.get('txn-test').kvs.first.value).to eq('success')
           end
         end
-        it { is_expected.to be_an_instance_of(Etcdserverpb::TxnResponse) }
-        it 'returns successful' do
-          expect(subject.succeeded).to eq(true)
+        context "success, value with lease" do
+          let!(:lease_id) { conn.lease_grant(2)['ID'] }
+          subject! do
+            conn.transaction do |txn|
+              txn.compare = [ txn.value('txn', :equal, 'value') ]
+              txn.success = [ txn.put('txn-test', 'success', lease_id) ]
+              txn.failure = [ txn.put('txn-test', 'failed', lease_id) ]
+            end
+          end
+          it 'sets correct key, with a lease' do
+            expect(conn.get('txn-test').kvs.first.value).to eq('success')
+            expect(conn.get('txn-test').kvs.first.lease).to eq(lease_id)
+          end
         end
-        it 'sets correct key' do
-          expect(conn.get('txn-test').kvs.first.value).to eq('success')
+        context 'failure' do
+          subject! do
+            conn.transaction do |txn|
+              txn.compare = [ txn.value('txn', :equal, 'notright') ]
+              txn.success = [ txn.put('txn-test', 'success') ]
+              txn.failure = [ txn.put('txn-test', 'failed') ]
+            end
+          end
+          it 'sets correct key' do
+            expect(conn.get('txn-test').kvs.first.value).to eq('failed')
+          end
         end
       end
 
-      context 'failure' do
+      describe 'txn.create_revision' do
         before { conn.put('txn', 'value') }
         after { conn.del('txn') }
-        subject do
-          conn.transaction do |txn|
-            txn.compare = [
-              txn.create_revision('txn', :greater, 500),
-              txn.mod_revision('txn', :less, 1000)
-            ]
-            txn.success = [ txn.put('txn-test', 'success') ]
-            txn.failure = [ txn.put('txn-test', 'failed') ]
+        context 'success' do
+          subject! do
+            conn.transaction do |txn|
+              txn.compare = [ txn.create_revision('txn', :greater, 1) ]
+              txn.success = [ txn.put('txn-test', 'success') ]
+              txn.failure = [ txn.put('txn-test', 'failed') ]
+            end
+          end
+          it 'sets correct key' do
+            expect(conn.get('txn-test').kvs.first.value).to eq('success')
+          end
+        end
+        context 'failure' do
+          subject! do
+            conn.transaction do |txn|
+              txn.compare = [ txn.create_revision('txn', :equal, 1) ]
+              txn.success = [ txn.put('txn-test', 'success') ]
+              txn.failure = [ txn.put('txn-test', 'failed') ]
+            end
+          end
+          it 'sets correct key' do
+            expect(conn.get('txn-test').kvs.first.value).to eq('failed')
+          end
+        end
+      end
+
+      describe 'txn.mod_revision' do
+        before { conn.put('txn', 'value') }
+        after { conn.del('txn') }
+        context 'success' do
+          subject! do
+            conn.transaction do |txn|
+              txn.compare = [ txn.mod_revision('txn', :less, 1000) ]
+              txn.success = [ txn.put('txn-test', 'success') ]
+              txn.failure = [ txn.put('txn-test', 'failed') ]
+            end
+          end
+          it 'sets correct key' do
+            expect(conn.get('txn-test').kvs.first.value).to eq('success')
+          end
+        end
+        context 'failure' do
+          subject! do
+            conn.transaction do |txn|
+              txn.compare = [ txn.mod_revision('txn', :greater, 1000) ]
+              txn.success = [ txn.put('txn-test', 'success') ]
+              txn.failure = [ txn.put('txn-test', 'failed') ]
+            end
+          end
+          it 'sets correct key' do
+            expect(conn.get('txn-test').kvs.first.value).to eq('failed')
           end
         end
-        it 'returns successful' do
-          expect(subject.succeeded).to eq(false)
+      end
+
+      describe 'txn.version' do
+        before { conn.put('txn', 'value') }
+        after { conn.del('txn') }
+        context 'success' do
+          subject! do
+            conn.transaction do |txn|
+              txn.compare = [ txn.version('txn', :equal, 1) ]
+              txn.success = [ txn.put('txn-test', 'success') ]
+              txn.failure = [ txn.put('txn-test', 'failed') ]
+            end
+          end
+          it 'sets correct key' do
+            expect(conn.get('txn-test').kvs.first.value).to eq('success')
+          end
         end
-        it 'sets correct key' do
-          expect(conn.get('txn-test').kvs.first.value).to eq('failed')
+        context 'failure' do
+          subject! do
+            conn.transaction do |txn|
+              txn.compare = [ txn.version('txn', :equal, 100)]
+              txn.success = [ txn.put('txn-test', 'success') ]
+              txn.failure = [ txn.put('txn-test', 'failed') ]
+            end
+          end
+          it 'sets correct key' do
+            expect(conn.get('txn-test').kvs.first.value).to eq('failed')
+          end
         end
       end
     end
-
   end
 end

data/spec/helpers/connections.rb

@@ -2,11 +2,11 @@ module Helpers
   module Connections
 
     def local_connection_with_auth(user, password)
-      Etcdv3.new(url: "http://#{local_url}", user: user, password: password)
+      Etcdv3.new(endpoints: "http://#{local_url}", user: user, password: password)
     end
 
-    def local_connection
-      Etcdv3.new(url: "http://#{local_url}")
+    def local_connection(endpoints="http://#{local_url}")
+      Etcdv3.new(endpoints: endpoints)
     end
 
     def local_stub(interface)
@@ -17,6 +17,10 @@ module Helpers
       "127.0.0.1:#{port}"
     end
 
+    def full_local_url
+      "http://#{local_url}"
+    end
+
     def port
       ENV.fetch('ETCD_TEST_PORT', 2379).to_i
     end

data/spec/spec_helper.rb

@@ -23,6 +23,7 @@ RSpec.configure do |config|
 
   instance = Helpers::TestInstance.new
   config.before(:suite) do
+    # $stderr = File.open(File::NULL, "w")
     instance.start
   end
   config.after(:suite) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etcdv3
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Shaun Davis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-21 00:00:00.000000000 Z
+date: 2017-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grpc
@@ -16,28 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.5
-- !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.11.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -67,6 +53,8 @@ files:
 - etcdv3.gemspec
 - lib/etcdv3.rb
 - lib/etcdv3/auth.rb
+- lib/etcdv3/connection.rb
+- lib/etcdv3/connection_wrapper.rb
 - lib/etcdv3/etcdrpc/auth_pb.rb
 - lib/etcdv3/etcdrpc/kv_pb.rb
 - lib/etcdv3/etcdrpc/rpc_pb.rb
@@ -83,10 +71,11 @@ files:
 - lib/etcdv3/protos/http.proto
 - lib/etcdv3/protos/kv.proto
 - lib/etcdv3/protos/rpc.proto
-- lib/etcdv3/request.rb
 - lib/etcdv3/version.rb
 - lib/etcdv3/watch.rb
 - spec/etcdv3/auth_spec.rb
+- spec/etcdv3/connection_spec.rb
+- spec/etcdv3/connection_wrapper_spec.rb
 - spec/etcdv3/kv_spec.rb
 - spec/etcdv3/lease_spec.rb
 - spec/etcdv3/maintenance_spec.rb
@@ -120,6 +109,8 @@ specification_version: 4
 summary: A Etcd client library for Version 3
 test_files:
 - spec/etcdv3/auth_spec.rb
+- spec/etcdv3/connection_spec.rb
+- spec/etcdv3/connection_wrapper_spec.rb
 - spec/etcdv3/kv_spec.rb
 - spec/etcdv3/lease_spec.rb
 - spec/etcdv3/maintenance_spec.rb

data/lib/etcdv3/request.rb

@@ -1,53 +0,0 @@
-require 'base64'
-class Etcdv3
-  class Request
-
-    HANDLERS = {
-      auth: Etcdv3::Auth,
-      kv: Etcdv3::KV,
-      maintenance: Etcdv3::Maintenance,
-      lease: Etcdv3::Lease,
-      watch: Etcdv3::Watch
-    }
-
-    attr_reader :user, :password, :token
-
-    def initialize(hostname, credentials)
-      @user, @password, @token = nil, nil, nil
-      @hostname = hostname
-      @credentials = credentials
-      @handlers = handler_map
-    end
-
-    def handle(stub, method, method_args=[], retries: 1)
-      @handlers.fetch(stub).send(method, *method_args)
-    rescue GRPC::Unauthenticated => exception
-      # Regenerate token in the event it expires.
-      if exception.details == 'etcdserver: invalid auth token'
-        if retries > 0
-          authenticate(@user, @password)
-          return handle(stub, method, method_args, retries: retries - 1)
-        end
-      end
-      raise exception
-    end
-
-    def authenticate(user, password)
-      # Attempt to generate token using user and password.
-      @token = handle(:auth, 'generate_token', [user, password])
-      @user = user
-      @password = password
-      @handlers = handler_map(token: @token)
-    end
-
-    private
-
-    def handler_map(metadata={})
-      Hash[
-        HANDLERS.map do |key, klass|
-          [key, klass.new(@hostname, @credentials, metadata)]
-        end
-      ]
-    end
-  end
-end