correcting KVClient::acquire and release methods

dcarbone · May 15, 2018 · 0690ab9 · 0690ab9
1 parent 3ec6a2f
commit 0690ab9
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 2 deletions.
diff --git a/src/Consul.php b/src/Consul.php
@@ -48,6 +48,9 @@ class Consul {
     const HealthCritical = 'critical';
     const HealthMaint = 'maintenance';
 
+    const SessionBehaviorRelease = 'release';
+    const SessionBehaviorDelete = 'delete';
+
     /** @var \DCarbone\PHPConsulAPI\ACL\ACLClient */
     public $ACL;
     /** @var \DCarbone\PHPConsulAPI\Agent\AgentClient */

diff --git a/src/KV/KVClient.php b/src/KV/KVClient.php
@@ -243,7 +243,7 @@ public function cas(KVPair $p, WriteOptions $options = null) {
      * )
      */
     public function acquire(KVPair $p, WriteOptions $options = null) {
-        $r = new Request('PUT', sprintf('v1/kv/%s', $p->Key), $this->config);
+        $r = new Request('PUT', sprintf('v1/kv/%s', $p->Key), $this->config, $p->Value);
         $r->setWriteOptions($options);
         $r->Params->set('acquire', $p->Session);
         if (0 !== $p->Flags) {
@@ -288,7 +288,7 @@ public function deleteCAS(KVPair $p, WriteOptions $options = null) {
      * )
      */
     public function release(KVPair $p, WriteOptions $options = null) {
-        $r = new Request('PUT', sprintf('v1/kv/%s', $p->Key), $this->config);
+        $r = new Request('PUT', sprintf('v1/kv/%s', $p->Key), $this->config, $p->Value);
         $r->setWriteOptions($options);
         $r->Params->set('release', $p->Session);
         if (0 !== $p->Flags) {

diff --git a/tests/Usage/KV/KVClientLockTest.php b/tests/Usage/KV/KVClientLockTest.php
@@ -0,0 +1,51 @@
+<?php namespace DCarbone\PHPConsulAPITests\Usage\KV;
+
+use DCarbone\PHPConsulAPI\Config;
+use DCarbone\PHPConsulAPI\Consul;
+use DCarbone\PHPConsulAPI\KV\KVClient;
+use DCarbone\PHPConsulAPI\KV\KVPair;
+use DCarbone\PHPConsulAPI\Session\SessionClient;
+use DCarbone\PHPConsulAPI\Session\SessionEntry;
+use DCarbone\PHPConsulAPI\WriteMeta;
+use DCarbone\PHPConsulAPITests\ConsulManager;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Class KVClientLockTest
+ * @package DCarbone\PHPConsulAPITests\Usage\KV
+ */
+class KVClientLockTest extends TestCase {
+
+    protected function setUp() {
+        ConsulManager::startSingle();
+    }
+
+    protected function tearDown() {
+        ConsulManager::stopSingle();
+    }
+
+    public function testAcquireAndRelease() {
+        static $name = 'lockme';
+        static $key = 'lockable';
+
+        $conf = new Config();
+        $kvClient = new KVClient($conf);
+        $sessionClient = new SessionClient($conf);
+
+        list($id, $_, $err) = $sessionClient->CreateNoChecks(new SessionEntry(['Name'     => $name,
+                                                                               'TTL'      => '10s',
+                                                                               'Behavior' => Consul::SessionBehaviorDelete]));
+        $this->assertNull($err, sprintf('Error creating session: %s', $err));
+
+        $kv = new KVPair(['Key' => $key, 'Value' => 'whatever', 'Session' => $id]);
+        list($wm, $err) = $kvClient->Acquire($kv);
+        $this->assertNull($err, sprintf('Error acquiring lock: %s', $err));
+        $this->assertInstanceOf(WriteMeta::class, $wm);
+
+        list($kv, $_, $err) = $kvClient->Get($key);
+        $this->assertNull($err, sprintf('Error retrieving key: %s', $err));
+        $this->assertInstanceOf(KVPair::class, $kv);
+        $this->assertEquals($id, $kv->Session);
+        $this->assertEquals('whatever', $kv->Value);
+    }
+}