fix parameters after signing #73 (#76)

* fix parameters after signing #73 Signed-off-by: Boris Charriere <[email protected]> Signed-off-by: Boris Charriere <[email protected]> * add test case for client paramters Signed-off-by: Boris Charriere <[email protected]> Co-authored-by: bcharriere <[email protected]>
opensearch-project · Aug 10, 2022 · 845edd6 · 845edd6
1 parent 3c9c2f4
commit 845edd6
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/src/OpenSearch/Handlers/SigV4Handler.php b/src/OpenSearch/Handlers/SigV4Handler.php
@@ -50,7 +50,7 @@ public function __invoke(array $request)
         $signedRequest = $this->signer
             ->signRequest($psr7Request, $creds);
 
-        return call_user_func($this->wrappedHandler, $this->createRingRequest($signedRequest));
+        return call_user_func($this->wrappedHandler, $this->createRingRequest($signedRequest, $request));
     }
 
     public static function assertDependenciesInstalled(): void
@@ -92,7 +92,7 @@ private function createPsr7Request(array $ringPhpRequest): Request
         );
     }
 
-    private function createRingRequest(RequestInterface $request): array
+    private function createRingRequest(RequestInterface $request, array $originalRequest): array
     {
         $uri = $request->getUri();
         $body = (string) $request->getBody();
@@ -109,6 +109,7 @@ private function createRingRequest(RequestInterface $request): array
             'uri' => $uri->getPath(),
             'body' => $body,
             'headers' => $request->getHeaders(),
+            'client' => $originalRequest['client']
         ];
         if ($uri->getQuery()) {
             $ringRequest['query_string'] = $uri->getQuery();

diff --git a/tests/Handlers/SigV4HandlerTest.php b/tests/Handlers/SigV4HandlerTest.php
@@ -135,6 +135,26 @@ public function testNonEmptyRequestBodiesShouldNotBeNull()
         ]);
     }
 
+    public function testClientParametersShouldBePassedToHandler()
+    {
+        $toWrap = function (array $ringRequest) {
+            $this->assertArrayHasKey('client', $ringRequest);
+            $this->assertArrayHasKey('timeout', $ringRequest['client']);
+            $this->assertArrayHasKey('connect_timeout', $ringRequest['client']);
+
+            return $this->getGenericResponse();
+        };
+
+        $client = ClientBuilder::create()
+            ->setHandler($toWrap)
+            ->setSigV4Region('us-west-2')
+            ->setSigV4CredentialProvider(new Credentials('foo', 'bar', 'baz'))
+            ->setConnectionParams(['client' => ['timeout' => 5, 'connect_timeout' => 5]])
+            ->build();
+
+        $client->indices()->exists(['index' => 'index']);
+    }
+
     private function getGenericResponse()
     {
         return new CompletedFutureArray([