etcdv3 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9275ec7e8408f87efd369493235bea9e7bd18a98
-  data.tar.gz: 9fcdd5d3199a60e6c0066758dc32e455e5125e8c
+  metadata.gz: 3e2fce5dfb236ef001c050f60f6fec8162914121
+  data.tar.gz: 0ae18b137efb5cbd7c328a6690615f2f6c68c65b
 SHA512:
-  metadata.gz: f5755de875074e6268cd378568ba6633d141d71efeccffe197f59fa142c6fcaa553a4802d438b551f24808b524e07e68221d435f9cf20a434620850164bdf1e7
-  data.tar.gz: ee7cf3faf3e6694843a3c99ee553d3bbcf081c491fa463cf36223bc8e8eb6688c8fb2fe19a42c3d0737ed56d849504e9cea5215e65cc978380448502c4894a24
+  metadata.gz: b06266232676bd25db0521874cd846069b473091f34cf1dc7d0a5dc2b06575d141323aa917411854ba186d8134d5f1ef09c22e5ff919167c6ecae164a65dce4b
+  data.tar.gz: 305a579ce7e7c0c202c8643ba1ea3cbb265abf3dded50a748b6ad839ef78acb22f1ce72e3d62ad0edefa6ef288f65b52e0828482d7658f3fbb5192b4a1017ec0

data/lib/etcdv3/version.rb

@@ -1,3 +1,3 @@
 class Etcd
-  VERSION = '0.1.4'.freeze
+  VERSION = '0.1.5'.freeze
 end

data/lib/etcdv3.rb

@@ -65,6 +65,16 @@ class Etcd
     request.handle(:maintenance, 'member_status').leader
   end
 
+  # List active alarms
+  def alarm_list
+    request.handle(:maintenance, 'alarms', [:get, leader_id])
+  end
+
+  # Disarm alarms on a specified member.
+  def deactivate_alarms
+    request.handle(:maintenance, 'alarms', [:deactivate, leader_id])
+  end
+
   # Inserts a new key.
   def put(key, value, lease_id: nil)
     request.handle(:kv, 'put', [key, value, lease_id])
@@ -72,7 +82,7 @@ class Etcd
 
   # Fetches key(s).
   def get(key, range_end='')
-    request.handle(:get, 'get', [key, range_end])
+    request.handle(:kv, 'get', [key, range_end])
   end
 
   # Grant a lease with a speified TTL
@@ -154,16 +164,6 @@ class Etcd
     request.handle(:auth, 'revoke_permission_from_role', [name, permission, key, range_end])
   end
 
-  # List active alarms
-  def alarm_list
-    request.handle(:maintenance, 'alarms', [:get, leader_id])
-  end
-
-  # Disarm alarms on a specified member.
-  def deactivate_alarms
-    request.handle(:maintenance, 'alarms', [leader_id])
-  end
-
   # Enables authentication.
   def enable_auth
     request.handle(:auth, 'enable_auth')

data/spec/etcdv3_spec.rb

@@ -0,0 +1,211 @@
+require 'spec_helper'
+
+describe Etcd do
+  context 'Insecure connection without Auth' do
+
+    let(:conn) { local_connection }
+
+    describe '#initialize' 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) }
+    end
+
+    describe '#version' do
+      subject { conn.version }
+      it { is_expected.to be_an_instance_of(String) }
+    end
+
+    describe '#db_size' do
+      subject { conn.db_size }
+      it { is_expected.to_not be_nil }
+    end
+
+    describe '#leader_id' do
+      subject { conn.leader_id }
+      it { is_expected.to_not be_nil }
+    end
+
+    describe '#alarm_list' do
+      subject { conn.alarm_list }
+      it { is_expected.to_not be_nil }
+    end
+
+    describe '#deactivate_alarms' do
+      subject { conn.deactivate_alarms }
+      it { is_expected.to_not be_nil }
+    end
+
+    describe '#get' do
+      subject { conn.get('test') }
+      it { is_expected.to_not be_nil }
+    end
+
+    describe '#put' do
+      subject { conn.put('test', 'value') }
+      it { is_expected.to_not be_nil }
+    end
+
+    describe '#grant_lease' do
+      subject { conn.grant_lease(2) }
+      it { is_expected.to_not be_nil }
+    end
+
+    describe '#revoke_lease' do
+      let!(:lease_id) { conn.grant_lease(2)['ID'] }
+      subject { conn.revoke_lease(lease_id) }
+      it { is_expected.to_not be_nil }
+    end
+
+    describe '#lease_ttl' do
+      let!(:lease_id) { conn.grant_lease(2)['ID'] }
+      subject { conn.lease_ttl(lease_id) }
+      it { is_expected.to_not be_nil }
+    end
+
+    describe '#add_user' do
+      after { conn.delete_user('test') }
+      subject { conn.add_user('test', 'user') }
+      it { is_expected.to_not be_nil }
+    end
+
+    describe '#delete_user' do
+      before { conn.add_user('test', 'user') }
+      subject { conn.delete_user('test') }
+      it { is_expected.to_not be_nil }
+    end
+
+    describe '#change_user_password' do
+      before { conn.add_user('change_user', 'pass') }
+      after { conn.delete_user('change_user') }
+      subject { conn.change_user_password('change_user', 'new_pass') }
+      it { is_expected.to_not be_nil }
+    end
+
+    describe '#user_list' do
+      subject { conn.user_list }
+      it { is_expected.to_not be_nil }
+    end
+
+    describe '#role_list' do
+      subject { conn.role_list }
+      it { is_expected.to_not be_nil }
+    end
+
+    describe '#add_role' do
+      subject { conn.add_role('add_role') }
+      it { is_expected.to_not be_nil }
+    end
+
+    describe '#delete_role' do
+      before { conn.add_role('delete_role') }
+      subject { conn.delete_role('delete_role') }
+      it { is_expected.to_not be_nil }
+    end
+
+    describe '#grant_role_to_user' do
+      before { conn.add_user('grant_me', 'pass') }
+      subject { conn.grant_role_to_user('grant_me', 'root') }
+      it { is_expected.to_not be_nil }
+    end
+
+    describe '#revoke_role_from_user' do
+      subject { conn.revoke_role_from_user('grant_me', 'root') }
+      it { is_expected.to_not be_nil }
+    end
+
+    describe '#grant_permission_to_role' do
+      before { conn.add_role('grant') }
+      subject { conn.grant_permission_to_role('grant', 'readwrite', 'a', 'Z') }
+      it { is_expected.to_not be_nil }
+    end
+
+    describe '#revoke_permission_to_role' do
+      subject { conn.revoke_permission_from_role('grant', 'readwrite', 'a', 'Z') }
+      it { is_expected.to_not be_nil }
+    end
+
+    describe '#disable_auth' do
+      before do
+        conn.add_user('root', 'test')
+        conn.grant_role_to_user('root', 'root')
+        conn.enable_auth
+        conn.authenticate('root', 'test')
+      end
+      after { conn.delete_user('root') }
+      subject { conn.disable_auth }
+      it { is_expected.to be_an_instance_of(Etcdserverpb::AuthDisableResponse) }
+    end
+
+    describe '#enable_auth' do
+      before do
+        conn.add_user('root', 'test')
+        conn.grant_role_to_user('root', 'root')
+      end
+      after do
+        conn.authenticate('root', 'test')
+        conn.disable_auth
+        conn.delete_user('root')
+      end
+      subject { conn.enable_auth }
+      it { is_expected.to be_an_instance_of(Etcdserverpb::AuthEnableResponse) }
+    end
+
+    describe "#authenticate" do
+      context "auth enabled" do
+        before do
+          conn.add_user('root', 'test')
+          conn.grant_role_to_user('root', 'root')
+          conn.enable_auth
+          conn.authenticate('root', 'test')
+        end
+        after do
+          conn.disable_auth
+          conn.delete_user('root')
+        end
+        it 'properly reconfigures auth and token' do
+          expect(conn.token).to_not be_nil
+          expect(conn.user).to eq('root')
+          expect(conn.password).to eq('test')
+        end
+      end
+
+      context 'auth disabled' do
+        it 'raises error' do
+          expect { conn.authenticate('root', 'root') }.to raise_error(GRPC::InvalidArgument)
+        end
+      end
+    end
+
+    describe '#metacache' do
+      context 'uses cached request object' do
+        let!(:object_id) { conn.send(:request).object_id }
+        before { conn.add_user('root', 'test') }
+        after { conn.delete_user('root') }
+        subject { conn.send(:request).object_id }
+        it { is_expected.to eq(object_id) }
+      end
+      context 'resets cache on auth' do
+        let!(:object_id) { conn.send(:request).object_id }
+        before do
+          conn.add_user('root', 'test')
+          conn.grant_role_to_user('root', 'root')
+          conn.enable_auth
+          conn.authenticate('root', 'test')
+          conn.add_user('boom', 'password')
+        end
+        after do
+          conn.disable_auth
+          conn.delete_user('root')
+          conn.delete_user('boom')
+        end
+        subject { conn.send(:request).object_id }
+        it { is_expected.to_not eq(object_id) }
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etcdv3
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Shaun Davis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-07 00:00:00.000000000 Z
+date: 2017-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grpc
@@ -73,6 +73,7 @@ files:
 - spec/etcdv3/kv_spec.rb
 - spec/etcdv3/lease_spec.rb
 - spec/etcdv3/maintenance_spec.rb
+- spec/etcdv3_spec.rb
 - spec/helpers/connections.rb
 - spec/helpers/test_instance.rb
 - spec/spec_helper.rb
@@ -106,6 +107,7 @@ test_files:
 - spec/etcdv3/kv_spec.rb
 - spec/etcdv3/lease_spec.rb
 - spec/etcdv3/maintenance_spec.rb
+- spec/etcdv3_spec.rb
 - spec/helpers/connections.rb
 - spec/helpers/test_instance.rb
 - spec/spec_helper.rb